Add munged/diod/mdadm, fix bitlbee/exim

[mkinit] / services.mk

diff --git a/services.mk b/services.mk
index dde559bcecb064b301f2aa43007ab7a0d2a4bcb5..4b767631676d351f0d1752721229b67e0b4e16ef 100644 (file)
--- a/services.mk
+++ b/services.mk
@@ -60,6 +60,7 @@ initctl-stop_cmd=fuser -k /dev/initctl
 # Proc, mtab, fstab
 mounts-start:VPservice -u: boot
        $P cp /proc/mounts /etc/mtab
+       $P mdadm -A /dev/md4 /dev/sd[abc]4
        $P mount -a
        service -U $target
 
@@ -97,7 +98,7 @@ fsclean-start:VPservice -u: boot
        $P mv $dirs /.old || true
        $P mkdir -p $dirs
        $P chmod 1777 /tmp
-       $P install -m 755 -d /var/run/screen # Fuck you Screen
+       $P install -m 777 -d /var/run/screen # Fuck you Screen
        $P exec rm -rf /.old &
        service -U $target
 
@@ -203,7 +204,7 @@ apache2-stop_cmd=pkill apache2
 
 #bitlbee-start_cmd=sudo -u bitlbee bitlbeed /usr/sbin/bitlbee
 bitlbee-start_cmd=bitlbee -D -u bitlbee
-bitlbee-stop_cmd=pkill bitlbeed
+bitlbee-stop_cmd=pkill bitlbee
 
 courier-start:VPservice -u: fsclean-start
        $P install -o mail -g mail -d /var/run/courier
@@ -217,12 +218,41 @@ courier-stop_cmd=pkill '(courier|authdaemon)'
 dhcp-start_cmd=dhcpcd eth0
 dhcp-stop_cmd=dhcpcd eth0 -k
 
+diod-start:VPservice -u: munged-start
+       $P diod --export-all
+       service -U $target
+diod-stop_cmd=pkill diod
+
+dovecot-start_cmd=dovecot
+dovecot-stop_cmd=pkill dovecot
+
+exim-start_cmd=exim -bd -q5m
+exim-stop_cmd=pkill exim
+
+gitd-start:VPservice -u: boot
+       $P exec /usr/libexec/git-core/git-daemon \
+               '--syslog' \
+               '--export-all' \
+               '--user-path=git' \
+               '--base-path=/home/server/git' \
+               '--listen=0.0.0.0' \
+               '--user=nobody' \
+               '--group=nobody' &
+       service -U $target
+gitd-stop_cmd=pkill git-daemon
+
+munged-start_cmd=sudo -u munge -g munge munged
+munged-stop_cmd=pkill munged
+
 mysql-start:VPservice -u: fsclean-start
        $P install -o mysql -g mysql -d /var/run/mysqld
-       $P mysqld &
+       $P exec mysqld &
        service -U $target
 mysql-stop_cmd=pkill mysqld
 
+ntpd-start_cmd=ntpd
+ntpd-stop_cmd=pkill ntpd
+
 privoxy-start_cmd=privoxy --user privoxy.privoxy /etc/privoxy/config
 privoxy-stop_cmd=pkill privoxy