Systemd startup script

Makefile

@@ -17,7 +17,7 @@ WWWGROUP=www-data
 CIGRIUSER=cigri
 CIGRIGROUP=cigri
 APIBASE=/cigri-api
-PIDDIR=/var/run/cigri
+PIDDIR=/run/cigri
 USERCMDS=$(patsubst bin/%.rb,%,$(wildcard bin/*.rb))
 CACERT=/etc/cigri/ssl.orig/cigriCA/certs/cigriCA.crt
 CAKEY=/etc/cigri/ssl.orig/cigriCA/private/myca.key
@@ -53,7 +53,7 @@ setup: setup-api
 
 install-cigri: install-cigri-server install-cigri-user
 
-install-cigri-server: check-old install-cigri-libs install-cigri-modules install-cigri-launcher install-cigri-api install-cigri-server-config install-cigri-server-tools
+install-cigri-server: check-old install-cigri-libs install-cigri-modules install-cigri-systemd install-cigri-api install-cigri-server-config install-cigri-server-tools
 
 install-cigri-user: check-old install-cigri-libs install-cigri-user-cmds install-cigri-user-config install-cigri-server-config
 
@@ -98,12 +98,13 @@ install-cigri-user-config:
 		perl -pi -e "s#%%CIGRIDIR%%#$(CIGRIDIR)#g;;\
 		s#%%APIBASE%%#$(APIBASE)#g" $(DESTDIR)$(CIGRICONFDIR)/api-clients.conf; fi
 
-install-cigri-launcher:
+install-cigri-systemd:
 	install -d -m 0755 $(DESTDIR)$(PIDDIR)
 	install -d -m 0755 $(DESTDIR)$(CIGRIDIR)
-	install -m 0755 sbin/cigri_start.in $(DESTDIR)/etc/init.d/cigri
+	install -m 0755 etc/systemd/system/cigri.service.in $(DESTDIR)/etc/systemd/system/cigri.service
 	perl -pi -e "s#%%CIGRIDIR%%#$(CIGRIDIR)#g;;\
-	     s#%%CIGRIUSER%%#$(CIGRIUSER)#g" $(DESTDIR)/etc/init.d/cigri
+	     s#%%CIGRIUSER%%#$(CIGRIUSER)#g;;\
+	     s#%%PIDDIR%%#$(PIDDIR)#g" $(DESTDIR)/etc/systemd/system/cigri.service
 	touch $(DESTDIR)$(LOGDIR)/cigri.log
 	chmod 600 $(DESTDIR)$(LOGDIR)/cigri.log
 	chown $(CIGRIUSER) $(DESTDIR)$(LOGDIR)/cigri.log

etc/systemd/system/cigri.service

@@ -6,10 +6,9 @@ After=postgresql.service
 PermissionsStartOnly=true
 ExecStartPre=/usr/bin/install -o cigri -d /var/run/cigri
 ExecStart=/usr/local/share/cigri/modules/almighty.rb
-PIDFile=/var/run/cigri/almighty.pid
+PIDFile=/run/cigri/almighty.pid
 User=cigri
 WorkingDirectory=/var/lib/cigri
-RuntimeDirectory=/var/run/cigri
 
 [Install]
 WantedBy=default.target

etc/systemd/system/cigri.service.in

@@ -0,0 +1,13 @@
+[Unit]
+Description=CiGri computing grid server
+After=postgresql.service
+
+[Service]
+PermissionsStartOnly=true
+ExecStart=%%CIGRIDIR%%/modules/almighty.rb
+PIDFile=%%PIDDIR%%/almighty.pid
+User=%%CIGRIUSER%%
+WorkingDirectory=/var/lib/cigri
+
+[Install]
+WantedBy=default.target