diff --git a/README.md b/README.md index e8fe708..4ea83de 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Current Movim version : 0.9 git2015-08-31 - Add notes in README about public pods & whitelisting - Remove script now delete Movim php5-fpm pool. - Remove script delete 'movim' user after shutting down Movim service. -- Movim systemd service now has a PID and logs in syslog +- Movim systemd service now has a PID and a syslog identifier. - Remove proxy_read_timeout and proxy_send_timeout in vhost configuration (default 60s is enough) 0.8b 2015-08-24 diff --git a/TODO b/TODO index f8c5118..0e1f8e4 100644 --- a/TODO +++ b/TODO @@ -2,4 +2,3 @@ - Set timezone in php5-fpm pool - Movim init script should redirect to syslog - Upgrade php dependencies script -- Upgrade systemd service script diff --git a/scripts/upgrade b/scripts/upgrade index 57bf11a..bf6e91e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,11 +43,8 @@ sudo sed -i "s@YHPORT@$port@g" ../conf/movim.{service,init} initcheck=`pgrep -ox systemd` if [ "$initcheck" = "1" ]; then - sudo systemctl stop movim.service - sudo systemctl disable movim.service sudo cp ../conf/movim.service /lib/systemd/system/ - sudo systemctl enable movim.service - sudo systemctl start movim.service + sudo systemctl daemon-reload else sudo /etc/init.d/movim stop sudo cp ../conf/movim.init /etc/init.d/movim