summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-11-12 11:44:14 -0200
committerSilvio Rhatto <rhatto@riseup.net>2016-11-12 11:44:14 -0200
commit0c19f0314656a363f1b992d8d2b00d420b955a03 (patch)
tree5c595c4ca907fb98bd10ced7f4cd23575e9fc1e3
parent5f682f4a1a4b5d09713bafdc1a6ee56ca2fd9c7c (diff)
downloadhydra-0c19f0314656a363f1b992d8d2b00d420b955a03.tar.gz
hydra-0c19f0314656a363f1b992d8d2b00d420b955a03.tar.bz2
Fixes import-certs
-rwxr-xr-xshare/hydra/import-certs22
1 files changed, 11 insertions, 11 deletions
diff --git a/share/hydra/import-certs b/share/hydra/import-certs
index 74f8d21..0349986 100755
--- a/share/hydra/import-certs
+++ b/share/hydra/import-certs
@@ -20,8 +20,10 @@
source $APP_BASE/lib/hydra/functions || exit 1
hydra_config_load
-# Command line arguments
+# Parameters
NODES="$*"
+PRIVATE="/etc/ssl/private"
+SERVICES="apache2 postfix dovecot nginx lighttpd mumble"
# Build node list
if [ -z "$NODES" ]; then
@@ -84,18 +86,16 @@ EOF
fi
# Concatenated cert
- cd /etc/ssl/private
- sudo touch $prefix-concat.pem
- sudo chown root.ssl-cert $prefix-concat.pem
- sudo chmod 640 $prefix-concat.pem
- sudo cp /etc/ssl/certs/$cert $prefix-concat.pem
- sudo cat $priv | sudo tee -a $prefix-concat.pem > /dev/null
+ sudo touch $PRIVATE/$prefix-concat.pem
+ sudo chown root.ssl-cert $PRIVATE/$prefix-concat.pem
+ sudo chmod 640 $PRIVATE/$prefix-concat.pem
+ sudo cp /etc/ssl/certs/$cert $PRIVATE/$prefix-concat.pem
+ sudo cat $PRIVATE/$priv | sudo tee -a $PRIVATE/$prefix-concat.pem > /dev/null
# Restart services
- services="apache2 postfix nginx lighttpd mumble"
- for service in \$services; do
- if systemctl list-units | grep active | grep -q $service'.service'; then
- sudo service $service restart
+ for service in $SERVICES; do
+ if systemctl list-units | grep active | grep -q \$service'.service'; then
+ sudo service \$service restart
fi
done
EOF