------------------------------------------------------------
revno: 71
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Mon 2014-04-28 12:14:41 +0100
message:
auto update
added:
lib/systemd/system/NetworkManager-dispatcher.service
lib/systemd/system/NetworkManager-wait-online.service
lib/systemd/system/NetworkManager.service
lib/systemd/system/mandos.service
lib/systemd/system/network-manager.service@
lib/systemd/system/network-online.target.wants/
lib/systemd/system/network-online.target.wants/NetworkManager-wait-online.service@
lib/systemd/system/slim.service
modified:
etc/init.d/adjtimex
etc/init.d/dns-flood-detector
etc/init.d/ftp-proxy
etc/init.d/lightdm
etc/init.d/mandos
etc/init.d/mldonkey-server
etc/init.d/orthanc
etc/init.d/slim
etc/init.d/stunnel4
etc/init.d/tango-accesscontrol
etc/init.d/tango-db
etc/init.d/tango-starter
etc/init/bird.conf
etc/init/bird6.conf
lib/systemd/system/lightdm.service
lib/systemd/system/privoxy.service
--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs
Your team Upstart Reviewers is subscribed to branch
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init.d/adjtimex'
--- etc/init.d/adjtimex 2014-04-09 00:24:49 +0000
+++ etc/init.d/adjtimex 2014-04-28 11:14:41 +0000
@@ -14,6 +14,8 @@
# Description: set the kernel time variables
### END INIT INFO
+. /lib/lsb/init-functions
+
test -x /sbin/adjtimex || exit 0
# default values
=== modified file 'etc/init.d/dns-flood-detector'
--- etc/init.d/dns-flood-detector 2014-04-09 00:24:49 +0000
+++ etc/init.d/dns-flood-detector 2014-04-28 11:14:41 +0000
@@ -23,6 +23,8 @@
test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
+
# Include dns-flood-detector defaults if available
if [ -f /etc/default/dns-flood-detector ] ; then
. /etc/default/dns-flood-detector
=== modified file 'etc/init.d/ftp-proxy'
--- etc/init.d/ftp-proxy 2014-04-09 00:24:49 +0000
+++ etc/init.d/ftp-proxy 2014-04-28 11:14:41 +0000
@@ -61,8 +61,11 @@
$0 stop
$0 start
;;
+ status)
+ status_of_proc "$DAEMON" ftp-proxy
+ ;;
*)
- log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}"
+ log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload|status}"
exit 1
;;
esac
=== modified file 'etc/init.d/lightdm'
--- etc/init.d/lightdm 2014-04-09 00:24:49 +0000
+++ etc/init.d/lightdm 2014-04-28 11:14:41 +0000
@@ -21,9 +21,9 @@
### BEGIN INIT INFO
# Provides: lightdm
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Should-Start: $named acpid hal
+# Required-Start: $local_fs $remote_fs dbus
+# Required-Stop: $local_fs $remote_fs dbus
+# Should-Start: $named
# Should-Stop: $named
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
=== modified file 'etc/init.d/mandos'
--- etc/init.d/mandos 2014-04-09 00:24:49 +0000
+++ etc/init.d/mandos 2014-04-28 11:14:41 +0000
@@ -1,12 +1,12 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: mandos
-# Required-Start: $remote_fs $syslog avahi
-# Required-Stop: $remote_fs $syslog avahi
+# Required-Start: $remote_fs $syslog avahi-daemon
+# Required-Stop: $remote_fs $syslog avahi-daemon
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Mandos server
-# Description: Gives encrypted passwords to Mandos clients
+# Description: Server of encrypted passwords to Mandos clients
### END INIT INFO
# Author: Teddy Hogeborn <[email protected]>
@@ -23,7 +23,11 @@
NAME=mandos
DAEMON=/usr/sbin/$NAME
DAEMON_ARGS=""
-PIDFILE=/var/run/$NAME.pid
+if [ -d /run/. ]; then
+ PIDFILE=/run/$NAME.pid
+else
+ PIDFILE=/var/run/$NAME.pid
+fi
SCRIPTNAME=/etc/init.d/$NAME
# Exit if the package is not installed
@@ -40,7 +44,8 @@
. /lib/init/vars.sh
# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
. /lib/lsb/init-functions
#
@@ -118,6 +123,9 @@
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
+ status)
+ status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE" && exit 0 || exit $?
+ ;;
#reload|force-reload)
#
# If do_reload() is not implemented then leave this commented out
@@ -144,17 +152,14 @@
esac
;;
*)
- # Failed to stop
+ # Failed to stop
log_end_msg 1
;;
esac
;;
- status)
- status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE"
- ;;
*)
#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
exit 3
;;
esac
=== modified file 'etc/init.d/mldonkey-server'
--- etc/init.d/mldonkey-server 2014-04-09 00:24:49 +0000
+++ etc/init.d/mldonkey-server 2014-04-28 11:14:41 +0000
@@ -33,6 +33,8 @@
LOGFILE=/var/log/mldonkey/mldonkey-server.log
SERVERLOG=/var/log/mldonkey/mlnet.log
+. /lib/lsb/init-functions
+
test -e $CONFIG || exit 0
set -e
@@ -130,8 +132,8 @@
WRAPPER_OPTIONS="$WRAPPER_OPTIONS --user $USER"
start-stop-daemon --start $WRAPPER_OPTIONS \
- --pidfile $PIDFILE --background --exec $EXEC \
- -- -log_file $SERVERLOG -pid $PIDDIR 2>&1
+ --pidfile $PIDFILE --background --no-close --exec $EXEC \
+ -- -log_file $SERVERLOG -pid $PIDDIR >>$SERVERLOG 2>&1
StartErrorCheck
@@ -149,8 +151,12 @@
$0 start
;;
+ status)
+ status_of_proc "$EXEC" "$NAME" && exit 0 || exit $?
+ ;;
+
*)
- Error 1 "Usage: $0 {start|stop|restart|force-reload|force-start}"
+ Error 1 "Usage: $0 {start|stop|restart|force-reload|force-start|status}"
;;
esac
=== modified file 'etc/init.d/orthanc'
--- etc/init.d/orthanc 2014-04-09 00:24:49 +0000
+++ etc/init.d/orthanc 2014-04-28 11:14:41 +0000
@@ -18,13 +18,16 @@
# You can modify the variables below
DESC="Orthanc"
-NAME=orthanc
-DAEMON=/usr/sbin/Orthanc
-LOGDIR=/var/log/orthanc
-DAEMON_ARGS="--logdir=$LOGDIR /etc/orthanc/orthanc.json"
-PIDFILE=/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-ORTHANC_USER=orthanc:orthanc
+NAME=Orthanc
+
+# Auto-computed values
+NAME_LOWER_CASE=`echo "${NAME}" | tr '[A-Z]' '[a-z]'`
+DAEMON=/usr/sbin/${NAME}
+LOGDIR=/var/log/${NAME_LOWER_CASE}
+DAEMON_ARGS="--logdir=${LOGDIR} /etc/${NAME_LOWER_CASE}/${NAME_LOWER_CASE}.json"
+PIDFILE=/run/${NAME_LOWER_CASE}.pid
+SCRIPTNAME=/etc/init.d/${NAME_LOWER_CASE}
+ORTHANC_USER=${NAME_LOWER_CASE}:${NAME_LOWER_CASE}
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
=== modified file 'etc/init.d/slim'
--- etc/init.d/slim 2014-04-09 00:24:49 +0000
+++ etc/init.d/slim 2014-04-28 11:14:41 +0000
@@ -6,57 +6,48 @@
### BEGIN INIT INFO
# Provides: slim
-# Required-Start: $local_fs $remote_fs
+# Required-Start: dbus $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs
# Should-Start: xfs $named slapd
# Should-Stop: xfs $named slapd
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: Start/stop the SLiM daemon.
+# Short-Description: Start daemon at boot time
+# Description: Debian init script for the SLiM.
### END INIT INFO
test -z "$HEED_DEFAULT_DISPLAY_MANAGER" && HEED_DEFAULT_DISPLAY_MANAGER=true
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+NAME="slim"
+DESC="X display manager"
DAEMON=/usr/bin/slim
PIDFILE=/var/run/slim.lock
SSD_START_ARGS="--pidfile $PIDFILE --name $(basename $DAEMON) --startas $DAEMON -- -d"
SSD_STOP_ARGS="--pidfile $PIDFILE --name $(basename $DAEMON) --retry TERM/5/TERM/5"
+test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
+
case $1 in
start)
if [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
[ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
[ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
- echo "Not starting X display manager (slim); it is not the default display manager."
+ log_daemon_msg "Not starting $DESC ($NAME); it is not the default display manager." "$NAME"
else
- echo -n "Starting X display manager: slim"
- start-stop-daemon --start --quiet $SSD_START_ARGS || echo -n " already running"
- echo "."
+ log_daemon_msg "Starting $NAME" "$NAME"
+ start-stop-daemon --start --quiet $SSD_START_ARGS
+ log_end_msg $?
fi
;;
stop)
- echo -n "Stopping X display manager: slim"
- if ! [ -f $PIDFILE ]; then
- echo -n " not running ($PIDFILE not found)"
- else
- start-stop-daemon --stop --quiet $SSD_STOP_ARGS
- SSD_RES=$?
- if [ $SSD_RES -eq 1 ]; then
- echo -n " not running"
- fi
- if [ $SSD_RES -eq 2 ]; then
- echo -n " not responding to TERM signals"
- else
- if [ -f $PIDFILE ]; then
- echo -n " (removing stale $PIDFILE)"
- rm $PIDFILE
- fi
- fi
- fi
- echo "."
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ start-stop-daemon --stop --quiet $SSD_STOP_ARGS
+ log_end_msg $?
+ rm -f $PIDFILE
;;
restart)
@@ -69,11 +60,14 @@
/etc/init.d/slim restart
;;
+ status)
+ status_of_proc /usr/bin/$NAME $NAME
+ ;;
+
*)
- echo "Usage: /etc/init.d/slim {start|stop|restart|force-reload}"
+ echo "Usage: /etc/init.d/slim {start|stop|restart|force-reload|status}"
exit 1
;;
esac
# End of file
-
=== modified file 'etc/init.d/stunnel4'
--- etc/init.d/stunnel4 2014-04-09 00:24:49 +0000
+++ etc/init.d/stunnel4 2014-04-28 11:14:41 +0000
@@ -40,16 +40,24 @@
rm -rf /var/run/stunnel4
install -d -o stunnel4 -g stunnel4 /var/run/stunnel4
fi
+ if [ -n "$RLIMITS" ]; then
+ ulimit $RLIMITS
+ fi
for file in $FILES; do
if test -f $file; then
ARGS="$file $OPTIONS"
PROCLIST=`get_pids $file`
+ if egrep -qe '^pid[[:space:]]*=' "$file"; then
+ warn=''
+ else
+ warn=' (no pid=pidfile specified!)'
+ fi
if [ "$PROCLIST" ] && kill -s 0 $PROCLIST 2>/dev/null; then
- echo -n "[Already running: $file] "
+ echo -n "[Already running$warn: $file] "
elif $DAEMON $ARGS; then
- echo -n "[Started: $file] "
+ echo -n "[Started$warn: $file] "
else
- echo "[Failed: $file]"
+ echo "[Failed$warn: $file]"
echo "You should check that you have specified the pid= in you configuration file"
exit 1
fi
@@ -69,6 +77,24 @@
done
}
+querydaemons()
+{
+ res=0
+ echo -n "$DESC status:"
+ for file in $FILES; do
+ echo -n " $file: "
+ PROCLIST=`get_pids $file`
+ if [ "$PROCLIST" ] && kill -s 0 $PROCLIST 2>/dev/null; then
+ echo -n 'running'
+ else
+ echo -n 'stopped'
+ res=1
+ fi
+ done
+ echo ''
+ exit "$res"
+}
+
if [ "x$OPTIONS" != "x" ]; then
OPTIONS="-- $OPTIONS"
fi
@@ -127,9 +153,12 @@
startdaemons
echo "$NAME."
;;
+ status)
+ querydaemons
+ ;;
*)
N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|reload|reopen-logs|restart} [<stunnel instance>]" >&2
+ echo "Usage: $N {start|stop|status|reload|reopen-logs|restart} [<stunnel instance>]" >&2
exit 1
;;
esac
=== modified file 'etc/init.d/tango-accesscontrol'
--- etc/init.d/tango-accesscontrol 2014-04-09 00:24:49 +0000
+++ etc/init.d/tango-accesscontrol 2014-04-28 11:14:41 +0000
@@ -22,6 +22,8 @@
CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
DAEMON=/usr/lib/tango/$NAME_REAL
DAEMON_ARGS="1"
+DAEMON_USER=tango
+DAEMON_GROUP=tango
PIDFILE=/var/run/$NAME.pid
# Exit if the package is not installed
@@ -51,10 +53,10 @@
fi
export SUPER_TANGO=true
tango_admin --ping-database 6 || return 2
- start-stop-daemon --start --quiet --chuid tango:tango --background \
+ start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
--make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
|| return 1
- start-stop-daemon --start --quiet --chuid tango:tango --background \
+ start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
--make-pidfile --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
|| return 2
# Add code here, if necessary, that waits for the process to be ready
=== modified file 'etc/init.d/tango-db'
--- etc/init.d/tango-db 2014-04-09 00:24:49 +0000
+++ etc/init.d/tango-db 2014-04-28 11:14:41 +0000
@@ -25,6 +25,8 @@
HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}'`
CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
DAEMON=/usr/lib/tango/$NAME_REAL
+DAEMON_USER=tango
+DAEMON_GROUP=tango
PIDFILE=/var/run/$NAME.pid
# Exit if the package is not installed
@@ -57,10 +59,10 @@
DAEMON_ARGS="2 -ORBendPoint giop:tcp::$PORT"
tango_admin --ping-network 40 || return 2
fi
- start-stop-daemon --start --quiet --chuid tango:tango --background \
+ start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
--make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
|| return 1
- start-stop-daemon --start --quiet --chuid tango:tango --background \
+ start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
--make-pidfile --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
|| return 2
# Add code here, if necessary, that waits for the process to be ready
=== modified file 'etc/init.d/tango-starter'
--- etc/init.d/tango-starter 2014-04-09 00:24:49 +0000
+++ etc/init.d/tango-starter 2014-04-28 11:14:41 +0000
@@ -22,6 +22,8 @@
CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
DAEMON=/usr/lib/tango/$NAME_REAL
DAEMON_ARGS=`hostname`
+DAEMON_USER=tango
+DAEMON_GROUP=tango
PIDFILE=/var/run/$NAME.pid
TAC_DEVICE=sys/access_control/1
@@ -58,10 +60,10 @@
# register the tango-starter if necessary
tango_admin --check-device tango/admin/`hostname` || tango_admin --add-server Starter/`hostname` Starter tango/admin/`hostname` || return 2
- start-stop-daemon --start --quiet --chuid tango:tango --background \
+ start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
--make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
|| return 1
- start-stop-daemon --start --quiet --chuid tango:tango --background \
+ start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
--make-pidfile --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
|| return 2
# Add code here, if necessary, that waits for the process to be ready
=== modified file 'etc/init/bird.conf'
--- etc/init/bird.conf 2013-11-18 12:42:03 +0000
+++ etc/init/bird.conf 2014-04-28 11:14:41 +0000
@@ -14,5 +14,5 @@
script
. /etc/bird/envvars
-/usr/sbin/bird -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP
+exec /usr/sbin/bird -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP
end script
=== modified file 'etc/init/bird6.conf'
--- etc/init/bird6.conf 2013-11-18 12:42:03 +0000
+++ etc/init/bird6.conf 2014-04-28 11:14:41 +0000
@@ -14,5 +14,5 @@
script
. /etc/bird/envvars
-/usr/sbin/bird6 -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP
+exec /usr/sbin/bird6 -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP
end script
=== added file 'lib/systemd/system/NetworkManager-dispatcher.service'
--- lib/systemd/system/NetworkManager-dispatcher.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/NetworkManager-dispatcher.service 2014-04-28 11:14:41 +0000
@@ -0,0 +1,11 @@
+[Unit]
+Description=Network Manager Script Dispatcher Service
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.nm_dispatcher
+ExecStart=/usr/lib/NetworkManager/nm-dispatcher.action
+
+[Install]
+Alias=dbus-org.freedesktop.nm-dispatcher.service
+
=== added file 'lib/systemd/system/NetworkManager-wait-online.service'
--- lib/systemd/system/NetworkManager-wait-online.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/NetworkManager-wait-online.service 2014-04-28 11:14:41 +0000
@@ -0,0 +1,13 @@
+[Unit]
+Description=Network Manager Wait Online
+Requisite=NetworkManager.service
+After=NetworkManager.service
+Wants=network.target
+Before=network.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/nm-online -q --timeout=30
+
+[Install]
+WantedBy=network.target
=== added file 'lib/systemd/system/NetworkManager.service'
--- lib/systemd/system/NetworkManager.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/NetworkManager.service 2014-04-28 11:14:41 +0000
@@ -0,0 +1,21 @@
+[Unit]
+Description=Network Manager
+Wants=network.target
+Before=network.target
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.NetworkManager
+ExecStart=/usr/sbin/NetworkManager --no-daemon
+# Suppress stderr to eliminate duplicated messages in syslog. NM calls openlog()
+# with LOG_PERROR when run in foreground. But systemd redirects stderr to
+# syslog by default, which results in logging each message twice.
+StandardError=null
+# NM doesn't want systemd to kill its children for it
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-org.freedesktop.NetworkManager.service
+Also=NetworkManager-dispatcher.service
+
=== modified file 'lib/systemd/system/lightdm.service'
--- lib/systemd/system/lightdm.service 2014-04-27 11:14:25 +0000
+++ lib/systemd/system/lightdm.service 2014-04-28 11:14:41 +0000
@@ -6,7 +6,7 @@
[Service]
# temporary safety check until all DMs are converted to correct
# display-manager.service symlink handling
-ExecStartPre=/bin/sh -c '[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/lightdm" ]'
+ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/lightdm" ]'
ExecStart=/usr/sbin/lightdm
Restart=always
BusName=org.freedesktop.DisplayManager
=== added file 'lib/systemd/system/mandos.service'
--- lib/systemd/system/mandos.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/mandos.service 2014-04-28 11:14:41 +0000
@@ -0,0 +1,21 @@
+[Unit]
+Description=Server of encrypted passwords to Mandos clients
+
+[Service]
+Type=simple
+## Type=dbus is not appropriate, because Mandos also needs to announce
+## its ZeroConf service and be reachable on the network.
+#Type=dbus
+BusName=se.recompile.Mandos
+# If you add --no-dbus, also comment out BusName above, and vice versa
+ExecStart=/usr/sbin/mandos --foreground
+Restart=always
+KillMode=process
+## Using socket activation won't work either, because systemd always
+## does bind() on the socket, and also won't announce the ZeroConf
+## service.
+#ExecStart=/usr/sbin/mandos --foreground --socket=0
+#StandardInput=socket
+
+[Install]
+WantedBy=multi-user.target
=== added symlink 'lib/systemd/system/network-manager.service'
=== target is u'NetworkManager.service'
=== added directory 'lib/systemd/system/network-online.target.wants'
=== added symlink 'lib/systemd/system/network-online.target.wants/NetworkManager-wait-online.service'
=== target is u'../NetworkManager-wait-online.service'
=== modified file 'lib/systemd/system/privoxy.service'
--- lib/systemd/system/privoxy.service 2014-04-14 11:09:10 +0000
+++ lib/systemd/system/privoxy.service 2014-04-28 11:14:41 +0000
@@ -1,10 +1,14 @@
[Unit]
Description=Privacy enhancing HTTP Proxy
-
+
[Service]
-ExecStart=/usr/sbin/privoxy --no-daemon /etc/privoxy/config
-StandardOutput=syslog
-StandardError=syslog
+Environment=PIDFILE=/var/run/privoxy.pid
+Environment=OWNER=privoxy
+Environment=CONFIGFILE=/etc/privoxy/config
+Type=forking
+PIDFile=$PIDFILE
+ExecStart=/usr/sbin/privoxy --pidfile $PIDFILE --user $OWNER $CONFIGFILE
+ExecStopPost=/bin/rm -f $PIDFILE
[Install]
WantedBy=multi-user.target
=== added file 'lib/systemd/system/slim.service'
--- lib/systemd/system/slim.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/slim.service 2014-04-28 11:14:41 +0000
@@ -0,0 +1,10 @@
+[Unit]
+Description=SLiM Simple Login Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/slim -nodaemon
+
+[Install]
+Alias=display-manager.service
+WantedBy=graphical.target
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
