From cb557c1a2139ecb347ef1a20a672046f32713942 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 9 Sep 2015 18:34:54 +0200
Subject: [PATCH 01/10] [fix] Indent postinst script uniformly

---
 debian/postinst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 2ad815792..279301c20 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,21 +4,21 @@ TMP=/usr/share/yunohost/yunohost-config/moulinette
 
 if [ ! -d /etc/yunohost ];
 then
-	mkdir -p /etc/yunohost
+    mkdir -p /etc/yunohost
 fi
 
 # Allow users to access /media directory
 if [ ! -d /etc/skel/media ];
 then
-        mkdir -p /media
-	ln -s /media /etc/skel/
+    mkdir -p /media
+    ln -s /media /etc/skel/
 fi
 
 #Firewall
 grep -q "UPNP:" /etc/yunohost/firewall.yml > /dev/null 2>&1
 if [[ $? -eq 0 ]] || [ ! -f /etc/yunohost/firewall.yml ];
 then
-	cp $TMP/firewall.yml /etc/yunohost/
+    cp $TMP/firewall.yml /etc/yunohost/
 fi
 
 # App fetchlist
@@ -30,7 +30,7 @@ fi
 # Service list
 if [ ! -f /etc/yunohost/services.yml ];
 then
-	cp $TMP/services.yml /etc/yunohost/
+    cp $TMP/services.yml /etc/yunohost/
 fi
 
 # Stop old API

From de6c2858d10d1c3a08cc5f21295388dd4aedcc7e Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 9 Sep 2015 18:37:52 +0200
Subject: [PATCH 02/10] [enh] postinst : only respond to configure

---
 debian/postinst | 121 ++++++++++++++++++++++++++++++------------------
 1 file changed, 75 insertions(+), 46 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 279301c20..564c9e1eb 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,56 +1,85 @@
 #!/bin/bash
+#!/bin/sh
+# postinst script for yunohost-config-metronome
 
-TMP=/usr/share/yunohost/yunohost-config/moulinette
+set -e
 
