Unverified Commit 6c6cebd2 authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge pull request #406 from ikedas/update_init_scripts by ikedas

Update startup scripts
parents f208a7be e45b00dc
......@@ -35,8 +35,8 @@ units_DATA = \
sympa-task.service \
sympa.service
noinst_DATA = \
nginx-sympasoap.service \
nginx-wwsympa.service \
sympasoap.service \
wwsympa.service \
sympa-tmpfiles.conf
endif
......@@ -47,8 +47,8 @@ EXTRA_DIST = \
sympa-outgoing.servicein \
sympa-task.servicein \
sympa.servicein \
nginx-sympasoap.servicein \
nginx-wwsympa.servicein \
sympasoap.servicein \
wwsympa.servicein \
sympa-tmpfiles.confin
CLEANFILES = $(init_SCRIPTS) $(units_DATA) $(noinst_DATA)
......@@ -57,7 +57,6 @@ sympa: sympa.in Makefile
@rm -f $@
$(AM_V_GEN)$(SED) \
-e 's|--CONFIG--|$(CONFIG)|' \
-e 's|--WWSCONFIG--|$(WWSCONFIG)|' \
-e 's|--sbindir--|$(sbindir)|' \
-e 's|--initdir--|$(initdir)|' \
-e 's|--piddir--|$(piddir)|' \
......
......@@ -13,6 +13,8 @@ Before=sympa-task.service
[Service]
Type=forking
PIDFile=--piddir--/sympa_msg.pid
ExecStartPre=/bin/mkdir -p --piddir--
ExecStartPre=/bin/chown --USER--:--GROUP-- --piddir--
ExecStartPre=--sbindir--/sympa.pl --health_check
ExecStart=--sbindir--/sympa_msg.pl
......
......@@ -8,12 +8,13 @@ Type=forking
PIDFile=--piddir--/sympasoap.pid
ExecStart=/usr/bin/spawn-fcgi -F $FCGI_CHILDREN \
-P --piddir--/sympasoap.pid \
-s --piddir--/sympasoap.socket \
-u $FCGI_USER -g $FCGI_GROUP $FCGI_OPTS -- \
--execcgidir--/sympa_soap_server.fcgi
Environment="FCGI_CHILDREN=5"
Environment="FCGI_USER=--USER--"
Environment="FCGI_GROUP=--GROUP--"
Environment="FCGI_OPTS=-s --piddir--/sympasoap.socket -M 0600 -U nginx"
Environment="FCGI_OPTS=-M 0600 -U nginx"
EnvironmentFile=-/etc/sysconfig/sympa
[Install]
......
......@@ -8,12 +8,13 @@ Type=forking
PIDFile=--piddir--/wwsympa.pid
ExecStart=/usr/bin/spawn-fcgi -F $FCGI_CHILDREN \
-P --piddir--/wwsympa.pid \
-s --piddir--/wwsympa.socket \
-u $FCGI_USER -g $FCGI_GROUP $FCGI_OPTS -- \
--execcgidir--/wwsympa.fcgi
Environment="FCGI_CHILDREN=5"
Environment="FCGI_USER=--USER--"
Environment="FCGI_GROUP=--GROUP--"
Environment="FCGI_OPTS=-s --piddir--/wwsympa.socket -M 0600 -U nginx"
Environment="FCGI_OPTS=-M 0600 -U nginx"
EnvironmentFile=-/etc/sysconfig/sympa
Restart=always
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment