Skip to content

Commit cd2d80f

Browse files
authored
Merge pull request #418 from ukmda/markmac99
Merging in most recent dev changes
2 parents 7501c1a + 3d24d2d commit cd2d80f

9 files changed

Lines changed: 4 additions & 424 deletions

File tree

archive/deployment/deploy-usermgmt.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

archive/server_setup/.bashrc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ export PATH=$PATH:/usr/local/geos/bin:/usr/local/proj4/bin
2222

2323
if shopt -q login_shell ; then
2424
echo ""
25-
echo "Type 'dev' to activate the dev environment"
26-
echo "Type 'prd' to activate the dev environment"
25+
echo "THIS IS THE PROD SERVER!!"
2726
echo ""
2827
echo " Some handy aliases that work in either environment are"
2928
echo " logs => go to the logs folder"
@@ -34,8 +33,9 @@ if shopt -q login_shell ; then
3433
echo " tnj => tail the nightly job log"
3534
echo " spacecalc => display space usage in the current folder"
3635
echo ""
37-
fi
38-
export NVM_DIR="$HOME/.nvm"
36+
prd
37+
fi
38+
export NVM_DIR="$HOME/.nvm"
3939
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
4040
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
4141
export PATH=$PATH:$(dirname $(which node))

archive/usermgmt/addAdminUser.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

archive/usermgmt/addFBApiKey.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

archive/usermgmt/addSftpUser.sh

Lines changed: 0 additions & 116 deletions
This file was deleted.

archive/usermgmt/camTableMaintenance.py

Lines changed: 0 additions & 49 deletions
This file was deleted.

archive/usermgmt/testkeys.py

Lines changed: 0 additions & 91 deletions
This file was deleted.

archive/usermgmt/updateAwsKey.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)