[pinto] 01/01: Removed START_PINTOD from default.

[Oleg Gashev]

This is an automated email from the git hooks/post-receive script.

gashev-guest pushed a commit to branch master
in repository pinto.

commit 8b04a1f591cb25609be9abc6501f3d84dcefbb8b
Author: Oleg Gashev <oleg at gashev.net>
Date:   Mon Sep 16 20:12:35 2013 +0000

    Removed START_PINTOD from default.
---
 debian/pinto.default |    6 ------
 debian/pinto.init    |   11 +++--------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/debian/pinto.default b/debian/pinto.default
index de063dc..a9f63a4 100644
--- a/debian/pinto.default
+++ b/debian/pinto.default
@@ -3,11 +3,5 @@
 # pintod's default file, for generic sys config
 #
 ################################################
-
-# control if we start pintod at init or not
-# 1 = start
-# anything else = don't start
-START_PINTOD=0
-
 # command line options
 PINTOD_OPTS="--root=/var/lib/pinto/repository/default/ --auth backend=Passwd --auth path=/etc/pinto/htpasswd.users  --access-log=/var/log/pinto/access.log --error-log=/var/log/pinto/error.log --daemonize"
diff --git a/debian/pinto.init b/debian/pinto.init
index d254011..5d41a7a 100644
--- a/debian/pinto.init
+++ b/debian/pinto.init
@@ -27,7 +27,7 @@ set -e
 
 . /lib/lsb/init-functions
 
-check_started () {
+check_started() {
     if [ -f "$PIDFILE" ]; then
         pid="$(cat $PIDFILE)"
         if [ "$pid" ] && kill -0 $pid >/dev/null 2>/dev/null; then
@@ -37,12 +37,7 @@ check_started () {
     return 1      # Isn't started
 }
 
-start_if_configured() {
-    if [ $START_PINTOD -ne 1 ]; then
-        log_warning_msg "$NAME disabled: not starting. To enable it edit $DEFAULTS_FILE"
-        exit 0
-    fi
-
+start() {
     if ! check_started; then
         log_daemon_msg "Starting $DESC" "$NAME"
         if ! START_ERROR=`start-stop-daemon --start --pidfile $PIDFILE --exec $DAEMON -- $PINTOD_OPTS --pid $PIDFILE 2>&1`; then
@@ -88,7 +83,7 @@ status() {
 
 case "$1" in
     start)
-        start_if_configured
+        start
         ;;
     stop)
         stop

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pinto.git