Improve systemd service

Used https://github.com/codimd/server/issues/46 as reference.

This included changing ExecStart back to `npm start` which seems to be
the recommended way.

4 files changed, 43 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bade3178602c..868f0cf925f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = codimd
 	pkgdesc = real-time collaborative markdown notes
 	pkgver = 1.6.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://demo.codimd.org/
 	install = codimd.install
 	arch = any
@@ -23,7 +23,7 @@ pkgbase = codimd
 	sha512sums = 50ebf76c365e821c8aec675a975000bf920b44bed939493ea0956ec621aa80ae33a3664654f7d01437f4f5864a73028a635fc11753c229808863c519c5a39998
 	sha512sums = fadc9f85a5ab9109d8ee92b2fc6a07a7c1f172e8fbfa42265305c36e7c07438ffe9a7be9424981678a8466679c4993fe1f67e3f119b4743abc2eebed0749c5eb
 	sha512sums = 100763115d51c0202a57b882761952dfd560d1c3a4bcec2be0c0cc2475fe76e643f90072f7c743f58f8996fd6bc3f9b4d0847a7462de5c64561d17b1f0465105
-	sha512sums = f756b5455a5eef29e4d6a204d2cc115de92c9c55688134eec638f67b662eec72e483cd77a752153d09429567da1514d7d9481b33fed263432691a57c9734170e
+	sha512sums = 41e809ecbf4a90ca28ab86feea131e1f5e61bdc4d64b0f4d2704320a8b295d8d6ba40150df5fdb6bafb0c68c8aa1046c929251622c7241f44f2f1b42945ca36b
 
 pkgname = codimd
 
diff --git a/PKGBUILD b/PKGBUILD
index a43ba32d137e..707046757ff4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=codimd
 pkgver=1.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="real-time collaborative markdown notes"
 arch=('any')
 url="https://demo.codimd.org/"
@@ -21,7 +21,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/codimd/server/archive/$
 sha512sums=('50ebf76c365e821c8aec675a975000bf920b44bed939493ea0956ec621aa80ae33a3664654f7d01437f4f5864a73028a635fc11753c229808863c519c5a39998'
             'fadc9f85a5ab9109d8ee92b2fc6a07a7c1f172e8fbfa42265305c36e7c07438ffe9a7be9424981678a8466679c4993fe1f67e3f119b4743abc2eebed0749c5eb'
             '100763115d51c0202a57b882761952dfd560d1c3a4bcec2be0c0cc2475fe76e643f90072f7c743f58f8996fd6bc3f9b4d0847a7462de5c64561d17b1f0465105'
-            'f756b5455a5eef29e4d6a204d2cc115de92c9c55688134eec638f67b662eec72e483cd77a752153d09429567da1514d7d9481b33fed263432691a57c9734170e')
+            '41e809ecbf4a90ca28ab86feea131e1f5e61bdc4d64b0f4d2704320a8b295d8d6ba40150df5fdb6bafb0c68c8aa1046c929251622c7241f44f2f1b42945ca36b')
 
 
 build()
diff --git a/codimd.install b/codimd.install
index 1fcfff622330..55612768d3b8 100644
--- a/codimd.install
+++ b/codimd.install
@@ -2,15 +2,18 @@ post_install()
 {
 	cat << EOF
 
-It is recommended to manually start the server once after upgrading (and
+It is recommended to manually start the server once after installation (and
 configuration):
 
   cd /usr/share/webapps/codimd/
   su -c 'npm start --production' codimd
 
 EOF
+
+	_note_database_systemd
 }
 
+
 post_upgrade()
 {
 	cat << EOF
@@ -22,4 +25,23 @@ It is recommended to manually start the server once after upgrading:
   su -c 'npm start --production' codimd
 
 EOF
+
+	if [ "$(vercmp "$2" '1.6.0-2')" -le 0 ]
+	then
+		_note_database_systemd
+	fi
+}
+
+
+_note_database_systemd()
+{
+	cat << EOF
+If any of PostgreSQL or MariaDB is used as database provider, it should be
+added as systemd dependency:
+
+  systemctl edit codimd.service
+  > [Unit]
+  > After=<postgresql|mariadb>.service
+
+EOF
 }
diff --git a/codimd.service b/codimd.service
index 485a307faa8f..b33601c1a113 100644
--- a/codimd.service
+++ b/codimd.service
@@ -1,22 +1,35 @@
+# Created according to recommendations written on
+# https://github.com/codimd/server/issues/46
+
 [Unit]
 Description=CodiMD real-time collaborative markdown editor
 Documentation=file:/usr/share/webapps/codimd/docs/
 After=network.target
 
+# Depending on the used database provider, one will probably want to add one of
+# the following as dependencies.  `systemctl --edit` is the recommended way.
+#After=postgresql.service
+#After=mariadb.service
+
 
 [Service]
-Type=simple
+Type=exec
+
+Restart=always
+RestartSec=2s
 
-Environment=NODE_ENV=production
 User=codimd
 Group=codimd
 WorkingDirectory=/usr/share/webapps/codimd
-ExecStart=/usr/bin/node app.js
+ExecStart=/usr/bin/npm start --production
 
 StandardOutput=journal
 StandardError=inherit
 SyslogIdentifier=codimd
 
+PrivateTmp=true
+PrivateDevices=true
+
 
 [Install]
 WantedBy=multi-user.target