X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=services.mk;h=2eacc230f97bcdad41a268eb2e240b94fbdd37ac;hb=721e4de30b642e09dd1760c9e35e33258b15d3eb;hp=920fe1762feb477cd219a849fd68558ab3fb7150;hpb=bb3723262b16907a1c6e867dd767a2a7672cba01;p=mkinit

diff --git a/services.mk b/services.mk
index 920fe17..2eacc23 100644
--- a/services.mk
+++ b/services.mk
@@ -59,7 +59,6 @@ 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
@@ -98,7 +97,7 @@ fsclean-start:VPservice -u: boot
 	$P mv $dirs /.old || true
 	$P mkdir -p $dirs
 	$P chmod 1777 /tmp
-	$P install -m 777 -d /var/run/screen # Fuck you Screen
+	$P install -m 1777 -d /var/run/screen # Fuck you Screen
 	$P exec rm -rf /.old &
 	service -U $target
 
@@ -154,17 +153,23 @@ sysctl-start:VPservice -u: mounts-start
 at-start_cmd=atd
 at-stop_cmd=pkill atd
 
-cron-start_cmd=cron
+cron-start:VPservice -u: localhost-start fsclean-start
+	$P cron
+	service -U $target
 cron-stop_cmd=pkill cron
 
-hddtemp-start:VPservice -u: localhost-start
-	$P hddtemp -d -l 127.0.0.1 /dev/sda
-	service -U $target
+hddtemp-start_cmd=hddtemp -d
 hddtemp-stop_cmd=pkill hddtemp
 
 hwclock-start_cmd=hwclock --hctosys --utc
 hwclock-stop_cmd=hwclock --systohc --utc
 
+mdadm-start_cmd=mdadm --monitor --scan --daemonize
+mdadm-stop_cmd=pkill mdadm
+
+smartd-start_cmd=smartd
+smartd-stop_cmd=pkill smartd
+
 sshd-start_cmd=/usr/sbin/sshd
 sshd-stop_cmd=pkill sshd
 
@@ -186,7 +191,7 @@ cups-start_cmd=cupsd
 cups-stop_cmd=pkill cupsd
 
 dbus-start:VPservice -u: fsclean-start localhost-start
-	$P mkdir -p /var/run/dbus
+	$P install -m 1777 -d /var/run/dbus
 	$P /usr/bin/dbus-daemon --system
 	service -U $target
 dbus-stop_cmd=pkill dbus-daemon
@@ -207,13 +212,22 @@ polipo-stop_cmd=pkill polipo
 
 # Server
 # ------
-apache2-start_cmd=apache2
+apache2-start:VPservice -u: fsclean-start
+	$P install -o apache -g apache -d /var/run/session
+	$P apache2 $(apache2-opts)
+	service -U $target
 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 bitlbee
 
+cups-start_cmd=cupsd
+cups-stop_cmd=pkill cupsd
+
+denyhosts-start_cmd=denyhosts.py --daemon
+denyhosts-stop_cmd=pkill denyhosts.py
+
 courier-start:VPservice -u: fsclean-start
 	$P install -o mail -g mail -d /var/run/courier
 	$P authdaemond       start
@@ -223,9 +237,6 @@ courier-start:VPservice -u: fsclean-start
 	service -U $target
 courier-stop_cmd=pkill '(courier|authdaemon)'
 
-dhcp-start_cmd=dhcpcd eth0
-dhcp-stop_cmd=dhcpcd eth0 -k
-
 dioc-start:VPservice -u: munged-start
 	$P mount -n /mnt/c
 	$P mount -n /mnt/c/mnt/x
@@ -243,6 +254,9 @@ diod-stop_cmd=pkill diod
 dovecot-start_cmd=dovecot
 dovecot-stop_cmd=pkill dovecot
 
+eth0-start_cmd=dhcpcd eth0
+eth0-stop_cmd=dhcpcd eth0 -k
+
 exim-start_cmd=exim -bd -q5m
 exim-stop_cmd=pkill exim
 
@@ -251,14 +265,22 @@ gitd-start:VPservice -u: boot
 		'--syslog' \
 		'--export-all' \
 		'--user-path=git' \
-		'--base-path=/home/server/git' \
+		'--interpolated-path=/etc/git/%H%D' \
 		'--listen=0.0.0.0' \
 		'--user=nobody' \
 		'--group=nobody' &
 	service -U $target
 gitd-stop_cmd=pkill git-daemon
 
-munged-start:VPservice -u: boot
+jabberd-start_cmd=sudo -u jabber -g jabber jabberd -b
+jabberd-stop_cmd=pkill --uid jabber
+
+mailman-start_cmd=sudo -u mailman -g mailman \
+	/usr/lib64/mailman/bin/mailmanctl -s start
+mailman-stop_cmd=sudo -u mailman -g mailman \
+	/usr/lib64/mailman/bin/mailmanctl stop
+
+munged-start:VPservice -u: localhost-start mounts-start
 	$P install -o munge -g munge -d /var/run/munge
 	$P sudo -u munge -g munge munged
 	service -U $target
@@ -276,6 +298,9 @@ ntpd-stop_cmd=pkill ntpd
 privoxy-start_cmd=privoxy --user privoxy.privoxy /etc/privoxy/config
 privoxy-stop_cmd=pkill privoxy
 
+rngd-start_cmd=rngd -b -s64 -t60
+rngd-stop_cmd=pkill rngd
+
 spamd-start_cmd=spamd -u spamd -d
 spamd-stop_cmd=pkill spamd
 
@@ -287,6 +312,11 @@ tor-start:VPservice -u: boot
 	service -U $target
 tor-stop_cmd=pkill tor
 
+wlan0-start:VPservice -u: wpa-start
+	$P dhcpcd wlan0
+	service -U $target
+wlan0-stop_cmd=dhcpcd wlan0 -k
+
 wpa-start:VPservice -u: mdev-start
 	$P modprobe b43
 	$P exec wpa_supplicant -i wlan0 -c /etc/wpa_supplicant/wpa_supplicant.conf &