From 825c30d55c722d8203e10a97f8e0deba93c60606 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 18 Sep 2014 15:13:32 +0200
Subject: [PATCH] Reformat and use variables to uniformize with passerelle
 init.d

---
 debian/portail-citoyen2.init | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/portail-citoyen2.init b/debian/portail-citoyen2.init
index c67f55b..c977f77 100644
--- a/debian/portail-citoyen2.init
+++ b/debian/portail-citoyen2.init
@@ -16,9 +16,10 @@ DESC=portail-citoyen
 NAME=portail-citoyen
 DAEMON=/usr/bin/gunicorn
 RUN_DIR=/var/run/$NAME
-LOG_DIR=/var/log/$NAME
 PIDFILE=$RUN_DIR/$NAME.pid
+LOG_DIR=/var/log/$NAME
 SCRIPTNAME=/etc/init.d/$NAME
+MANAGE_SCRIPT=/usr/lib/$NAME/manage.py
 SOCKFILE=$RUN_DIR/$NAME.sock
 
 USER=$NAME
@@ -29,7 +30,7 @@ DAEMON_ARGS="--pid $PIDFILE \
 --daemon \
 --access-logfile $LOG_DIR/gunicorn-access.log \
 --log-file $LOG_DIR/gunicorn-error.log \
---bind=unix:$SOCKFILE
+--bind=unix:$SOCKFILE \
 --workers=10 \
 --worker-class=sync \
 --timeout=60 \
@@ -115,26 +116,26 @@ do_reload() {
 do_migrate() {
     log_action_msg "Applying new migrations .."
     if [ "x$TENANT_BASE" != "x" ]; then
-        su $USER -p -c "/usr/bin/portail-citoyen-manage create_schema"
-        su $USER -p -c "/usr/bin/portail-citoyen-manage sync_schema --noinput"
-        su $USER -p -c "/usr/bin/portail-citoyen-manage migrate_schema --noinput"
+        su $USER -p -c "python $MANAGE_SCRIPT create_schema"
+        su $USER -p -c "python $MANAGE_SCRIPT sync_schemas --noinput"
+        su $USER -p -c "python $MANAGE_SCRIPT migrate_schemas --noinput"
     else
-        su $USER -p -c "/usr/bin/portail-citoyen-manage syncdb --migrate --noinput"
+        su $USER -p -c "python $MANAGE_SCRIPT syncdb --migrate --noinput"
     fi
     log_action_msg ".. done"
 }
 
 do_collectstatic() {
     log_action_msg "Collect static files.."
-    su $USER -p -c "/usr/bin/portail-citoyen-manage collectstatic --noinput"
+    su $USER -p -c "python $MANAGE_SCRIPT collectstatic --noinput"
     log_action_msg ".. done"
 }
 
 case "$1" in
   start)
+    log_daemon_msg "Starting $DESC " "$NAME"
     do_migrate
     do_collectstatic
-    log_daemon_msg "Starting $DESC " "$NAME"
     do_start
     case "$?" in
         0|1) log_end_msg 0 ;;
@@ -188,17 +189,17 @@ case "$1" in
     if [ $(id -un) != "$USER" ]; then
         sudo -H -u $USER /usr/bin/portail-citoyen-manage "$@"
     else
-        /usr/bin/portail-citoyen-manage "$@"
+        python $MANAGE_SCRIPT "$@"
     fi
     ;;
   create-schema)
     shift
     TENANT=$1
+    log_daemon_msg "Creating tenant" "$TENANT"
     if [ "x$TENANT_BASE" == "x" ]; then
         log_failure_msg "TENANT_BASE is not set in /etc/default/$NAME"
         log_end_msg 1
     else
-        log_daemon_msg "Creating tenant" "$TENANT"
         TENANT_DIR="$TENANT_BASE/$TENANT/"
         mkdir "$TENANT_DIR" "$TENANT_DIR/media/" "$TENANT_DIR/static" "$TENANT_DIR/templates"
         su $USER -p -c "/usr/bin/portail-citoyen-manage create_schema"