summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-08-15 13:53:05 -0600
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-08-15 13:53:05 -0600
commit43992ad933e0f2122856f86efbb97021ed7ac547 (patch)
tree203d81d9481d556238def91b5e61536b3cccfcd1
parent5491be3e13016800a44c1b8fec4168340228d0cf (diff)
Pull in changes from the server
-rw-r--r--parabolaweb.conf10
-rw-r--r--parabolaweb.service.in10
2 files changed, 16 insertions, 4 deletions
diff --git a/parabolaweb.conf b/parabolaweb.conf
index 7218627..e598e37 100644
--- a/parabolaweb.conf
+++ b/parabolaweb.conf
@@ -5,7 +5,13 @@ GITURL='git://projects.parabola.nu/parabolaweb.git#branch=master'
RUNMAKE='pacman -Q parabolaweb-dev'
-FCGIARGS=(host=127.0.0.1 port=8090)
-#FCGIARGS=(socket=/run/parabolaweb.sock)
+# method=IMPL prefork or threaded (default fork).
+# maxrequests=NUMBER number of requests a child handles before it is
+# killed and a new child is forked (0 = no limit).
+# maxspare=NUMBER max number of spare processes / threads (default 5).
+# minspare=NUMBER min number of spare processes / threads (default 2).
+# maxchildren=NUMBER hard limit number of processes / threads (default 50).
+# debug=BOOL set to true to enable flup tracebacks.
+FCGIARGS=()
INOTIFYARGS=('/srv/ftp/%(repo)s/os/%(arch)s/')
diff --git a/parabolaweb.service.in b/parabolaweb.service.in
index e5a06ce..80794c4 100644
--- a/parabolaweb.service.in
+++ b/parabolaweb.service.in
@@ -4,8 +4,14 @@ After=postgresql.service
Description=ParabolaWeb
[Service]
-Type=simple
-ExecStart=@sbindir@/parabolaweb-fcgi daemonize=false
+# By using PIDFile, the service isn't "start" until it's forked written to.
+# Otherwise, the ExecStartPost might run before the socket exists.
+# Well, it still might, but it's less likely.
+Type=forking
+PIDFile=/run/parabolaweb/fcgi.pid
+ExecStart=@sbindir@/parabolaweb-fcgi socket=/run/parabolaweb/fcgi.sock daemonize=true pidfile=/run/parabolaweb/fcgi.pid
+ExecStartPost=/usr/bin/chmod 770 /run/parabolaweb/fcgi.sock
+ExecStopPost=/usr/bin/rm -f /run/parabolaweb/fcgi.sock
[Install]
WantedBy=multi-user.target