diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-17 17:46:43 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-17 17:46:43 -0400 |
| commit | d638d8208d50accb9b29c6ed70d6fa26bd615b7a (patch) | |
| tree | 6a1a07346560737653bdfe862f038a6933423fe7 | |
| parent | 43992ad933e0f2122856f86efbb97021ed7ac547 (diff) | |
remove FCGI stuff
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | depends_static.txt | 1 | ||||
| -rw-r--r-- | parabolaweb-fcgi.in | 23 | ||||
| -rw-r--r-- | parabolaweb.conf | 9 | ||||
| -rw-r--r-- | parabolaweb.service.in | 17 |
5 files changed, 0 insertions, 52 deletions
@@ -20,11 +20,9 @@ CPPFLAGS += -DSCRIPT_LOCATION='"$(pkglibexecdir)/parabolaweb-changepassword.real targets = \ $(sbindir)/parabolaweb-changepassword \ - $(sbindir)/parabolaweb-fcgi \ $(sbindir)/parabolaweb-reporead-inotify \ $(sbindir)/parabolaweb-update \ $(pkglibexecdir)/parabolaweb-changepassword.real \ - $(systemddir)/parabolaweb.service \ $(systemddir)/parabolaweb-reporead-inotify.service all: PHONY depends.txt $(notdir $(targets)) parabolaweb.conf diff --git a/depends_static.txt b/depends_static.txt index 33f2c04..0dd31b2 100644 --- a/depends_static.txt +++ b/depends_static.txt @@ -2,4 +2,3 @@ gitget # for parabolaweb-update librelib # for libremessages, used in parabolaweb-update postgresql # for database python2 # duh -python2-flup # for fcgi diff --git a/parabolaweb-fcgi.in b/parabolaweb-fcgi.in deleted file mode 100644 index 2c8b5bf..0000000 --- a/parabolaweb-fcgi.in +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -e - -# Copyright (c) 2012-2013 Luke Shumaker <lukeshu@sbcglobal.net> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -. @pkgconffile@ - -[[ -e "${WEBDIR}/manage.py" ]] - -sudo -u "${WEBUSER:-$USER}" python2 \ - "${WEBDIR}/manage.py" runfcgi "${FCGIARGS[@]}" --settings=settings "$@" diff --git a/parabolaweb.conf b/parabolaweb.conf index e598e37..923e138 100644 --- a/parabolaweb.conf +++ b/parabolaweb.conf @@ -5,13 +5,4 @@ GITURL='git://projects.parabola.nu/parabolaweb.git#branch=master' RUNMAKE='pacman -Q parabolaweb-dev' -# 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 deleted file mode 100644 index 80794c4..0000000 --- a/parabolaweb.service.in +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Requires=postgresql.service -After=postgresql.service -Description=ParabolaWeb - -[Service] -# 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 |