From 13f6168f6c2cb328ee529c0e7e0d35f8e9641de6 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Tue, 4 Aug 2015 10:50:43 +0200
Subject: [PATCH] prise en charge systemd

---
 conf/movim.init    |  2 +-
 conf/movim.service |  4 ++--
 scripts/install    | 21 ++++++++++++++-------
 scripts/remove     |  5 ++++-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/conf/movim.init b/conf/movim.init
index 1e36199..60c0473 100755
--- a/conf/movim.init
+++ b/conf/movim.init
@@ -10,7 +10,7 @@
 ### END INIT INFO
 
 dir="YHDIR"
-cmd="php daemon.php YHURL 8080"
+cmd="php daemon.php https://YHURL 8080"
 user="www-data"
 
 name=`basename $0`
diff --git a/conf/movim.service b/conf/movim.service
index 137e2f3..4846e5e 100644
--- a/conf/movim.service
+++ b/conf/movim.service
@@ -5,8 +5,8 @@ After=nginx.service network.target local-fs.target
 [Service]
 User=www-data
 Type=simple
-ExecStart=/usr/bin/php daemon.php https://localhost/movim/ 8080
-WorkingDirectory=/usr/share/movim/
+ExecStart=/usr/bin/php daemon.php https://YHURL 8080
+WorkingDirectory=YHDIR
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/install b/scripts/install
index 601f4bf..b66e760 100644
--- a/scripts/install
+++ b/scripts/install
@@ -48,13 +48,20 @@ sudo sed -i "s/yhdb/$db_user/g" $final_path/config/db.inc.php
 sudo su -c "cd $final_path && php mud.php db set" -s /bin/sh www-data
 sudo yunohost app addaccess movim -u $admin
 
-# Copy init script if Wheezy
-sudo cp ../conf/movim.init /etc/init.d/movim
-sudo sed -i "s@YHURL@$domain$path@g" /etc/init.d/movim
-sudo sed -i "s@YHDIR@$final_path@g" /etc/init.d/movim
-
-# Copy systemd service if Jessie
-# todo
+# Copy init script or systemd service
+sudo sed -i "s@YHURL@$domain$path@g" ../conf/movim.{service,init}
+sudo sed -i "s@YHDIR@$final_path@g" ../conf/movim.{service,init}
+if [ `pgrep -ox systemd` = "1" ];
+then
+	sudo cp ../conf/movim.service /usr/lib/systemd/system/
+	sudo systemctl enable movim.service
+	sudo systemctl start movim.service
+else
+	sudo cp ../conf/movim.init /etc/init.d/movim
+	sudo chmod 755 /etc/init.d/movim
+	sudo update-rc.d movim defaults
+	sudo /etc/init.d/movim start
+fi
 
 # Nginx configuration
 sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
diff --git a/scripts/remove b/scripts/remove
index 57ce9ac..393ef03 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,8 +12,11 @@ sudo rm -f /etc/nginx/conf.d/$domain.d/movim.conf
 
 #REMOVE INIT
 sudo /etc/init.d/movim stop
-sudo service movim stop
+sudo systemctl stop movim
+sudo systemctl disable movim
+sudo update-rc.d -f movim remove
 sudo rm /etc/init.d/movim
+sudo rm /lib/systemd/system/movim.service
 
 # Restarting services
 sudo service nginx reload