diff --git a/data/hooks/conf_regen/01-yunohost b/data/hooks/conf_regen/01-yunohost index 656663548..27268b5a9 100755 --- a/data/hooks/conf_regen/01-yunohost +++ b/data/hooks/conf_regen/01-yunohost @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -34,7 +34,7 @@ case "$1" in post) ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/02-ssl b/data/hooks/conf_regen/02-ssl index 6239b931d..5d14cb3d1 100755 --- a/data/hooks/conf_regen/02-ssl +++ b/data/hooks/conf_regen/02-ssl @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e ssl_dir="/usr/share/yunohost/yunohost-config/ssl/yunoCA" @@ -65,7 +65,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/03-ssh b/data/hooks/conf_regen/03-ssh index 844efef3b..bbf9591e5 100755 --- a/data/hooks/conf_regen/03-ssh +++ b/data/hooks/conf_regen/03-ssh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -13,7 +13,7 @@ do_pre_regen() { [[ -f /proc/net/if_inet6 ]] \ || sed -i "s/ListenAddress ::/#ListenAddress ::/g" sshd_config - install -D sshd_config "${pending_conf}/etc/ssh/sshd_config" + install -D sshd_config "${pending_dir}/etc/ssh/sshd_config" fi } @@ -32,7 +32,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/06-slapd b/data/hooks/conf_regen/06-slapd index a2b0b08c3..778b32eea 100755 --- a/data/hooks/conf_regen/06-slapd +++ b/data/hooks/conf_regen/06-slapd @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -76,7 +76,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/09-nslcd b/data/hooks/conf_regen/09-nslcd index e9239ca48..9ae1a8192 100755 --- a/data/hooks/conf_regen/09-nslcd +++ b/data/hooks/conf_regen/09-nslcd @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -24,7 +24,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/12-metronome b/data/hooks/conf_regen/12-metronome index 31f925858..b07a8894f 100755 --- a/data/hooks/conf_regen/12-metronome +++ b/data/hooks/conf_regen/12-metronome @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -66,7 +66,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/19-postfix b/data/hooks/conf_regen/19-postfix index 2f1ffb283..df62a0350 100755 --- a/data/hooks/conf_regen/19-postfix +++ b/data/hooks/conf_regen/19-postfix @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -19,7 +19,7 @@ do_pre_regen() { | sed "s/{{ main_domain }}/${main_domain}/g" \ > "${postfix_dir}/main.cf" - # adapt it to IPv4-only hosts + # adapt it for IPv4-only hosts if [ ! -f /proc/net/if_inet6 ]; then sed -i \ 's/ \[::ffff:127.0.0.0\]\/104 \[::1\]\/128//g' \ @@ -45,7 +45,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/25-dovecot b/data/hooks/conf_regen/25-dovecot index 190e50ef2..0a80dcb13 100755 --- a/data/hooks/conf_regen/25-dovecot +++ b/data/hooks/conf_regen/25-dovecot @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -56,7 +56,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/28-rmilter b/data/hooks/conf_regen/28-rmilter index 75f3d327a..a46284bc8 100755 --- a/data/hooks/conf_regen/28-rmilter +++ b/data/hooks/conf_regen/28-rmilter @@ -48,7 +48,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/31-rspamd b/data/hooks/conf_regen/31-rspamd index 513326f0b..258535634 100755 --- a/data/hooks/conf_regen/31-rspamd +++ b/data/hooks/conf_regen/31-rspamd @@ -37,7 +37,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/37-avahi-daemon b/data/hooks/conf_regen/37-avahi-daemon index bbf290576..6eba8c729 100755 --- a/data/hooks/conf_regen/37-avahi-daemon +++ b/data/hooks/conf_regen/37-avahi-daemon @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -24,7 +24,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/40-glances b/data/hooks/conf_regen/40-glances index 73558338c..7fe40c2d8 100755 --- a/data/hooks/conf_regen/40-glances +++ b/data/hooks/conf_regen/40-glances @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -24,7 +24,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/46-nsswitch b/data/hooks/conf_regen/46-nsswitch index f6ced70f3..352346e68 100755 --- a/data/hooks/conf_regen/46-nsswitch +++ b/data/hooks/conf_regen/46-nsswitch @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -24,7 +24,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac diff --git a/data/hooks/conf_regen/52-fail2ban b/data/hooks/conf_regen/52-fail2ban index 39fd3be21..88af82326 100755 --- a/data/hooks/conf_regen/52-fail2ban +++ b/data/hooks/conf_regen/52-fail2ban @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -e do_pre_regen() { pending_dir=$1 @@ -28,7 +28,7 @@ case "$1" in do_post_regen ;; *) - echo "hook called with unknown argument \`$status'" >&2 + echo "hook called with unknown argument \`$1'" >&2 exit 1 ;; esac