Merge pull request #219 from Raphux/master

Added systemd service support

tools/openssl-for-passhportd.cnf

@@ -13,10 +13,10 @@ authorityKeyIdentifier	= keyid:always,issuer
 [req_distinguished_name]
 
 [ alternate_names ]
-DNS.1 = 127.0.0.1
-DNS.2 = localhost
-DNS.3 = passhport
-DNS.4 = bastion
-DNS.5 = bastion.passhport.org
-DNS.6 = bastion.librit.fr
-DNS.7 = passhport.librit.fr
+DNS.1 = localhost
+DNS.2 = passhport
+DNS.3 = passhport.passhport.org
+DNS.4 = passhport.librit.fr
+DNS.5 = bastion
+DNS.6 = bastion.passhport.org
+DNS.7 = bastion.librit.fr

tools/passhport-install-script-debian-8-9.sh

@@ -142,13 +142,18 @@ openssl req -new -key "/home/passhport/certs/key.pem" \
 	-days 365 \
 	-sha256 \
 	-extensions v3_req
-echo 'Do you want to launch passhportd daemon ? (y/N)'
-read ANSWER
-if [ "${ANSWER}" == 'y' ] || [ "${ANSWER}" == 'yes' ]
+# We try to detect if we run on a systemd OS.
+if (stat /proc/1/exe | head -n 1 | grep systemd &>/dev/null)
 then
-	su - passhport -c "/home/passhport/passhport-run-env/bin/python /home/passhport/passhport/passhportd/passhportd"
-else
-	echo 'To launch passhportd, run one of the following :'
-	echo '- As root : # su - passhport -c "/home/passhport/passhport-run-env/bin/python /home/passhport/passhport/passhportd/passhportd"'
-	echo '- As passhport user : $ /home/passhport/passhport-run-env/bin/python /home/passhport/passhport/passhportd/passhportd'
+	echo '##############################################################'
+	echo '# Importing passhportd service in systemd…'
+	echo '##############################################################'
+	cp /home/passhport/passhport/tools/passhportd.service /etc/systemd/system/passhportd.service
+	systemctl daemon-reload
+	systemctl enable passhportd
+	echo "passhportd has been enabled at startup."
+	systemctl start passhportd
+	echo "passhportd has been started."
+	echo 'Please use systemctl to start/stop service.'
 fi
+

tools/passhportd.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=passhportd server
+After=network.target
+
+[Service]
+User=passhport
+ExecStart=/home/passhport/passhport-run-env/bin/python /home/passhport/passhport/passhportd/passhportd
+WorkingDirectory=~
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target