From 2c5caa0f128a0f629d8fafd91fc83856879ec2e2 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Wed, 19 Aug 2015 11:13:00 +0200
Subject: [PATCH] Replace 'www-data' by 'movim'

---
 conf/movim.init    |  2 +-
 conf/movim.service |  2 +-
 scripts/install    | 23 +++++++++++++----------
 scripts/remove     |  3 ++-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/conf/movim.init b/conf/movim.init
index b0e1556..aa36030 100755
--- a/conf/movim.init
+++ b/conf/movim.init
@@ -11,7 +11,7 @@
 
 dir="YHDIR"
 cmd="php daemon.php https://YHURL YHPORT"
-user="www-data"
+user="movim"
 
 name=`basename $0`
 pid_file="/var/run/$name.pid"
diff --git a/conf/movim.service b/conf/movim.service
index c237d9d..c20b295 100644
--- a/conf/movim.service
+++ b/conf/movim.service
@@ -3,7 +3,7 @@ Description=Movim daemon
 After=nginx.service network.target local-fs.target
 
 [Service]
-User=www-data
+User=movim
 Type=simple
 ExecStart=/usr/bin/php daemon.php https://YHURL YHPORT
 WorkingDirectory=YHDIR
diff --git a/scripts/install b/scripts/install
index 2f1c5d1..5003f12 100644
--- a/scripts/install
+++ b/scripts/install
@@ -54,24 +54,27 @@ sudo apt-get install php5-gd php5-curl php5-imagick php5-cli -y
 final_path=/var/www/movim
 sudo mkdir -p $final_path
 sudo cp -a ../sources/* $final_path
-sudo chown -R www-data: $final_path
+sudo chown -R movim:www-data $final_path
+
+# Create movim system user
+sudo useradd movim -d /var/www/movim -s /bin/sh
 
 # Install PHP dependencies
-sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" -s /bin/sh www-data
-sudo su -c "cd $final_path && php composer.phar install" -s /bin/sh www-data
+sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" movim
+sudo su -c "cd $final_path && php composer.phar install" movim
 
 # Movim configuration
 sudo cp $final_path/config/db.example.inc.php $final_path/config/db.inc.php
 sudo sed -i "s@'username'    => 'username'@'username'    => '$db_user'@g" $final_path/config/db.inc.php
 sudo sed -i "s@'password'    => 'password'@'password'    => '$db_pwd'@g" $final_path/config/db.inc.php
 sudo sed -i "s@/ws/@$path/ws/@g" $final_path/app/assets/js/movim_websocket.js
-sudo su -c "cd $final_path && php mud.php db set" -s /bin/sh www-data
-sudo su -c "cd $final_path && php mud.php config locale:$language"
-sudo su -c "cd $final_path && php mud.php config loglevel:1"
-sudo su -c "cd $final_path && php mud.php config environment:production"
-sudo su -c "cd $final_path && php mud.php config timezone:`cat /etc/timezone`"
-sudo su -c "cd $final_path && php mud.php config username:$admin"
-sudo su -c "cd $final_path && php mud.php config password:`echo -n $password | sha1sum | awk '{print $1}'`"
+sudo su -c "cd $final_path && php mud.php db set" movim
+sudo su -c "cd $final_path && php mud.php config locale:$language" movim
+sudo su -c "cd $final_path && php mud.php config loglevel:1" movim
+sudo su -c "cd $final_path && php mud.php config environment:production" movim
+sudo su -c "cd $final_path && php mud.php config timezone:`cat /etc/timezone`" movim
+sudo su -c "cd $final_path && php mud.php config username:$admin" movim
+sudo su -c "cd $final_path && php mud.php config password:`echo -n $password | sha1sum | awk '{print $1}'`" movim
 sudo yunohost app addaccess movim -u $admin
 
 # Copy init script or systemd service
diff --git a/scripts/remove b/scripts/remove
index 393ef03..1646280 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -5,7 +5,8 @@ db_name=movim
 root_pwd=$(sudo cat /etc/yunohost/mysql)
 mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
 
-# Removing executable files
+# Removing executable files and user
+sudo userdel movim
 sudo rm -rf /var/www/movim
 domain=$(sudo yunohost app setting movim domain)
 sudo rm -f /etc/nginx/conf.d/$domain.d/movim.conf