Commit 150fd2f8207a7f3cdf7ae7ba64eb1641a2ae8366
1 parent
0a23e2e3
Renamed execute action into script. Formatted help page
Showing
1 changed file
with
27 additions
and
25 deletions
cluster-manager.sh
| ... | ... | @@ -146,7 +146,7 @@ case "$ACTION" in |
| 146 | 146 | shift |
| 147 | 147 | ARG_COMMAND=$@ |
| 148 | 148 | if [ -z "$ARG_COMMAND" ]; then |
| 149 | - echo "ERROR: Please specify a command: $0 touch last_access" | |
| 149 | + echo "ERROR: Please specify a command: $0 $ACTION touch last_access" | |
| 150 | 150 | exit 1 |
| 151 | 151 | fi |
| 152 | 152 | for HOST in ${HOSTLIST[@]}; do |
| ... | ... | @@ -154,22 +154,6 @@ case "$ACTION" in |
| 154 | 154 | done |
| 155 | 155 | ;; |
| 156 | 156 | |
| 157 | - execute) | |
| 158 | - ARG_SCRIPT_NAME=$2 | |
| 159 | - if [ -z $ARG_SCRIPT_NAME ]; then | |
| 160 | - echo "ERROR: Please specify the name of the script. e.g.: $0 do_something.sh" | |
| 161 | - exit 1 | |
| 162 | - fi | |
| 163 | - if [ ! -f $ARG_SCRIPT_NAME ]; then | |
| 164 | - echo "ERROR: File $ARG_SCRIPT_NAME does not exists" | |
| 165 | - exit 1 | |
| 166 | - fi | |
| 167 | - for HOST in ${HOSTLIST[@]}; do | |
| 168 | - echo scp $ARG_SCRIPT_NAME ${SSH_USER}${HOST}.routetopa.eu:$ARG_SCRIPT_NAME | |
| 169 | - echo ssh -t ${SSH_USER}${HOST}.routetopa.eu "source $ARG_SCRIPT_NAME; rm $ARG_SCRIPT_NAME" | |
| 170 | - done | |
| 171 | - ;; | |
| 172 | - | |
| 173 | 157 | db-backup) |
| 174 | 158 | ARG_BACKUP_NAME=$2 |
| 175 | 159 | if [ -z $ARG_BACKUP_NAME ]; then |
| ... | ... | @@ -185,7 +169,7 @@ case "$ACTION" in |
| 185 | 169 | db-restore) |
| 186 | 170 | ARG_BACKUP_NAME=$2 |
| 187 | 171 | if [ -z ${ARG_BACKUP_NAME} ]; then |
| 188 | - echo "ERROR: Please specify the name of the backup. e.g.: $0 backup.sql" | |
| 172 | + echo "ERROR: Please specify the name of the backup. e.g.: $0 $ACTION backup.sql" | |
| 189 | 173 | exit 1 |
| 190 | 174 | fi |
| 191 | 175 | for HOST in ${HOSTLIST[@]}; do |
| ... | ... | @@ -203,7 +187,7 @@ case "$ACTION" in |
| 203 | 187 | db-sql) |
| 204 | 188 | ARG_SCRIPT_NAME=$2 |
| 205 | 189 | if [ -z $ARG_SCRIPT_NAME ]; then |
| 206 | - echo "ERROR: Please specify the name of the sql. e.g.: $0 do_something.sql" | |
| 190 | + echo "ERROR: Please specify the name of the sql. e.g.: $0 $ACTION do_something.sql" | |
| 207 | 191 | exit 1 |
| 208 | 192 | fi |
| 209 | 193 | if [ ! -f $ARG_SCRIPT_NAME ]; then |
| ... | ... | @@ -211,8 +195,26 @@ case "$ACTION" in |
| 211 | 195 | exit 1 |
| 212 | 196 | fi |
| 213 | 197 | for HOST in ${HOSTLIST[@]}; do |
| 214 | - echo scp ${ARG_SCRIPT_NAME} ${SSH_USER}${HOST}.routetopa.eu:${ARG_SCRIPT_NAME} | |
| 215 | - echo ssh -t ${SSH_USER}${HOST}.routetopa.eu "mysql -u${MYSQL_USER} -p${MYSQL_PASS} ${MYSQL_DB} < ${ARG_SCRIPT_NAME}; rm ${ARG_SCRIPT_NAME}" | |
| 198 | + host_send_file ${HOST} ${ARG_SCRIPT_NAME} ${HOST}-${ARG_SCRIPT_NAME} | |
| 199 | + host_exec_cmd ${HOST} "mysql -u${MYSQL_USER} -p${MYSQL_PASS} ${MYSQL_DB} < ${HOST}-${ARG_SCRIPT_NAME}" | |
| 200 | + #echo scp ${ARG_SCRIPT_NAME} ${SSH_USER}${HOST}.routetopa.eu:${ARG_SCRIPT_NAME} | |
| 201 | + #echo ssh -t ${SSH_USER}${HOST}.routetopa.eu "mysql -u${MYSQL_USER} -p${MYSQL_PASS} ${MYSQL_DB} < ${ARG_SCRIPT_NAME}; rm ${ARG_SCRIPT_NAME}" | |
| 202 | + done | |
| 203 | + ;; | |
| 204 | + | |
| 205 | + script) | |
| 206 | + ARG_SCRIPT_NAME=$2 | |
| 207 | + if [ -z $ARG_SCRIPT_NAME ]; then | |
| 208 | + echo "ERROR: Please specify the name of the script. e.g.: $0 $ACTION do_something.sh" | |
| 209 | + exit 1 | |
| 210 | + fi | |
| 211 | + if [ ! -f $ARG_SCRIPT_NAME ]; then | |
| 212 | + echo "ERROR: File $ARG_SCRIPT_NAME does not exists" | |
| 213 | + exit 1 | |
| 214 | + fi | |
| 215 | + for HOST in ${HOSTLIST[@]}; do | |
| 216 | + echo scp $ARG_SCRIPT_NAME ${SSH_USER}${HOST}.routetopa.eu:$ARG_SCRIPT_NAME | |
| 217 | + echo ssh -t ${SSH_USER}${HOST}.routetopa.eu "source $ARG_SCRIPT_NAME; rm $ARG_SCRIPT_NAME" | |
| 216 | 218 | done |
| 217 | 219 | ;; |
| 218 | 220 | |
| ... | ... | @@ -226,19 +228,19 @@ case "$ACTION" in |
| 226 | 228 | ""|help) |
| 227 | 229 | echo "ROUTE-TO-PA PROJECT: CLUSTER-MANAGER.SH" |
| 228 | 230 | echo " " |
| 229 | - echo "Usage: $0 action <options>" | |
| 231 | + echo "Usage: $0 <action> [options]" | |
| 230 | 232 | echo " " |
| 231 | 233 | echo "List of actions:" |
| 232 | 234 | echo " help : Show this screen" |
| 233 | 235 | echo " cmd <command> : Execute <command> on hosts" |
| 234 | - echo " execute <script> : Copy <script> to hosts and execute it" | |
| 235 | 236 | echo " db-backup [filename] : Perform a database backup" |
| 236 | 237 | echo " db-restore [filename] : Restore a database backup" |
| 237 | - echo " db-sql <script> : Copy <script> to hosts and run with mysql client" | |
| 238 | + echo " db-sql <filename> : Copy <filename> to hosts and run with mysql client" | |
| 239 | + echo " script <filename> : Copy <filename> to hosts and execute it" | |
| 238 | 240 | echo " update : Update code using git pull" |
| 239 | 241 | echo " " |
| 240 | 242 | echo "List of options:" |
| 241 | - echo " -s [ssh_login]" | |
| 243 | + echo " -s <ssh_login>" | |
| 242 | 244 | ;; |
| 243 | 245 | |
| 244 | 246 | *) | ... | ... |