Add support for the server flags via a config file (thanks @C0rn3j)

4 files changed, 41 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 466dd2c193e9..4abf36f034b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,26 @@
 pkgbase = syncplay
 	pkgdesc = synchronize watching movies on mplayer2, vlc, mpv, and mpc-hc on many computers
 	pkgver = 1.6.4a
-	pkgrel = 1
+	pkgrel = 2
 	url = http://syncplay.pl/
 	install = syncplay.install
 	arch = any
-	license = custom
+	license = Apache
 	depends = python
 	depends = python-twisted
-	optdepends = pyside2
-	optdepends = qt5-declarative
-	optdepends = python-service_identity
+	optdepends = pyside2: GUI
+	optdepends = qt5-declarative: GUI
+	optdepends = python-service_identity: TLS
+	optdepends = python-certifi: TLS
+	provides = syncplay
+	conflicts = syncplay
+	backup = etc/syncplay/server.conf
 	source = https://github.com/Syncplay/syncplay/archive/v1.6.4a.tar.gz
 	source = syncplay@.service
+	source = server.conf
 	sha256sums = 6683752f5d0284371ac978f3c6fb9bdcbab97ab02e5170ad1af88b34e272bc33
-	sha256sums = 2033d40daad02f06eede073d0cee39fba8c70289dd71e8444d429b810438ec3a
+	sha256sums = bbbf8f9dfc36631b49ba7d0fe3f980066b30a544954680a677e5e8629b7e0a8b
+	sha256sums = df3c7656024d60c59664c79f4890f7780a2c5b8b537ac61b017e16b3d4420808
 
 pkgname = syncplay
 
diff --git a/PKGBUILD b/PKGBUILD
index 50be2cfe834d..87419872fbfa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,23 +4,30 @@
 pkgname=syncplay
 _pkgver=1.6.4a
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
 pkgdesc="synchronize watching movies on mplayer2, vlc, mpv, and mpc-hc on many computers"
 arch=('any')
 url="http://syncplay.pl/"
-license=('custom')
-depends=('python' 'python-twisted') 
-optdepends=('pyside2' 'qt5-declarative' 'python-service_identity')
+license=('Apache')
+depends=('python' 'python-twisted')
+optdepends=('pyside2: GUI' 'qt5-declarative: GUI' 'python-service_identity: TLS' 'python-certifi: TLS')
+provides=(${pkgname})
+conflicts=(${pkgname})
+replaces=()
+backup=("etc/syncplay/server.conf")
 source=("https://github.com/Syncplay/syncplay/archive/v${_pkgver}.tar.gz"
-        'syncplay@.service')
+        'syncplay@.service'
+        server.conf)
 sha256sums=('6683752f5d0284371ac978f3c6fb9bdcbab97ab02e5170ad1af88b34e272bc33'
-            '2033d40daad02f06eede073d0cee39fba8c70289dd71e8444d429b810438ec3a')
+            'bbbf8f9dfc36631b49ba7d0fe3f980066b30a544954680a677e5e8629b7e0a8b'
+            'df3c7656024d60c59664c79f4890f7780a2c5b8b537ac61b017e16b3d4420808')
 install=syncplay.install
 package() {
   cd $srcdir
 
-  # systemd
+  # systemd unit and its config file
   install -Dm644 syncplay@.service ${pkgdir}/usr/lib/systemd/system/syncplay@.service
+  install -Dm644 server.conf "$pkgdir"/etc/syncplay/server.conf
 
   cd "syncplay-${_pkgver}"
 
diff --git a/server.conf b/server.conf
new file mode 100644
index 000000000000..ff9e176b8af8
--- /dev/null
+++ b/server.conf
@@ -0,0 +1,13 @@
+# This is the file that syncplay@.service loads settings from, it does not affect the binary itself
+# See https://syncplay.pl/guide/server/ for a list of available flags and description
+#port="--port=8999"
+#isolate="--isolate-room"
+#password="--password yourpassword"
+#salt="--salt RANDOMSALT"
+#motd="--motd-file /etc/syncplay/motd"
+#ready="--disable-ready"
+#chat="--disable-chat"
+#maxChars="--max-chat-message-length 500"
+#usernameLength="--max-username-length 20"
+#statsFile="--stats-db-file /etc/syncplay/stats.db"
+#tls="--tls /etc/letsencrypt/live/syncplay.example.com/"
diff --git a/syncplay@.service b/syncplay@.service
index 3e52feb0351d..2082403e34a0 100644
--- a/syncplay@.service
+++ b/syncplay@.service
@@ -5,7 +5,8 @@ After=network.target
 [Service]
 Type=simple
 User=%I
-ExecStart=/usr/bin/syncplay-server
+EnvironmentFile=/etc/syncplay/server.conf
+ExecStart=/usr/bin/syncplay-server $port $isolate $password $salt $motd $ready $chat $maxChars $usernameLength $statsFile $tls
 
 [Install]
 WantedBy=multi-user.target