X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=services.mk;h=1542efc07be2212d8b24c705197aa431a7d6a60c;hb=cfb8d44dcef33524a55213438779e000539b6d5d;hp=fb4f9e925cf33dbd15ebc1f6cbd1b70f4a0a5b4f;hpb=3116e94e35ee7d8d3127a974d3a737fb5d2cc16c;p=mkinit

diff --git a/services.mk b/services.mk
index fb4f9e9..1542efc 100644
--- a/services.mk
+++ b/services.mk
@@ -31,13 +31,13 @@ boot:VEPservice -u: /
 # Kill all process, then remount and sync
 halt:QVE: utmp-stop hwclock-stop alsa-stop
 	echo TERMinating all processes
-	$P pkill -15 -vg0 >/dev/null >[2=1]
+	$P pkill -15 --inverse -g0 >/dev/null >[2=1]
 	for (i in 1 2 3 4 5)
-		$P pgrep -vg0 >/dev/null >[2=1] && $P sleep 1
+		{ $P pgrep -vg0 && $P sleep 1 }
 	echo KILLing all processes
-	$P pkill  -9 -vg0 >/dev/null >[2=1]
+	$P pkill  -9 --inverse -g0 >/dev/null >[2=1]
 	for (i in 1 2 3)
-		$P pgrep -vg0 >/dev/null >[2=1] && $P sleep 1
+		{ $P pgrep -vg0 && $P sleep 1 }
 	service -F
 	echo Remounting read-only
 	$P mount -o remount,ro /
@@ -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
@@ -72,7 +71,7 @@ devtmpfs-start:VEPservice -u: boot
 	service -U $target
 
 # Start mdev as initial/daemon
-mdev-start:VEPservice -u: mounts-start udev-stop
+mdev-start:VEPservice -u: mounts-start
 	$P echo /sbin/mdev > /proc/sys/kernel/hotplug
 	$P mdev -s
 	service -U $target
@@ -98,25 +97,26 @@ 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
 
-# Spawn gettys for tty[456]
+# Spawn gettys for tty[23456]
 getty-start:VEPservice -u: hostname-start utmp-start
-	$P respawn /sbin/agetty 38400 tty4 linux
-	$P respawn /sbin/agetty 38400 tty5 linux
-	$P respawn /sbin/agetty 38400 tty6 linux
+	$P respawn setsid agetty 38400 tty2 linux
+	$P respawn setsid agetty 38400 tty3 linux
+	$P respawn setsid agetty 38400 tty4 linux
+	$P respawn setsid agetty 38400 tty5 linux
+	$P respawn setsid agetty 38400 tty6 linux
 	service -U $target
-getty-stop_cmd=fuser -k /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6
+getty-stop_cmd=fuser -k /dev/tty2 /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6
 
-# Spawn qingys for tty[23]
+# Spawn qingys for tty[7]
 qingy-start:VEPservice -u: hostname-start utmp-start modules-start
-	$P respawn /sbin/qingy tty2
-	$P respawn /sbin/qingy tty3 -t
-	$P chvt 2
+	$P respawn setsid /sbin/qingy-DirectFB tty7 &
+	$P chvt 7
 	service -U $target
-qingy-stop_cmd=fuser -k /dev/tty2
+qingy-stop_cmd=fuser -k /dev/tty7
 
 # Login records
 utmp-start:VPservice -u: fsclean-start
@@ -141,7 +141,11 @@ localhost-stop_cmd=ifconfig lo down
 hostname-start_cmd=hostname
 
 # Kernel parameters
-sysctl-start_cmd=sysctl -p
+sysctl-start:VPservice -u: mounts-start
+	$P sysctl -p
+	$P chmod a+w /sys/class/leds/smc::kbd_backlight/brightness
+	$P chmod a+w /sys/class/backlight/gmux_backlight/brightness
+	service -U $target
 
 
 # System
@@ -149,17 +153,23 @@ sysctl-start_cmd=sysctl -p
 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
 
@@ -181,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
@@ -202,13 +212,19 @@ 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
 
+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
@@ -218,8 +234,14 @@ 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
+	service -U $target
+dioc-stop:EVPservice -d:
+	$P umount /mnt/c/mnt/x
+	$P umount /mnt/c
+	service -D $target
 
 diod-start:VPservice -u: munged-start
 	$P diod --export-all
@@ -229,6 +251,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
 
@@ -237,14 +262,25 @@ 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_cmd=sudo -u munge -g munge munged
+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
 munged-stop_cmd=pkill munged
 
 mysql-start:VPservice -u: fsclean-start
@@ -259,6 +295,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
 
@@ -270,6 +309,17 @@ 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 &
+	service -U $target
+wpa-stop_cmd=pkill wpa
+
 # Library 
 # -------
 %-start:QVPservice -u: boot
@@ -280,8 +330,9 @@ tor-stop_cmd=pkill tor
 
 %-stop:QVPservice -d: /
 	if (~ $#($stem^-stop_cmd) 0)
-		echo No such service $stem && exit 0
-	$P $($stem^-stop_cmd)
+		echo No such service $stem
+	if not
+		$P $($stem^-stop_cmd)
 	service -D $target
 
 %-zap:QVPservice -d: /