From 13ed77a6ca86f9f495da1ed376e6913e90e671b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Fri, 22 Apr 2016 12:18:25 +0200
Subject: [PATCH] [fix] Set default values for force and dry_run in conf_regen
 hooks

---
 data/hooks/conf_regen/01-yunohost     | 4 ++--
 data/hooks/conf_regen/02-ssl          | 4 ++--
 data/hooks/conf_regen/03-ssh          | 4 ++--
 data/hooks/conf_regen/06-slapd        | 4 ++--
 data/hooks/conf_regen/09-nslcd        | 4 ++--
 data/hooks/conf_regen/12-metronome    | 4 ++--
 data/hooks/conf_regen/15-nginx        | 4 ++--
 data/hooks/conf_regen/19-postfix      | 4 ++--
 data/hooks/conf_regen/25-dovecot      | 4 ++--
 data/hooks/conf_regen/28-rmilter      | 4 ++--
 data/hooks/conf_regen/31-rspamd       | 4 ++--
 data/hooks/conf_regen/34-mysql        | 4 ++--
 data/hooks/conf_regen/37-avahi-daemon | 4 ++--
 data/hooks/conf_regen/40-glances      | 4 ++--
 data/hooks/conf_regen/43-dnsmasq      | 4 ++--
 data/hooks/conf_regen/46-nsswitch     | 4 ++--
 data/hooks/conf_regen/52-fail2ban     | 4 ++--
 17 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/data/hooks/conf_regen/01-yunohost b/data/hooks/conf_regen/01-yunohost
index 78cb92b1b..96b62fe67 100755
--- a/data/hooks/conf_regen/01-yunohost
+++ b/data/hooks/conf_regen/01-yunohost
@@ -90,8 +90,8 @@ if updated:
 EOF
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/02-ssl b/data/hooks/conf_regen/02-ssl
index 758e61b15..e3e30cb19 100755
--- a/data/hooks/conf_regen/02-ssl
+++ b/data/hooks/conf_regen/02-ssl
@@ -71,8 +71,8 @@ do_post_regen() {
   # TODO: regenerate certificates if conf changed?
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/03-ssh b/data/hooks/conf_regen/03-ssh
index b0cac73f7..6fb6953ce 100755
--- a/data/hooks/conf_regen/03-ssh
+++ b/data/hooks/conf_regen/03-ssh
@@ -26,8 +26,8 @@ do_post_regen() {
   fi
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/06-slapd b/data/hooks/conf_regen/06-slapd
index 6211ebe28..f4bda09da 100755
--- a/data/hooks/conf_regen/06-slapd
+++ b/data/hooks/conf_regen/06-slapd
@@ -95,8 +95,8 @@ do_post_regen() {
   sudo service slapd force-reload
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/09-nslcd b/data/hooks/conf_regen/09-nslcd
index d0338ad6c..a008c4288 100755
--- a/data/hooks/conf_regen/09-nslcd
+++ b/data/hooks/conf_regen/09-nslcd
@@ -17,8 +17,8 @@ do_post_regen() {
     || sudo service nslcd restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/12-metronome b/data/hooks/conf_regen/12-metronome
index cabbe8912..4214722fc 100755
--- a/data/hooks/conf_regen/12-metronome
+++ b/data/hooks/conf_regen/12-metronome
@@ -57,8 +57,8 @@ do_post_regen() {
     || sudo service metronome restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/15-nginx b/data/hooks/conf_regen/15-nginx
index 8c2fae2db..9624878eb 100755
--- a/data/hooks/conf_regen/15-nginx
+++ b/data/hooks/conf_regen/15-nginx
@@ -79,8 +79,8 @@ do_post_regen() {
   sudo service nginx restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/19-postfix b/data/hooks/conf_regen/19-postfix
index 66a92f9a9..3cb5cdf50 100755
--- a/data/hooks/conf_regen/19-postfix
+++ b/data/hooks/conf_regen/19-postfix
@@ -37,8 +37,8 @@ do_post_regen() {
     || sudo service postfix restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/25-dovecot b/data/hooks/conf_regen/25-dovecot
index 344f43222..37552c16b 100755
--- a/data/hooks/conf_regen/25-dovecot
+++ b/data/hooks/conf_regen/25-dovecot
@@ -50,8 +50,8 @@ do_post_regen() {
   sudo service dovecot restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/28-rmilter b/data/hooks/conf_regen/28-rmilter
index e34ceeeea..9d6df61d7 100755
--- a/data/hooks/conf_regen/28-rmilter
+++ b/data/hooks/conf_regen/28-rmilter
@@ -48,8 +48,8 @@ do_post_regen() {
   sudo systemctl -q stop rmilter.service 2>&1 || true
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/31-rspamd b/data/hooks/conf_regen/31-rspamd
index 5e0cb0bd1..1ea777de8 100755
--- a/data/hooks/conf_regen/31-rspamd
+++ b/data/hooks/conf_regen/31-rspamd
@@ -31,8 +31,8 @@ do_post_regen() {
   sudo systemctl -q stop rspamd.service 2>&1 || true
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/34-mysql b/data/hooks/conf_regen/34-mysql
index c247acbf1..bd5b5d69d 100755
--- a/data/hooks/conf_regen/34-mysql
+++ b/data/hooks/conf_regen/34-mysql
@@ -32,8 +32,8 @@ do_post_regen() {
     || sudo service mysql restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/37-avahi-daemon b/data/hooks/conf_regen/37-avahi-daemon
index 8ce180551..113e9e0c7 100755
--- a/data/hooks/conf_regen/37-avahi-daemon
+++ b/data/hooks/conf_regen/37-avahi-daemon
@@ -17,8 +17,8 @@ do_post_regen() {
     || sudo service avahi-daemon restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/40-glances b/data/hooks/conf_regen/40-glances
index e610eca2d..e7d6b07b9 100755
--- a/data/hooks/conf_regen/40-glances
+++ b/data/hooks/conf_regen/40-glances
@@ -17,8 +17,8 @@ do_post_regen() {
     || sudo service glances restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/43-dnsmasq b/data/hooks/conf_regen/43-dnsmasq
index b773cb20a..6947fb634 100755
--- a/data/hooks/conf_regen/43-dnsmasq
+++ b/data/hooks/conf_regen/43-dnsmasq
@@ -47,8 +47,8 @@ do_post_regen() {
     || sudo service dnsmasq restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/46-nsswitch b/data/hooks/conf_regen/46-nsswitch
index e2865c867..9cbcae13d 100755
--- a/data/hooks/conf_regen/46-nsswitch
+++ b/data/hooks/conf_regen/46-nsswitch
@@ -17,8 +17,8 @@ do_post_regen() {
     || sudo service nscd restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)
diff --git a/data/hooks/conf_regen/52-fail2ban b/data/hooks/conf_regen/52-fail2ban
index 3b01aead7..1c262078b 100755
--- a/data/hooks/conf_regen/52-fail2ban
+++ b/data/hooks/conf_regen/52-fail2ban
@@ -21,8 +21,8 @@ do_post_regen() {
     || sudo service fail2ban restart
 }
 
-FORCE=$2
-DRY_RUN=$3
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
 
 case "$1" in
   pre)