From de93441c326321ec719eecd00b1f8d47ce41cb0e Mon Sep 17 00:00:00 2001
From: src386 <utman002@src386.org>
Date: Wed, 16 Nov 2016 10:31:19 +0100
Subject: [PATCH] update to movim upstream, add movim daemon options

---
 CHANGELOG          | 4 ++++
 README.md          | 2 +-
 conf/movim.init    | 2 +-
 conf/movim.service | 2 +-
 scripts/_common.sh | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 055215c..fb01d55 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 **Changelog**
 
+2.0.3 2016-11-16
+- Update to movim 0.10 git2016-11-16
+- Use start, --url and --port options for Movim daemon
+
 2.0.2 2016-10-06
 - Update to movim 0.10 git2016-10-06
 
diff --git a/README.md b/README.md
index 125b22f..29c4ece 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Movim is a decentralized social network, written in PHP and HTML5 and based on t
 
 It is recommended to use a "valid" certificate to use Movim, auto-signed is sometimes problematic. You might want to take a look a StartSSL or Let's Encrypt.
 
-Provided Movim version : 0.10 git2016-10-06
+Provided Movim version : 0.10 git2016-11-16
 
 Please read CHANGELOG.
 
diff --git a/conf/movim.init b/conf/movim.init
index 68db482..84e3e30 100644
--- a/conf/movim.init
+++ b/conf/movim.init
@@ -10,7 +10,7 @@
 ### END INIT INFO
 
 dir="YHDIR"
-cmd="php daemon.php https://YHURL YHPORT"
+cmd="php daemon.php start --url=https://YHURL --port=YHPORT"
 user="movim"
 
 name=`basename $0`
diff --git a/conf/movim.service b/conf/movim.service
index 1ef8d33..85950f1 100644
--- a/conf/movim.service
+++ b/conf/movim.service
@@ -5,7 +5,7 @@ After=nginx.service network.target local-fs.target mysql.service
 [Service]
 User=movim
 Type=simple
-ExecStart=/usr/bin/php daemon.php https://YHURL YHPORT
+ExecStart=/usr/bin/php daemon.php start --url=https://YHURL --port=YHPORT
 WorkingDirectory=YHDIR
 StandardOutput=syslog
 SyslogIdentifier=movim
diff --git a/scripts/_common.sh b/scripts/_common.sh
index fc2e45c..81a908b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 GIT_REPO="https://github.com/movim/movim"
 
 # Commit to checkout
-HEAD_COMMIT="8b25303651556540d17ebeb960eeb4a64c3fe6ba"
+HEAD_COMMIT="478c9631b78f91f9b00d38cbaadb5b96bb9940c9"
 
 # Source code destination directory
 DESTDIR="/var/www/movim"