Rename actions 'deploy' to 'install'

diff --git a/share/hydra/deploy b/share/hydra/install
similarity index 94%
rename from share/hydra/deploy
rename to share/hydra/install
index 6a118dee5babc2b4cdde434993ce7fac322ef1b7..cd479813af42272be5f2080accedd531e3243e21 100755 (executable)
--- 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 92945f8a8f0344264c84dea5317529bb66fccef5..c30c82fe07234ab77e8caf104cce8de3fc738f16 100755 (executable)
--- 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 a6e62e0085757a3dc2bc5bb2d142e0fdf743dd61..35b2edb899ea959e806d5e41a449cc6dc7b22e28 100755 (executable)
--- 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 371cd3aa25c251a490f59e35d60c156fef6319c7..6179ad94addd52d218f55a2ffc491e7abd522286 100755 (executable)
--- 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 b175c32a7bb519020d8dbc72e9a0ab84212d9f37..fcf1b033029a383dcde74b2e4e45d390fc52e734 100755 (executable)
--- 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 c5885f86add33e44b99588e403d13a09fc5a18b2..b0a4541eaddbb2df06a9e26ae3187b4b9a573212 100755 (executable)
--- 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 457165b50ced0c296c104b01465c52c130a37676..baf13b82204aba65f4cfe98698efc45d7c96c9d6 100755 (executable)
--- 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 3bcdff4584ee58cb5353830ad5478c208a167eef..917fdce3d75f17d521a087fd2a3f1c79e5065a00 100755 (executable)
--- 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
similarity index 97%
rename from share/hydractl/deploy
rename to share/hydractl/install
index 5dc188a67f9bf9dc775987d490be425607d96e2d..1b687db8b99ef493f54cd277800b9da0a0721070 100755 (executable)
--- 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