Rename actions 'deploy' to 'install'

9 files changed, 9 insertions, 12 deletions

diff --git a/share/hydra/deploy b/share/hydra/install
index 6a118de..cd47981 100755
--- a/share/hydra/deploy
+++ b/share/hydra/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Deploy hydra suite on multiple nodes.
+# 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
@@ -58,7 +58,7 @@ for node in $NODES; do
   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
+  # 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
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/install
index 5dc188a..1b687db 100755
--- a/share/hydractl/deploy
+++ b/share/hydractl/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Deploy hydra suite on local node.
+# 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