------------------------------------------------------------ revno: 6 committer: Dimitri John Ledkov <[email protected]> branch nick: upstart-jobs timestamp: Fri 2013-12-13 18:38:08 +0000 message: auto update removed: etc/init/mounting-glusterfs.conf added: etc/init/ceilometer-agent-notification.conf etc/init/strongswan.conf modified: etc/init/lxc-net.conf etc/init/munin-node.conf etc/init/munin.conf etc/init/ofono.override etc/init/php5-fpm.conf usr/share/upstart/sessions/application.conf usr/share/upstart/sessions/update-notifier-crash.conf
-- 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
=== added file 'etc/init/ceilometer-agent-notification.conf' --- etc/init/ceilometer-agent-notification.conf 1970-01-01 00:00:00 +0000 +++ etc/init/ceilometer-agent-notification.conf 2013-12-13 18:38:08 +0000 @@ -0,0 +1,17 @@ +description "ceilometer-agent-notification" +author "Yolanda Robla <[email protected]>" + +start on runlevel [2345] +stop on runlelvel [!2345] + +chdir /var/run + +pre-start script + mkdir -p /var/run/ceilometer + chown ceilometer:ceilometer /var/run/ceilometer + + mkdir -p /var/lock/ceilometer + chown ceilometer:ceilometer /var/lock/ceilometer +end script + +exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-agent-notification === modified file 'etc/init/lxc-net.conf' --- etc/init/lxc-net.conf 2013-12-06 17:20:05 +0000 +++ etc/init/lxc-net.conf 2013-12-13 18:38:08 +0000 @@ -43,6 +43,7 @@ mkdir -p ${varrun} ifconfig ${LXC_BRIDGE} ${LXC_ADDR} netmask ${LXC_NETMASK} up iptables $use_iptables_lock -t nat -A POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE + iptables $use_iptables_lock -t mangle -A POSTROUTING -o ${LXC_BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill LXC_DOMAIN_ARG="" if [ -n "$LXC_DOMAIN" ]; then @@ -63,6 +64,7 @@ iptables -w -L -n 2>&1 > /dev/null || use_iptables_lock="" ifconfig ${LXC_BRIDGE} down iptables $use_iptables_lock -t nat -D POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE || true + iptables $use_iptables_lock -t mangle -D POSTROUTING -o ${LXC_BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill pid=`cat ${varrun}/dnsmasq.pid 2>/dev/null` && kill -9 $pid || true rm -f ${varrun}/dnsmasq.pid brctl delbr ${LXC_BRIDGE} === removed file 'etc/init/mounting-glusterfs.conf' --- etc/init/mounting-glusterfs.conf 2013-11-18 12:42:03 +0000 +++ etc/init/mounting-glusterfs.conf 1970-01-01 00:00:00 +0000 @@ -1,7 +0,0 @@ -author "Louis Zuckerman <[email protected]>" -description "Block the mounting event for glusterfs filesystems until glusterfs-server is running" - -start on mounting TYPE=glusterfs -task -exec start wait-for-state WAIT_FOR=glusterfs-server WAITER=mounting-glusterfs - === modified file 'etc/init/munin-node.conf' --- etc/init/munin-node.conf 2013-11-18 12:42:03 +0000 +++ etc/init/munin-node.conf 2013-12-13 18:38:08 +0000 @@ -1,24 +1,18 @@ -# munin-node - +# vim: set ft=upstart ts=2 et: description "munin-node" author "Chuck Short <[email protected]>" start on (filesystem and net-device-up IFACE=lo) stop on runlevel [!2345] -env DAEMON=/usr/sbin/munin-node - expect fork -respawn +respawn pre-start script - mkdir -p /var/run/munin - chown munin:munin /var/run/munin - chmod 0755 /var/run/munin + install -m 0755 -o munin -g munin -d /var/run/munin end script script - [ -r /etc/default/munin-node ] && . /etc/default/munin-node - - exec $DAEMON $DAEMON_ARGS + [ -r /etc/default/munin-node ] && . /etc/default/munin-node + exec /usr/sbin/munin-node $DAEMON_ARGS end script === modified file 'etc/init/munin.conf' --- etc/init/munin.conf 2013-11-18 12:42:03 +0000 +++ etc/init/munin.conf 2013-12-13 18:38:08 +0000 @@ -1,6 +1,5 @@ -# munin - -description "munin" +# vim:set ft=upstart ts=2 et: +description "Munin" author "James Page <[email protected]>" start on runlevel [2345] @@ -9,7 +8,6 @@ task script - mkdir -p /var/run/munin - chown munin:munin /var/run/munin - chmod 0755 /var/run/munin + # Ensure /var/run/munin exists with correct permissions + install -m 0755 -o munin -g munin -d /var/run/munin end script === modified file 'etc/init/ofono.override' --- etc/init/ofono.override 2013-11-18 12:42:03 +0000 +++ etc/init/ofono.override 2013-12-13 18:38:08 +0000 @@ -22,4 +22,4 @@ sleep 5 end script -exec ofonod -p ril,rilmodem,provision,mbpi,nettime +exec ofonod -p ril,rilmodem,provision,mbpi,nettime,mnclength,smshistory === modified file 'etc/init/php5-fpm.conf' --- etc/init/php5-fpm.conf 2013-11-18 12:42:03 +0000 +++ etc/init/php5-fpm.conf 2013-12-13 18:38:08 +0000 @@ -6,6 +6,8 @@ start on runlevel [2345] stop on runlevel [016] +reload signal USR2 + pre-start exec /usr/lib/php5/php5-fpm-checkconf respawn === added file 'etc/init/strongswan.conf' --- etc/init/strongswan.conf 1970-01-01 00:00:00 +0000 +++ etc/init/strongswan.conf 2013-12-13 18:38:08 +0000 @@ -0,0 +1,24 @@ +# Upstart job for strongSwan. + +description "strongSwan IPsec services" +author "Jonathan Davies <[email protected]>" + +start on (runlevel [2345] and net-device-up IFACE!=lo) +stop on runlevel [!2345] + +expect fork +respawn + +pre-start script + # Create lock directory. + mkdir -p /var/lock/subsys/ +end script + +post-stop script + rm -f /var/run/charon.pid /var/run/starter.charon.pid +end script + +env PIDFILE=/var/run/charon.pid + +pre-start exec /usr/sbin/ipsec start +post-stop exec /usr/sbin/ipsec stop === modified file 'usr/share/upstart/sessions/application.conf' --- usr/share/upstart/sessions/application.conf 2013-11-18 12:42:03 +0000 +++ usr/share/upstart/sessions/application.conf 2013-12-13 18:38:08 +0000 @@ -17,7 +17,7 @@ CLICK_PKG=`echo "${APP_ID}" | cut -d _ -f 1` if [ ! -z $CLICK_PKG ] ; then - CLICK_DIR=`click pkgdir "${CLICK_PKG}" || true` + CLICK_DIR=`click pkgdir "${CLICK_PKG}" 2> /dev/null || true` fi if [ ! -z $CLICK_DIR ] && [ -d $CLICK_DIR ] ; then === modified file 'usr/share/upstart/sessions/update-notifier-crash.conf' --- usr/share/upstart/sessions/update-notifier-crash.conf 2013-11-18 12:42:03 +0000 +++ usr/share/upstart/sessions/update-notifier-crash.conf 2013-12-13 18:38:08 +0000 @@ -11,6 +11,10 @@ script DATE=$(date) echo "$DATE crash report $MATCH detected" +if [ -e /etc/apport/autoreport ]; then + echo "$DATE autoreporting enabled exiting" + exit 0 +fi if [ -r $MATCH ]; then /usr/share/apport/apport-gtk else
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
