From 85bc284cfa69acd3f1e165d1573a3c1f3b235337 Mon Sep 17 00:00:00 2001 From: Charles N Wyble Date: Sun, 28 Jan 2018 14:39:37 -0600 Subject: [PATCH] updated for tsys --- slack-dist/bin/slackInstall.sh | 36 +++++++------------ slack-dist/env/aus/SlackSSH-aus-prod.config | 4 --- .../env/ovh/SlackConfig-aus-prod.config | 6 ---- slack-dist/env/ovh/SlackSSH-aus-prod.config | 4 --- slack-dist/env/ovh/SlackSSH-aus-prod.key | 27 -------------- slack-dist/env/ovh/SlackSSH-aus-prod.key.pub | 1 - .../SlackConfig-prod.config} | 2 +- .../SlackSSH-prod.config} | 2 +- .../SlackSSH-prod.key} | 0 .../SlackSSH-prod.key.pub} | 0 .../env/satx/SlackConfig-aus-prod.config | 6 ---- slack-dist/env/satx/SlackSSH-aus-prod.key | 27 -------------- slack-dist/env/satx/SlackSSH-aus-prod.key.pub | 1 - 13 files changed, 14 insertions(+), 102 deletions(-) delete mode 100644 slack-dist/env/aus/SlackSSH-aus-prod.config delete mode 100644 slack-dist/env/ovh/SlackConfig-aus-prod.config delete mode 100644 slack-dist/env/ovh/SlackSSH-aus-prod.config delete mode 100644 slack-dist/env/ovh/SlackSSH-aus-prod.key delete mode 100644 slack-dist/env/ovh/SlackSSH-aus-prod.key.pub rename slack-dist/env/{aus/SlackConfig-aus-prod.config => prod/SlackConfig-prod.config} (74%) rename slack-dist/env/{satx/SlackSSH-aus-prod.config => prod/SlackSSH-prod.config} (59%) rename slack-dist/env/{aus/SlackSSH-aus-prod.key => prod/SlackSSH-prod.key} (100%) rename slack-dist/env/{aus/SlackSSH-aus-prod.key.pub => prod/SlackSSH-prod.key.pub} (100%) delete mode 100644 slack-dist/env/satx/SlackConfig-aus-prod.config delete mode 100644 slack-dist/env/satx/SlackSSH-aus-prod.key delete mode 100644 slack-dist/env/satx/SlackSSH-aus-prod.key.pub diff --git a/slack-dist/bin/slackInstall.sh b/slack-dist/bin/slackInstall.sh index 1aedb64..06de86d 100644 --- a/slack-dist/bin/slackInstall.sh +++ b/slack-dist/bin/slackInstall.sh @@ -9,7 +9,6 @@ export MGMT_INT="$(netstat -rn |grep 0.0.0.0|awk '{print $NF}' |head -n1 )" export MGMT_IP="$(ifconfig eth0|grep inet|awk '{print $2}'|head -n1)" -export ENVIP="$(echo $MGMT_IP|awk -F '.' '{print $2}')" export DIST_SERVER="http://tsys-techops.turnsys.net/" export DIST_ROOT_PATH="slack-dist" @@ -33,33 +32,22 @@ export DIST_ROOT_PATH="slack-dist" #fi + case $server_type in - ts) - export SERVER_TYPE="ts" + abc) + export SERVER_TYPE="abc" ;; - cvm) - export SERVER_TYPE="cvm" + xxx) + export SERVER_TYPE="xxx" ;; - bvm) - export SERVER_TYPE="bvm" + yyy) + export SERVER_TYPE="yyy" ;; *) export SERVER_TYPE="prod" ;; esac -case $ENVIP in - 253) - export SITE="ovh" - ;; - 251) - export SITE="aus" - ;; - 40) - export SITE="satx" - ;; - *) - esac ####################################################################################################################################################### @@ -97,8 +85,8 @@ mkdir /root/.ssh chmod 700 /root/.ssh chown -R root:root /root/.ssh -wget $DIST_SERVER/$DIST_ROOT_PATH/env/$SITE/SlackConfig-$SITE-$SERVER_TYPE.config -O /etc/slack.conf -wget $DIST_SERVER/$DIST_ROOT_PATH/env/$SITE/SlackSSH-$SITE-$SERVER_TYPE.config -O /root/.ssh/config -wget $DIST_SERVER/$DIST_ROOT_PATH/env/$SITE/SlackSSH-$SITE-$SERVER_TYPE.key -O /root/.ssh/SlackSSH-$SITE-$SERVER_TYPE.key -chmod 400 /root/.ssh/SlackSSH-$SITE-$SERVER_TYPE.key -chmod 400 /root/.ssh/config \ No newline at end of file +wget $DIST_SERVER/$DIST_ROOT_PATH/env/$SERVER_TYPE/SlackConfig-$SERVER_TYPE.config -O /etc/slack.conf +wget $DIST_SERVER/$DIST_ROOT_PATH/env/$SERVER_TYPE/SlackSSH-$SERVER_TYPE.config -O /root/.ssh/config +wget $DIST_SERVER/$DIST_ROOT_PATH/env/$SERVER_TYPE/SlackSSH-$SERVER_TYPE.key -O /root/.ssh/SlackSSH-$SITE-$SERVER_TYPE.key +chmod 400 /root/.ssh/SlackSSH-$SERVER_TYPE.key +chmod 400 /root/.ssh/config diff --git a/slack-dist/env/aus/SlackSSH-aus-prod.config b/slack-dist/env/aus/SlackSSH-aus-prod.config deleted file mode 100644 index 6b2dfd6..0000000 --- a/slack-dist/env/aus/SlackSSH-aus-prod.config +++ /dev/null @@ -1,4 +0,0 @@ -Host tsys-techops.turnsys.net - User tsys-techops - IdentityFile /root/.ssh/SlackSSH-aus-prod.key - StrictHostKeyChecking no diff --git a/slack-dist/env/ovh/SlackConfig-aus-prod.config b/slack-dist/env/ovh/SlackConfig-aus-prod.config deleted file mode 100644 index 40151e2..0000000 --- a/slack-dist/env/ovh/SlackConfig-aus-prod.config +++ /dev/null @@ -1,6 +0,0 @@ -ROLE_LIST=tsys-techops.turnsys.net:/local/tsys-techops/slack/prod/etc/roles.conf -SOURCE=tsys-techops-turnsys.net:/local/tsys-techops/ -CACHE=/var/cache/slack -STAGE=/var/lib/slack/stage -ROOT=/ -BACKUP_DIR=/var/lib/slack/backups diff --git a/slack-dist/env/ovh/SlackSSH-aus-prod.config b/slack-dist/env/ovh/SlackSSH-aus-prod.config deleted file mode 100644 index 6b2dfd6..0000000 --- a/slack-dist/env/ovh/SlackSSH-aus-prod.config +++ /dev/null @@ -1,4 +0,0 @@ -Host tsys-techops.turnsys.net - User tsys-techops - IdentityFile /root/.ssh/SlackSSH-aus-prod.key - StrictHostKeyChecking no diff --git a/slack-dist/env/ovh/SlackSSH-aus-prod.key b/slack-dist/env/ovh/SlackSSH-aus-prod.key deleted file mode 100644 index 12adcd4..0000000 --- a/slack-dist/env/ovh/SlackSSH-aus-prod.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAs7Ndaskoh0HVk4NSc8eR3PNBilv9DuWw8tjquo/7VEappkg3 -F8IlvxitVIxGoZEf2bkEigcYgB+l/6j5ubIKZ8R2vUzY3sSZpl5KGl/2yl+TtO/9 -F7ZyhYbR348gEDZMFCKUXdFsdCArf6u6nmbWaYGrunRRl/fPwNbmO7c0WF/UEqvB -cmJGY7772SJuuQUl/rhy9y4PJr8dmj7K04XU7tLJKqz83PLCiXis+g255vBJPjqA -MJG9hRo/8kQmNTbDR4dEwBRjce2Lo6iBaw4NHQ4mjYhZDprH6kZdfvDd6fs6+hJR -NIsUX3Q9g8wAReBqdtFED32QenoBKvshoZD78wIDAQABAoIBAGcw/toNfcp+EalN -5hE6bxaUUfSj8mOVntE1o0VS3R5+HXmxSoHIKWjdQNumWgD5l3Ktfl/Mx1L72ZVA -cXcjODpyZUU7VeZGu3z/9EnFBbEcxXNHxOzTBlyLGQXp6J2msHV3jf95/W+J8bC0 -6st/fmzD29uMZDaCRbkVLszn3ZVJKzO4EMNg5nfzf0ET9I77/fIgJE7whnCS9lE3 -0ELH4G/gCD/Rbjp9c6J+E55RvUNMoGECKy5NOKbFYNSEYQiIHpqceYzn82xHtErQ -rOz1MtikJHw6ACObsmsifobeGhHcuGqO99iHMmTIpBfLms0Dozr5oz1CODMwSkOP -j59RL7ECgYEA505s5NkBc7/aqQTLYdkdhcwi8ttbbPFYSMEuSvKV3GcuOA9S2pVZ -RdOE+u2ieEoJuvxbo02xhPSPz4w1VeqBjEoW1jFv1yaRDQG5h8f4Ya8aRCoBg/4c -V98cnUbtRym1YrXRSZ8TQVPpFA31A3SAgJSEojQRV09AMpjAHEJvBFcCgYEAxuKP -1W7oFPwQdnFUjKvEi+YHli6Jhq3ERrRfI2q9GDCRxyHX/agEtIELjrNk4OdKvjdn -oTnxfhI4g59yrOLa7tbV06T8L/ifk1zUG4rhiaZrTIRFGvtTeUoGN7ag/TVc/4Vp -RQa05z+MIrIf1jeSAShRIksNmy5n7j53rScTY8UCgYEApHS6L6uqwKVzziA+in9X -4j1Vy93yju65mmDfjSIVMvOZhPpAKnFtW5wcPFyg222opW2vqdgfkyxe424IreFh -4mD7A6d6oTomf1zukH+5NZrNzhEfqr0NYdyb96bqJWKeOGSVPQcBJb2HRl72CVLX -2pO+CaWDftQ2DMNWM8F4NVkCgYBZhUNOw7QNNgRG++4dv3chrXG+xMW8bFzLooas -T3A8Aiir5GzvTQCJKwjDu7Xtkc5P3mpz5LvxjkwH2u5oKVh4ZxUqRboJ8bQKRZ9n -olSwe8sSTvs4EOZa0toHm9nM/4cTsL5YhpNI/46ZU2oHJ0493SLf975xGitHzrBZ -rRwKLQKBgQCIKEi7Vjl7noNc6O2lIJG6GLAmpLsemcweP90wcpotV/qafsChZMt2 -LSai+iSdguFFu/J0KpfTkxuEeH5aT0D28zRUy3kP7WlP3wOTcDM/6iYsjLNIqeHf -X5AL3SFCbMemCZsvBVtPwfli7rsJNft/98VDlhkOaCyMa+sRjEEhlg== ------END RSA PRIVATE KEY----- diff --git a/slack-dist/env/ovh/SlackSSH-aus-prod.key.pub b/slack-dist/env/ovh/SlackSSH-aus-prod.key.pub deleted file mode 100644 index fee9b5f..0000000 --- a/slack-dist/env/ovh/SlackSSH-aus-prod.key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzs11qySiHQdWTg1Jzx5Hc80GKW/0O5bDy2Oq6j/tURqmmSDcXwiW/GK1UjEahkR/ZuQSKBxiAH6X/qPm5sgpnxHa9TNjexJmmXkoaX/bKX5O07/0XtnKFhtHfjyAQNkwUIpRd0Wx0ICt/q7qeZtZpgau6dFGX98/A1uY7tzRYX9QSq8FyYkZjvvvZIm65BSX+uHL3Lg8mvx2aPsrThdTu0skqrPzc8sKJeKz6Dbnm8Ek+OoAwkb2FGj/yRCY1NsNHh0TAFGNx7YujqIFrDg0dDiaNiFkOmsfqRl1+8N3p+zr6ElE0ixRfdD2DzABF4Gp20UQPfZB6egEq+yGhkPvz charles@ultix diff --git a/slack-dist/env/aus/SlackConfig-aus-prod.config b/slack-dist/env/prod/SlackConfig-prod.config similarity index 74% rename from slack-dist/env/aus/SlackConfig-aus-prod.config rename to slack-dist/env/prod/SlackConfig-prod.config index 40151e2..9fe8b0c 100644 --- a/slack-dist/env/aus/SlackConfig-aus-prod.config +++ b/slack-dist/env/prod/SlackConfig-prod.config @@ -1,5 +1,5 @@ ROLE_LIST=tsys-techops.turnsys.net:/local/tsys-techops/slack/prod/etc/roles.conf -SOURCE=tsys-techops-turnsys.net:/local/tsys-techops/ +SOURCE=tsys-techops.turnsys.net:/local/tsys-techops/ CACHE=/var/cache/slack STAGE=/var/lib/slack/stage ROOT=/ diff --git a/slack-dist/env/satx/SlackSSH-aus-prod.config b/slack-dist/env/prod/SlackSSH-prod.config similarity index 59% rename from slack-dist/env/satx/SlackSSH-aus-prod.config rename to slack-dist/env/prod/SlackSSH-prod.config index 6b2dfd6..72dac48 100644 --- a/slack-dist/env/satx/SlackSSH-aus-prod.config +++ b/slack-dist/env/prod/SlackSSH-prod.config @@ -1,4 +1,4 @@ Host tsys-techops.turnsys.net User tsys-techops - IdentityFile /root/.ssh/SlackSSH-aus-prod.key + IdentityFile /root/.ssh/SlackSSH-prod.key StrictHostKeyChecking no diff --git a/slack-dist/env/aus/SlackSSH-aus-prod.key b/slack-dist/env/prod/SlackSSH-prod.key similarity index 100% rename from slack-dist/env/aus/SlackSSH-aus-prod.key rename to slack-dist/env/prod/SlackSSH-prod.key diff --git a/slack-dist/env/aus/SlackSSH-aus-prod.key.pub b/slack-dist/env/prod/SlackSSH-prod.key.pub similarity index 100% rename from slack-dist/env/aus/SlackSSH-aus-prod.key.pub rename to slack-dist/env/prod/SlackSSH-prod.key.pub diff --git a/slack-dist/env/satx/SlackConfig-aus-prod.config b/slack-dist/env/satx/SlackConfig-aus-prod.config deleted file mode 100644 index 40151e2..0000000 --- a/slack-dist/env/satx/SlackConfig-aus-prod.config +++ /dev/null @@ -1,6 +0,0 @@ -ROLE_LIST=tsys-techops.turnsys.net:/local/tsys-techops/slack/prod/etc/roles.conf -SOURCE=tsys-techops-turnsys.net:/local/tsys-techops/ -CACHE=/var/cache/slack -STAGE=/var/lib/slack/stage -ROOT=/ -BACKUP_DIR=/var/lib/slack/backups diff --git a/slack-dist/env/satx/SlackSSH-aus-prod.key b/slack-dist/env/satx/SlackSSH-aus-prod.key deleted file mode 100644 index 12adcd4..0000000 --- a/slack-dist/env/satx/SlackSSH-aus-prod.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAs7Ndaskoh0HVk4NSc8eR3PNBilv9DuWw8tjquo/7VEappkg3 -F8IlvxitVIxGoZEf2bkEigcYgB+l/6j5ubIKZ8R2vUzY3sSZpl5KGl/2yl+TtO/9 -F7ZyhYbR348gEDZMFCKUXdFsdCArf6u6nmbWaYGrunRRl/fPwNbmO7c0WF/UEqvB -cmJGY7772SJuuQUl/rhy9y4PJr8dmj7K04XU7tLJKqz83PLCiXis+g255vBJPjqA -MJG9hRo/8kQmNTbDR4dEwBRjce2Lo6iBaw4NHQ4mjYhZDprH6kZdfvDd6fs6+hJR -NIsUX3Q9g8wAReBqdtFED32QenoBKvshoZD78wIDAQABAoIBAGcw/toNfcp+EalN -5hE6bxaUUfSj8mOVntE1o0VS3R5+HXmxSoHIKWjdQNumWgD5l3Ktfl/Mx1L72ZVA -cXcjODpyZUU7VeZGu3z/9EnFBbEcxXNHxOzTBlyLGQXp6J2msHV3jf95/W+J8bC0 -6st/fmzD29uMZDaCRbkVLszn3ZVJKzO4EMNg5nfzf0ET9I77/fIgJE7whnCS9lE3 -0ELH4G/gCD/Rbjp9c6J+E55RvUNMoGECKy5NOKbFYNSEYQiIHpqceYzn82xHtErQ -rOz1MtikJHw6ACObsmsifobeGhHcuGqO99iHMmTIpBfLms0Dozr5oz1CODMwSkOP -j59RL7ECgYEA505s5NkBc7/aqQTLYdkdhcwi8ttbbPFYSMEuSvKV3GcuOA9S2pVZ -RdOE+u2ieEoJuvxbo02xhPSPz4w1VeqBjEoW1jFv1yaRDQG5h8f4Ya8aRCoBg/4c -V98cnUbtRym1YrXRSZ8TQVPpFA31A3SAgJSEojQRV09AMpjAHEJvBFcCgYEAxuKP -1W7oFPwQdnFUjKvEi+YHli6Jhq3ERrRfI2q9GDCRxyHX/agEtIELjrNk4OdKvjdn -oTnxfhI4g59yrOLa7tbV06T8L/ifk1zUG4rhiaZrTIRFGvtTeUoGN7ag/TVc/4Vp -RQa05z+MIrIf1jeSAShRIksNmy5n7j53rScTY8UCgYEApHS6L6uqwKVzziA+in9X -4j1Vy93yju65mmDfjSIVMvOZhPpAKnFtW5wcPFyg222opW2vqdgfkyxe424IreFh -4mD7A6d6oTomf1zukH+5NZrNzhEfqr0NYdyb96bqJWKeOGSVPQcBJb2HRl72CVLX -2pO+CaWDftQ2DMNWM8F4NVkCgYBZhUNOw7QNNgRG++4dv3chrXG+xMW8bFzLooas -T3A8Aiir5GzvTQCJKwjDu7Xtkc5P3mpz5LvxjkwH2u5oKVh4ZxUqRboJ8bQKRZ9n -olSwe8sSTvs4EOZa0toHm9nM/4cTsL5YhpNI/46ZU2oHJ0493SLf975xGitHzrBZ -rRwKLQKBgQCIKEi7Vjl7noNc6O2lIJG6GLAmpLsemcweP90wcpotV/qafsChZMt2 -LSai+iSdguFFu/J0KpfTkxuEeH5aT0D28zRUy3kP7WlP3wOTcDM/6iYsjLNIqeHf -X5AL3SFCbMemCZsvBVtPwfli7rsJNft/98VDlhkOaCyMa+sRjEEhlg== ------END RSA PRIVATE KEY----- diff --git a/slack-dist/env/satx/SlackSSH-aus-prod.key.pub b/slack-dist/env/satx/SlackSSH-aus-prod.key.pub deleted file mode 100644 index fee9b5f..0000000 --- a/slack-dist/env/satx/SlackSSH-aus-prod.key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzs11qySiHQdWTg1Jzx5Hc80GKW/0O5bDy2Oq6j/tURqmmSDcXwiW/GK1UjEahkR/ZuQSKBxiAH6X/qPm5sgpnxHa9TNjexJmmXkoaX/bKX5O07/0XtnKFhtHfjyAQNkwUIpRd0Wx0ICt/q7qeZtZpgau6dFGX98/A1uY7tzRYX9QSq8FyYkZjvvvZIm65BSX+uHL3Lg8mvx2aPsrThdTu0skqrPzc8sKJeKz6Dbnm8Ek+OoAwkb2FGj/yRCY1NsNHh0TAFGNx7YujqIFrDg0dDiaNiFkOmsfqRl1+8N3p+zr6ElE0ixRfdD2DzABF4Gp20UQPfZB6egEq+yGhkPvz charles@ultix