Merge pull request #87 from YunoHost/improve_deb

Improve deb

data/hooks/backup/05-system_ldap

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ldap"
 mkdir -p $backup_dir
 

data/hooks/backup/08-system_ssh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ssh"
 mkdir -p $backup_dir
 

data/hooks/backup/11-system_mysql

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/mysql"
 mkdir -p $backup_dir
 

data/hooks/backup/14-system_ssowat

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ssowat"
 mkdir -p $backup_dir
 

data/hooks/backup/17-system_home

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/home"
 mkdir -p $backup_dir
 

data/hooks/backup/20-system_yunohost

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/yunohost"
 mkdir -p $backup_dir
 

data/hooks/backup/23-system_mail

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/mail"
 
 sudo cp -a /var/mail/. $backup_dir

data/hooks/backup/26-system_xmpp

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/xmpp"
 mkdir -p $backup_dir/{etc,var}
 

data/hooks/backup/29-system_nginx

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/nginx"
 mkdir -p $backup_dir
 

data/hooks/backup/32-system_cron

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/cron"
 mkdir -p $backup_dir
 

data/hooks/restore/05-system_ldap

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ldap"
 
 if [ -z "$2" ]; then

data/hooks/restore/08-system_ssh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ssh"
 
 sudo cp -a $backup_dir/. /etc/ssh

data/hooks/restore/11-system_mysql

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/mysql"
 
 mysqlpwd=$(sudo cat /etc/yunohost/mysql)

data/hooks/restore/14-system_ssowat

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/ssowat"
 
 sudo cp -a $backup_dir/. /etc/ssowat

data/hooks/restore/17-system_home

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/home"
 
 sudo cp -a $backup_dir/. /home

data/hooks/restore/20-system_yunohost

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/yunohost"
 
 sudo cp -a $backup_dir/. /etc/yunohost

data/hooks/restore/23-system_mail

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/mail"
 
 sudo cp -a $backup_dir/. /var/mail

data/hooks/restore/26-system_xmpp

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/xmpp"
 
 sudo cp -a $backup_dir/etc/. /etc/metronome

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

data/hooks/restore/32-system_cron

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 backup_dir="$1/cron"
 
 sudo cp -a $backup_dir/. /etc/cron.d

debian/postinst

@@ -1,56 +1,86 @@
 #!/bin/bash
 
-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 > /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
+      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

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
@@ -40,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
@@ -66,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

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
@@ -30,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
@@ -44,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