kallithea Changeset - 71bdbf129190

Changeset - 71bdbf129190

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich (mads) - 6 years ago 2020-08-13 15:30:09
mads@kiilerich.com

Grafted from: 88f7ebc586cb

py3: drop PYTHON_EGG_CACHE and .egg-cache - that was a py2 thing

4 files changed with 3 insertions and 4 deletions:

docs/setup.rst

init.d/kallithea-daemon-debian

init.d/kallithea-daemon-gentoo

init.d/kallithea-daemon-redhat

0 comments (0 inline, 0 general)

docs/setup.rst

➞

Show inline comments

@@ @@ -600,25 +600,24 @@ that, you'll need to: @@
   used in the WSGI processes and shouldn't be initialized in the Apache
   processes::
     WSGIRestrictEmbedded On
 - Create a WSGI dispatch script, like the one below. Make sure you
   check that the paths correctly point to where you installed Kallithea
   and its Python Virtual Environment.
   .. code-block:: python
       import os
       os.environ['PYTHON_EGG_CACHE'] = '/srv/kallithea/.egg-cache'
       # sometimes it's needed to set the current dir
       os.chdir('/srv/kallithea/')
       import site
       site.addsitedir("/srv/kallithea/venv/lib/python3.7/site-packages")
       ini = '/srv/kallithea/my.ini'
       from logging.config import fileConfig
       fileConfig(ini, {'__file__': ini, 'here': '/srv/kallithea'})
       from paste.deploy import loadapp
       application = loadapp('config:' + ini)

init.d/kallithea-daemon-debian

➞

Show inline comments

@@ @@ -28,25 +28,25 @@ RUN_AS="root" @@
 DAEMON="$PYTHON_PATH/bin/gearbox"
 DAEMON_OPTS="serve --daemon \
  --user=$RUN_AS \
  --group=$RUN_AS \
  --pid-file=$PID_PATH \
  --log-file=$LOG_PATH -c $APP_PATH/$CONF_NAME"
 start() {
   echo "Starting $APP_NAME"
-  PYTHON_EGG_CACHE="/tmp" start-stop-daemon -d $APP_PATH \
   start-stop-daemon -d $APP_PATH \
       --start --quiet \
       --pidfile $PID_PATH \
       --user $RUN_AS \
       --exec $DAEMON -- $DAEMON_OPTS
+}
 stop() {
   echo "Stopping $APP_NAME"
   start-stop-daemon -d $APP_PATH \
       --stop --quiet \
       --pidfile $PID_PATH || echo "$APP_NAME - Not running!"

init.d/kallithea-daemon-gentoo

➞

Show inline comments

@@ @@ -24,25 +24,25 @@ DAEMON_OPTS="serve --daemon \ @@
 --pid-file=$PID_PATH \
 --log-file=$LOG_PATH -c $APP_PATH/$CONF_NAME"
 #extra options
 opts="${opts} restartdelay"
 depend() {
     need nginx
+}
 start() {
     ebegin "Starting $APP_NAME"
-    start-stop-daemon -d $APP_PATH -e PYTHON_EGG_CACHE="/tmp" \
     start-stop-daemon -d $APP_PATH \
         --start --quiet \
         --pidfile $PID_PATH \
         --user $RUN_AS \
         --exec $DAEMON -- $DAEMON_OPTS
     eend $?
+}
 stop() {
     ebegin "Stopping $APP_NAME"
     start-stop-daemon -d $APP_PATH \
         --stop --quiet \
         --pidfile $PID_PATH || echo "$APP_NAME - Not running!"

init.d/kallithea-daemon-redhat

➞

Show inline comments

@@ @@ -54,25 +54,25 @@ remove_pid () { @@
 ensure_pid_dir () {
   PID_DIR=`dirname ${PID_PATH}`
   if [ ! -d ${PID_DIR} ] ; then
     mkdir -p ${PID_DIR}
     chown -R ${RUN_AS}:${RUN_AS} ${PID_DIR}
     chmod 755 ${PID_DIR}
   fi
+}
 start_kallithea () {
     ensure_pid_dir
-    PYTHON_EGG_CACHE="/tmp" daemon --pidfile $PID_PATH \
     daemon --pidfile $PID_PATH \
         --user $RUN_AS "$DAEMON $DAEMON_OPTS"
     RETVAL=$?
     [ $RETVAL -eq 0 ] && touch $LOCK_FILE
     return $RETVAL
+}
 stop_kallithea () {
     if [ -e $LOCK_FILE ]; then
       killproc -p $PID_PATH
       RETVAL=$?
       rm -f $LOCK_FILE
       rm -f $PID_PATH

0 comments (0 inline, 0 general)