[pinto] 01/01: Removed pinto.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 219af2dcc4dd5de9cbbcab4fddf125dd2649431c
Author: Oleg Gashev <oleg at gashev.net>
Date:   Sat Sep 28 18:30:45 2013 +0000

    Removed pinto.default.
---
 debian/pinto.default |    7 -------
 debian/pinto.init    |   11 +++++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/debian/pinto.default b/debian/pinto.default
deleted file mode 100644
index a9f63a4..0000000
--- a/debian/pinto.default
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################
-#
-# pintod's default file, for generic sys config
-#
-################################################
-# 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 1771815..f772269 100644
--- a/debian/pinto.init
+++ b/debian/pinto.init
@@ -14,7 +14,6 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/pintod
 NAME=pintod
 PIDFILE=/var/run/pinto/$NAME.pid
-DEFAULTS_FILE=/etc/default/pinto
 DESC="pinto perl module repository"
 
 umask 0037
@@ -23,8 +22,6 @@ test -f $DAEMON || exit 0
 
 set -e
 
-[ -f $DEFAULTS_FILE ] && . $DEFAULTS_FILE
-
 . /lib/lsb/init-functions
 
 check_started() {
@@ -44,7 +41,13 @@ start() {
         # Could be removed during boot
         test -e /var/run/pinto || install -m 750 -o pinto -g pinto -d /var/run/pinto
 
-        if ! START_ERROR=`start-stop-daemon --chuid pinto -u pinto --start --pidfile $PIDFILE --exec $DAEMON -- $PINTOD_OPTS --pid $PIDFILE 2>&1`; then
+        if ! START_ERROR=`start-stop-daemon --chuid pinto -u pinto --start \
+            --pidfile $PIDFILE --exec $DAEMON -- \
+            --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 \
+            --pid $PIDFILE 2>&1`; then
             echo -n " "
             log_action_end_msg 1 "$START_ERROR"
             exit 0

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