From 258203dbdefd4e830d7315ebe77f80c08ec9de68 Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Tue, 3 Jun 2014 16:17:34 +0200 Subject: [PATCH] Revert "MT#7275 switch NPROC for ngcp-panel to config.yml" This reverts commit b6d000ec268ace21e8e982ded1cb33ad7d785677. --- debian/ngcp-panel.default | 3 +-- debian/ngcp-panel.init | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/ngcp-panel.default b/debian/ngcp-panel.default index 232f109b49..807b5f9146 100644 --- a/debian/ngcp-panel.default +++ b/debian/ngcp-panel.default @@ -1,2 +1 @@ -RUN_DAEMON="no" -NPROC=[% www_admin.fastcgi_workers %] +RUN_DAEMON="no" \ No newline at end of file diff --git a/debian/ngcp-panel.init b/debian/ngcp-panel.init index 246271bf59..4dc97c26b9 100644 --- a/debian/ngcp-panel.init +++ b/debian/ngcp-panel.init @@ -23,12 +23,7 @@ DESC="NGCP-Panel Webapp" DEFAULTS=/etc/default/$NAME USOCKET=$HOMERUN/ngcp-panel.sock LOGERR=/var/log/ngcp/ngcp-panel.log - -# Load startup options if available -if [ -f $DEFAULTS ]; then - . $DEFAULTS || true -fi -NPROC=${NPROC:-1} +NPROC=1 OPTIONS="--listen $USOCKET --daemon --pidfile $PIDFILE --nproc $NPROC" @@ -117,6 +112,11 @@ _stop() { fi } +# Load startup options if available +if [ -f $DEFAULTS ]; then + . $DEFAULTS || true +fi + if [ "$RUN_DAEMON" != "yes" ]; then log_failure_msg "$NAME not yet configured. Edit /etc/default/$NAME first." log_end_msg 0