From e0f6b1bc64d737aa03f1383b01c71989443d48a3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 8 Sep 2015 15:30:00 -0300 Subject: Rename actions 'deploy' to 'install' --- share/hydra/deploy | 67 --------------------------------- share/hydra/install | 67 +++++++++++++++++++++++++++++++++ share/hydra/ssh-config | 9 +++-- share/hydractl/backup-restore-firma | 1 - share/hydractl/backup-restore-mail | 1 - share/hydractl/backup-restore-mlmmj | 1 - share/hydractl/backup-restore-schleuder | 1 - share/hydractl/backup-restore-svn | 1 - share/hydractl/backup-restore-sympa | 1 - share/hydractl/deploy | 59 ----------------------------- share/hydractl/install | 59 +++++++++++++++++++++++++++++ 11 files changed, 132 insertions(+), 135 deletions(-) delete mode 100755 share/hydra/deploy create mode 100755 share/hydra/install delete mode 100755 share/hydractl/deploy create mode 100755 share/hydractl/install diff --git a/share/hydra/deploy b/share/hydra/deploy deleted file mode 100755 index 6a118de..0000000 --- a/share/hydra/deploy +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# -# Deploy hydra suite on multiple nodes. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public -# License along with this program. If not, see -# . - -# Load -source $APP_BASE/lib/hydra/functions || exit 1 -hydra_config_load - -# Command line arguments -NODES="$*" - -# Build node list -if [ -z "$NODES" ]; then - NODES="`hydra $HYDRA nodes`" -fi - -# Validation -if [ -z "$ORIGIN" ]; then - ORIGIN="git://git.sarava.org/hydra.git" -fi - -# Deploy -for node in $NODES; do - echo "Deploying to $node..." - $HYDRA_CONNECT $node < /dev/null; then - echo "Installing git..." - sudo aptitude update - sudo aptitude install git-core -y - fi - - if [ ! -d /usr/local/hydra ]; then - sudo git clone $ORIGIN /usr/local/hydra - ( cd /usr/local/hydra ; sudo git reset --hard $COMMIT ) - else - ( cd /usr/local/hydra ; sudo git pull ; sudo git reset --hard $COMMIT ) - fi - ##### END REMOTE SCRIPT ####### - - # Update symlinks - sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydra - sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydractl - sudo ln -sf /usr/local/hydra/hydras /usr/local/bin/hydras - - # Remove from old location - # We're keep hydra on /usr/local/bin as /usr/local/sbin might - # not be available on $PATH when connecting to a remote system. - sudo rm -f /usr/local/sbin/hydra - sudo rm -f /usr/local/sbin/hydractl - sudo rm -f /usr/local/sbin/hydras -EOF -done diff --git a/share/hydra/install b/share/hydra/install new file mode 100755 index 0000000..cd47981 --- /dev/null +++ b/share/hydra/install @@ -0,0 +1,67 @@ +#!/bin/bash +# +# Install the Hydra Suite on multiple nodes. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public +# License along with this program. If not, see +# . + +# Load +source $APP_BASE/lib/hydra/functions || exit 1 +hydra_config_load + +# Command line arguments +NODES="$*" + +# Build node list +if [ -z "$NODES" ]; then + NODES="`hydra $HYDRA nodes`" +fi + +# Validation +if [ -z "$ORIGIN" ]; then + ORIGIN="git://git.sarava.org/hydra.git" +fi + +# Deploy +for node in $NODES; do + echo "Deploying to $node..." + $HYDRA_CONNECT $node < /dev/null; then + echo "Installing git..." + sudo aptitude update + sudo aptitude install git-core -y + fi + + if [ ! -d /usr/local/hydra ]; then + sudo git clone $ORIGIN /usr/local/hydra + ( cd /usr/local/hydra ; sudo git reset --hard $COMMIT ) + else + ( cd /usr/local/hydra ; sudo git pull ; sudo git reset --hard $COMMIT ) + fi + ##### END REMOTE SCRIPT ####### + + # Update symlinks + sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydra + sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydractl + sudo ln -sf /usr/local/hydra/hydras /usr/local/bin/hydras + + # Remove from old location + # We keep hydra on /usr/local/bin as /usr/local/sbin might + # not be available on $PATH when connecting to a remote system. + sudo rm -f /usr/local/sbin/hydra + sudo rm -f /usr/local/sbin/hydractl + sudo rm -f /usr/local/sbin/hydras +EOF +done diff --git a/share/hydra/ssh-config b/share/hydra/ssh-config index 92945f8..c30c82f 100755 --- a/share/hydra/ssh-config +++ b/share/hydra/ssh-config @@ -1,13 +1,16 @@ #!/bin/bash # Thanks to http://paste.debian.net/93242/ +# Parameters +NODESDIR=${1} +DOMAIN="`hydra $HYDRA config domain`" + +# Syntax check if [ $# -ne 1 ]; then echo "Usage: ${0} nodes_dir" exit 1 fi -NODESDIR=${1} - if [ ! -d ${NODESDIR} ]; then echo "Not a directory: ${NODESDIR}" exit 1 @@ -26,7 +29,7 @@ while read l; do host=${l} unset ishost else - echo Host ${host}.sarava.org + echo Host ${host}.${DOMAIN} echo Port 22`printf "%02d" "${l}"` echo ishost=1 diff --git a/share/hydractl/backup-restore-firma b/share/hydractl/backup-restore-firma index a6e62e0..35b2edb 100755 --- a/share/hydractl/backup-restore-firma +++ b/share/hydractl/backup-restore-firma @@ -36,4 +36,3 @@ rsync -av --delete $RESTOREDIR/$SERVICE_DIR/ $SERVICE_DIR/ # Fix permissions. chown -R $SERVICE_USER.$SERVICE_GROUP $SERVICE_DIR - diff --git a/share/hydractl/backup-restore-mail b/share/hydractl/backup-restore-mail index 371cd3a..6179ad9 100755 --- a/share/hydractl/backup-restore-mail +++ b/share/hydractl/backup-restore-mail @@ -51,4 +51,3 @@ rsync -av $RESTOREDIR/$DATABASE_DIR/ $DATABASE_DIR/ # Fix permissions. chown -R $SERVICE_USER.$SERVICE_GROUP $SERVICE_DIR - diff --git a/share/hydractl/backup-restore-mlmmj b/share/hydractl/backup-restore-mlmmj index b175c32..fcf1b03 100755 --- a/share/hydractl/backup-restore-mlmmj +++ b/share/hydractl/backup-restore-mlmmj @@ -36,4 +36,3 @@ rsync -av --delete $RESTOREDIR/$SERVICE_DIR/ $SERVICE_DIR/ # Fix permissions. chown -R $SERVICE_USER.$SERVICE_GROUP $SERVICE_DIR - diff --git a/share/hydractl/backup-restore-schleuder b/share/hydractl/backup-restore-schleuder index c5885f8..b0a4541 100755 --- a/share/hydractl/backup-restore-schleuder +++ b/share/hydractl/backup-restore-schleuder @@ -38,4 +38,3 @@ rsync -av --delete $RESTOREDIR/$CONF_DIR/ $CONF_DIR/ # Fix permissions. chown -R $SERVICE_USER.$SERVICE_GROUP $SERVICE_DIR - diff --git a/share/hydractl/backup-restore-svn b/share/hydractl/backup-restore-svn index 457165b..baf13b8 100755 --- a/share/hydractl/backup-restore-svn +++ b/share/hydractl/backup-restore-svn @@ -41,4 +41,3 @@ rm -rf /var/svn && cp -a $RESTOREDIR/var/svn /var/svn # Fix permissions. chown root.root /var/svn chown -R $SERVICE_USER.$SERVICE_GROUP /var/svn/* - diff --git a/share/hydractl/backup-restore-sympa b/share/hydractl/backup-restore-sympa index 3bcdff4..917fdce 100755 --- a/share/hydractl/backup-restore-sympa +++ b/share/hydractl/backup-restore-sympa @@ -42,4 +42,3 @@ hydra_backup_restore_database sympa # Fix permissions. chown -R $SERVICE_USER.$SERVICE_GROUP $SERVICE_DIR - diff --git a/share/hydractl/deploy b/share/hydractl/deploy deleted file mode 100755 index 5dc188a..0000000 --- a/share/hydractl/deploy +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# -# Deploy hydra suite on local node. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public -# License along with this program. If not, see -# . - -# Load -source $APP_BASE/lib/hydra/functions || exit 1 -hydra_config_load - -# Validation -if [ -z "$ORIGIN" ]; then - ORIGIN="git://git.sarava.org/hydra.git" -fi - -# Set sudo config -if [ "`whoami`" != 'root' ]; then - sudo="sudo" -fi - -# Deploy -echo "Deploying to local node..." - -if ! which git &> /dev/null; then - echo "Installing git..." - $sudo aptitude update - $sudo aptitude install git-core -y -fi - -if [ ! -d /usr/local/hydra ]; then - $sudo git clone $ORIGIN /usr/local/hydra - ( cd /usr/local/hydra ; $sudo git reset --hard $COMMIT ) -else - ( cd /usr/local/hydra ; $sudo git pull ; $sudo git reset --hard $COMMIT ) -fi - -# Update symlinks -$sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydra -$sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydractl -$sudo ln -sf /usr/local/hydra/hydras /usr/local/bin/hydras - -# Remove from old location -# We're keep hydra on /usr/local/bin as /usr/local/sbin might -# not be available on $PATH when connecting to a remote system. -$sudo rm -f /usr/local/sbin/hydra -$sudo rm -f /usr/local/sbin/hydractl -$sudo rm -f /usr/local/sbin/hydras diff --git a/share/hydractl/install b/share/hydractl/install new file mode 100755 index 0000000..1b687db --- /dev/null +++ b/share/hydractl/install @@ -0,0 +1,59 @@ +#!/bin/bash +# +# Install the Hydra Suite on local node. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public +# License along with this program. If not, see +# . + +# Load +source $APP_BASE/lib/hydra/functions || exit 1 +hydra_config_load + +# Validation +if [ -z "$ORIGIN" ]; then + ORIGIN="git://git.sarava.org/hydra.git" +fi + +# Set sudo config +if [ "`whoami`" != 'root' ]; then + sudo="sudo" +fi + +# Deploy +echo "Deploying to local node..." + +if ! which git &> /dev/null; then + echo "Installing git..." + $sudo aptitude update + $sudo aptitude install git-core -y +fi + +if [ ! -d /usr/local/hydra ]; then + $sudo git clone $ORIGIN /usr/local/hydra + ( cd /usr/local/hydra ; $sudo git reset --hard $COMMIT ) +else + ( cd /usr/local/hydra ; $sudo git pull ; $sudo git reset --hard $COMMIT ) +fi + +# Update symlinks +$sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydra +$sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydractl +$sudo ln -sf /usr/local/hydra/hydras /usr/local/bin/hydras + +# Remove from old location +# We're keep hydra on /usr/local/bin as /usr/local/sbin might +# not be available on $PATH when connecting to a remote system. +$sudo rm -f /usr/local/sbin/hydra +$sudo rm -f /usr/local/sbin/hydractl +$sudo rm -f /usr/local/sbin/hydras -- cgit v1.2.3