-if [ ! -d /etc/yunohost ];
-then
-    mkdir -p /etc/yunohost
-fi
+do_configure() {
+  TMP=/usr/share/yunohost/yunohost-config/moulinette
 
-# Allow users to access /media directory
-if [ ! -d /etc/skel/media ];
-then
-    mkdir -p /media
-    ln -s /media /etc/skel/
-fi
+  if [ ! -d /etc/yunohost ];
+  then
+      mkdir -p /etc/yunohost
+  fi
 
-#Firewall
-grep -q "UPNP:" /etc/yunohost/firewall.yml > /dev/null 2>&1
-if [[ $? -eq 0 ]] || [ ! -f /etc/yunohost/firewall.yml ];
-then
-    cp $TMP/firewall.yml /etc/yunohost/
-fi
+  # Allow users to access /media directory
+  if [ ! -d /etc/skel/media ];
+  then
+      mkdir -p /media
+      ln -s /media /etc/skel/
+  fi
 
-# App fetchlist
-if [ -f /etc/cron.d/yunohost-applist-yunohost ];
-then
-    sed -i "s/--no-ldap //g" /etc/cron.d/yunohost-applist-yunohost
-fi
+  #Firewall
+  grep -q "UPNP:" /etc/yunohost/firewall.yml > /dev/null 2>&1
+  if [[ $? -eq 0 ]] || [ ! -f /etc/yunohost/firewall.yml ];
+  then
+      cp $TMP/firewall.yml /etc/yunohost/
+  fi
 
-# Service list
-if [ ! -f /etc/yunohost/services.yml ];
-then
-    cp $TMP/services.yml /etc/yunohost/
-fi
+  # App fetchlist
+  if [ -f /etc/cron.d/yunohost-applist-yunohost ];
+  then
+      sed -i "s/--no-ldap //g" /etc/cron.d/yunohost-applist-yunohost
+  fi
 
-# Stop old API
-ps aux | grep "yunohost.tac" | grep -qv grep
-if [[ $? -eq 0 ]];
-then
-    killall twistd
-fi
+  # Service list
+  if [ ! -f /etc/yunohost/services.yml ];
+  then
+      cp $TMP/services.yml /etc/yunohost/
+  fi
 
-rm -rf /var/cache/moulinette/*
-update-rc.d yunohost-api defaults
-service yunohost-api restart
+  # Stop old API
+  ps aux | grep "yunohost.tac" | grep -qv grep
+  if [[ $? -eq 0 ]];
+  then
+      killall twistd
+  fi
 
-# Reload SSOwat conf if obsolete
-if [ -f /etc/yunohost/installed ];
-then
-    yunohost firewall upnp | grep -qi "true"
-    if [[ $? -eq 0 ]];
-    then
-        yunohost firewall upnp enable
-    fi
-    yunohost app ssowatconf
-fi
+  rm -rf /var/cache/moulinette/*
+  update-rc.d yunohost-api defaults
+  service yunohost-api restart
+
+  # Reload SSOwat conf if obsolete
+  if [ -f /etc/yunohost/installed ];
+  then
+      yunohost firewall upnp | grep -qi "true"
+      if [[ $? -eq 0 ]];
+      then
+          yunohost firewall upnp enable
+      fi
+      yunohost app ssowatconf
+  fi
+}
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    configure)
+        do_configure
+    ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac

From 7a4edd2bc2ae9c766498bd3a49a4fc617161c2bc Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 9 Sep 2015 18:39:29 +0200
Subject: [PATCH 03/10] [lintian] fix
 output-of-updaterc.d-not-redirected-to-dev-null yunohost-api postinst

---
 debian/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/postinst b/debian/postinst
index 564c9e1eb..9b04e93e7 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -46,7 +46,7 @@ do_configure() {
   fi
 
   rm -rf /var/cache/moulinette/*
-  update-rc.d yunohost-api defaults
+  update-rc.d yunohost-api defaults > /dev/null
   service yunohost-api restart
 
   # Reload SSOwat conf if obsolete

From 06e667b71a0d7d9f5dcaf53236c4dde63023bfa8 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 9 Sep 2015 18:45:16 +0200
Subject: [PATCH 04/10] [lintian] fix
 postrm-contains-additional-updaterc.d-calls etc/init.d/yunohost-firewall

---
 debian/postinst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/postinst b/debian/postinst
index 9b04e93e7..9a537a19f 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -49,6 +49,9 @@ do_configure() {
   update-rc.d yunohost-api defaults > /dev/null
   service yunohost-api restart
 
+  # Firewall
+  update-rc.d yunohost-firewall defaults > /dev/null
+
   # Reload SSOwat conf if obsolete
   if [ -f /etc/yunohost/installed ];
   then

From e57a4533b4526e059c31a115ffcc9c59241bd3e2 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 9 Sep 2015 18:54:58 +0200
Subject: [PATCH 05/10] [lintian] fix init.d-script-missing-lsb-description

---
 debian/yunohost-api.init      | 1 +
 debian/yunohost-firewall.init | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/yunohost-api.init b/debian/yunohost-api.init
index 11c92b747..2bd0222b2 100755
--- a/debian/yunohost-api.init
+++ b/debian/yunohost-api.init
@@ -6,6 +6,7 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start/stop YunoHost API
+# Description:       Start/stop YunoHost API
 ### END INIT INFO
 
 DAEMON=/usr/bin/yunohost-api
diff --git a/debian/yunohost-firewall.init b/debian/yunohost-firewall.init
index f16e1d6b4..06bf2145c 100755
--- a/debian/yunohost-firewall.init
+++ b/debian/yunohost-firewall.init
@@ -6,6 +6,7 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start/stop YunoHost firewall
+# Description:       Start/stop YunoHost firewall
 ### END INIT INFO
 
 DAEMON=/usr/bin/yunohost

From fe8c909f05d3e093cd09394ff23c596fc1d57a46 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 9 Sep 2015 18:58:50 +0200
Subject: [PATCH 06/10] [lintian] fix
 init.d-script-does-not-implement-required-option etc/init.d/yunohost-api
 force-reload

---
 debian/yunohost-api.init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/yunohost-api.init b/debian/yunohost-api.init
index 2bd0222b2..3e75e159d 100755
--- a/debian/yunohost-api.init
+++ b/debian/yunohost-api.init
@@ -41,7 +41,7 @@ case "$1" in
     kill `ps aux | grep 'yunohost-api' | grep -v grep | grep -v stop | awk '{print $2}'` > /dev/null 2>&1
     log_end_msg 0
     ;;
-  restart)
+  restart|force-reload)
     logger "YunoHost API: Restarting"
     log_daemon_msg "Restarting API: YunoHost"
     if [ -f /var/run/yunohost-api.pid ]; then
@@ -67,7 +67,7 @@ case "$1" in
     ;;
   *)
     logger "YunoHost API: Invalid usage"
-    echo "Usage: /etc/init.d/yunohost-api {start|stop|restart|status}" >&2
+    echo "Usage: /etc/init.d/yunohost-api {start|stop|restart|force-reload|status}" >&2
     exit 1
     ;;
 esac

From 2ccfe335a5817d82671d8487f878312c24b0ddae Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 9 Sep 2015 18:59:49 +0200
Subject: [PATCH 07/10] [lintian] fix
 init.d-script-does-not-implement-required-option etc/init.d/yunohost-firewall
 force-reload

---
 debian/yunohost-firewall.init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/yunohost-firewall.init b/debian/yunohost-firewall.init
index 06bf2145c..fd1443494 100755
--- a/debian/yunohost-firewall.init
+++ b/debian/yunohost-firewall.init
@@ -31,7 +31,7 @@ case "$1" in
     /usr/bin/yunohost firewall stop
     log_end_msg $?
     ;;
-  restart)
+  restart|force-reload)
     logger "YunoHost firewall: Restarting"
     log_daemon_msg "Restarting firewall: YunoHost"
     /usr/bin/yunohost firewall reload
@@ -45,7 +45,7 @@ case "$1" in
     ;;
   *)
     logger "YunoHost API: Invalid usage"
-    echo "Usage: /etc/init.d/yunohost-api {start|stop|restart|status}" >&2
+    echo "Usage: /etc/init.d/yunohost-api {start|stop|restart|force-reload|status}" >&2
     exit 1
     ;;
 esac

From 4a4f106f15790db49dded60432338f250fddf83e Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 9 Sep 2015 19:07:47 +0200
Subject: [PATCH 08/10] [lintian] fix executable-not-elf-or-script
 usr/lib/moulinette/yunohost/__init__.py

---
 lib/yunohost/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 lib/yunohost/__init__.py

diff --git a/lib/yunohost/__init__.py b/lib/yunohost/__init__.py
old mode 100755
new mode 100644

From ce4c54ad88cc1c332fd7368e900c7a696d2243b6 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 9 Sep 2015 19:12:01 +0200
Subject: [PATCH 09/10] [lintian] fix script-not-executable for backup/restore
 hooks

---
 data/hooks/backup/05-system_ldap      | 2 --
 data/hooks/backup/08-system_ssh       | 2 --
 data/hooks/backup/11-system_mysql     | 2 --
 data/hooks/backup/14-system_ssowat    | 2 --
 data/hooks/backup/17-system_home      | 2 --
 data/hooks/backup/20-system_yunohost  | 2 --
 data/hooks/backup/23-system_mail      | 2 --
 data/hooks/backup/26-system_xmpp      | 2 --
 data/hooks/backup/29-system_nginx     | 2 --
 data/hooks/backup/32-system_cron      | 2 --
 data/hooks/restore/05-system_ldap     | 2 --
 data/hooks/restore/08-system_ssh      | 2 --
 data/hooks/restore/11-system_mysql    | 2 --
 data/hooks/restore/14-system_ssowat   | 2 --
 data/hooks/restore/17-system_home     | 2 --
 data/hooks/restore/20-system_yunohost | 2 --
 data/hooks/restore/23-system_mail     | 2 --
 data/hooks/restore/26-system_xmpp     | 2 --
 data/hooks/restore/29-system_nginx    | 2 --
 data/hooks/restore/32-system_cron     | 2 --
 20 files changed, 40 deletions(-)

diff --git a/data/hooks/backup/05-system_ldap b/data/hooks/backup/05-system_ldap
index 65c52fc79..9ef09b114 100644
--- a/data/hooks/backup/05-system_ldap
+++ b/data/hooks/backup/05-system_ldap
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ldap"
 mkdir -p $backup_dir
 
diff --git a/data/hooks/backup/08-system_ssh b/data/hooks/backup/08-system_ssh
index 617eee0f2..e5f2570ea 100644
--- a/data/hooks/backup/08-system_ssh
+++ b/data/hooks/backup/08-system_ssh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ssh"
 mkdir -p $backup_dir
 
diff --git a/data/hooks/backup/11-system_mysql b/data/hooks/backup/11-system_mysql
index e5ff07c52..984d52a61 100644
--- a/data/hooks/backup/11-system_mysql
+++ b/data/hooks/backup/11-system_mysql
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/mysql"
 mkdir -p $backup_dir
 
diff --git a/data/hooks/backup/14-system_ssowat b/data/hooks/backup/14-system_ssowat
index f4ec8c428..fbb78f196 100644
--- a/data/hooks/backup/14-system_ssowat
+++ b/data/hooks/backup/14-system_ssowat
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ssowat"
 mkdir -p $backup_dir
 
diff --git a/data/hooks/backup/17-system_home b/data/hooks/backup/17-system_home
index 13414a755..b73b2dff3 100644
--- a/data/hooks/backup/17-system_home
+++ b/data/hooks/backup/17-system_home
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/home"
 mkdir -p $backup_dir
 
diff --git a/data/hooks/backup/20-system_yunohost b/data/hooks/backup/20-system_yunohost
index 22d556c61..e49b52899 100644
--- a/data/hooks/backup/20-system_yunohost
+++ b/data/hooks/backup/20-system_yunohost
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/yunohost"
 mkdir -p $backup_dir
 
diff --git a/data/hooks/backup/23-system_mail b/data/hooks/backup/23-system_mail
index 2145c0bc4..7fe210ce2 100644
--- a/data/hooks/backup/23-system_mail
+++ b/data/hooks/backup/23-system_mail
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/mail"
 
 sudo cp -a /var/mail/. $backup_dir
diff --git a/data/hooks/backup/26-system_xmpp b/data/hooks/backup/26-system_xmpp
index 836c73078..2b87644d2 100644
--- a/data/hooks/backup/26-system_xmpp
+++ b/data/hooks/backup/26-system_xmpp
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/xmpp"
 mkdir -p $backup_dir/{etc,var}
 
diff --git a/data/hooks/backup/29-system_nginx b/data/hooks/backup/29-system_nginx
index 6bbcae2c1..976809122 100644
--- a/data/hooks/backup/29-system_nginx
+++ b/data/hooks/backup/29-system_nginx
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/nginx"
 mkdir -p $backup_dir
 
diff --git a/data/hooks/backup/32-system_cron b/data/hooks/backup/32-system_cron
index b529b0216..87a2a4f2e 100644
--- a/data/hooks/backup/32-system_cron
+++ b/data/hooks/backup/32-system_cron
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/cron"
 mkdir -p $backup_dir
 
diff --git a/data/hooks/restore/05-system_ldap b/data/hooks/restore/05-system_ldap
index 58ca04ea9..f16225c3e 100644
--- a/data/hooks/restore/05-system_ldap
+++ b/data/hooks/restore/05-system_ldap
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ldap"
 
 if [ -z "$2" ]; then
diff --git a/data/hooks/restore/08-system_ssh b/data/hooks/restore/08-system_ssh
index 09aaf9c9a..bfe729f3f 100644
--- a/data/hooks/restore/08-system_ssh
+++ b/data/hooks/restore/08-system_ssh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ssh"
 
 sudo cp -a $backup_dir/. /etc/ssh
diff --git a/data/hooks/restore/11-system_mysql b/data/hooks/restore/11-system_mysql
index 28db51483..23293b153 100644
--- a/data/hooks/restore/11-system_mysql
+++ b/data/hooks/restore/11-system_mysql
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/mysql"
 
 mysqlpwd=$(sudo cat /etc/yunohost/mysql)
diff --git a/data/hooks/restore/14-system_ssowat b/data/hooks/restore/14-system_ssowat
index df92fe10e..15bae3c77 100644
--- a/data/hooks/restore/14-system_ssowat
+++ b/data/hooks/restore/14-system_ssowat
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ssowat"
 
 sudo cp -a $backup_dir/. /etc/ssowat
diff --git a/data/hooks/restore/17-system_home b/data/hooks/restore/17-system_home
index a90794ad6..d005bed07 100644
--- a/data/hooks/restore/17-system_home
+++ b/data/hooks/restore/17-system_home
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/home"
 
 sudo cp -a $backup_dir/. /home
diff --git a/data/hooks/restore/20-system_yunohost b/data/hooks/restore/20-system_yunohost
index 1bd332763..2ceb2ada6 100644
--- a/data/hooks/restore/20-system_yunohost
+++ b/data/hooks/restore/20-system_yunohost
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/yunohost"
 
 sudo cp -a $backup_dir/. /etc/yunohost
diff --git a/data/hooks/restore/23-system_mail b/data/hooks/restore/23-system_mail
index 39f6f933f..ecef0ec15 100644
--- a/data/hooks/restore/23-system_mail
+++ b/data/hooks/restore/23-system_mail
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/mail"
 
 sudo cp -a $backup_dir/. /var/mail
diff --git a/data/hooks/restore/26-system_xmpp b/data/hooks/restore/26-system_xmpp
index c1b4e360e..70dc7e1c4 100644
--- a/data/hooks/restore/26-system_xmpp
+++ b/data/hooks/restore/26-system_xmpp
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/xmpp"
 
 sudo cp -a $backup_dir/etc/. /etc/metronome
diff --git a/data/hooks/restore/29-system_nginx b/data/hooks/restore/29-system_nginx
index 62810985b..5ffaf5c14 100644
--- a/data/hooks/restore/29-system_nginx
+++ b/data/hooks/restore/29-system_nginx
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/nginx"
 
 sudo cp -a $backup_dir/. /etc/nginx/conf.d
diff --git a/data/hooks/restore/32-system_cron b/data/hooks/restore/32-system_cron
index b1a53c3d0..1e12d23b7 100644
--- a/data/hooks/restore/32-system_cron
+++ b/data/hooks/restore/32-system_cron
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/cron"
 
 sudo cp -a $backup_dir/. /etc/cron.d

From 772c974852d130854ddc507900d336743cfdc237 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Thu, 10 Sep 2015 11:30:08 +0200
Subject: [PATCH 10/10] [fix] remove copy-pasted comments

---
 debian/postinst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 9a537a19f..3106cfed8 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,6 +1,4 @@
 #!/bin/bash
-#!/bin/sh
-# postinst script for yunohost-config-metronome
 
 set -e