conf.d major changes

conf.d/README

@@ -1,6 +1,3 @@
 This is the directory additional service configuration is sourced from.
-Basically you can override what's written in a service file from here
-without directly modifying the service itself, making it easier to
-update those as any local configuration should go here instead.
-
-I've provided a sample conf.d entry for dropbear to demostrate.
+The service script itself must support these settings, as it's sourced
+after the conf.d one.

conf.d/devfs-links

@@ -0,0 +1,8 @@
+# Config for devfs-links
+
+cfg_links=(
+	'/proc/self/fd;/dev/fd'
+	'/proc/self/fd/0;/dev/stdin'
+	'/proc/self/fd/1;/dev/stdout'
+	'/proc/self/fd/2;/dev/stderr'
+)

conf.d/devfs-links.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env watchman
-# Config for devfs-links
-
-cfg_links=(
-			'/proc/self/fd;/dev/fd'
-			'/proc/self/fd/0;/dev/stdin'
-			'/proc/self/fd/1;/dev/stdout'
-			'/proc/self/fd/2;/dev/stderr'
-		  )

conf.d/dnscrypt

@@ -7,9 +7,3 @@ resolver_ip='77.66.84.233'
 resolver_port='443'
 provider_name='2.dnscrypt-cert.resolver2.dnscrypt.eu'
 provider_key='3748:5585:E3B9:D088:FD25:AD36:B037:01F5:520C:D648:9E9A:DD52:1457:4955:9F0A:9955'
-
-service_args="--local-address=${local_ip}:${local_port} \
-	--resolver-address=${resolver_ip}:${resolver_port} \
-	--provider-name=${provider_name} \
-	--provider-key=${provider_key} \
-	--user=${local_user}"

conf.d/dnscrypt-backup

@@ -7,9 +7,3 @@ resolver_ip='176.56.237.171'
 resolver_port='443'
 provider_name='2.dnscrypt-cert.resolver1.dnscrypt.eu'
 provider_key='67C0:0F2C:21C5:5481:45DD:7CB4:6A27:1AF2:EB96:9931:40A3:09B6:2B8D:1653:1185:9C66'
-
-service_args="--local-address=${local_ip}:${local_port} \
-	--resolver-address=${resolver_ip}:${resolver_port} \
-	--provider-name=${provider_name} \
-	--provider-key=${provider_key} \
-	--user=${local_user}"

conf.d/dropbear

@@ -0,0 +1,5 @@
+# dropbear config
+
+cfg_listen_port='2234'
+
+service_args=( -R -w -F -p "$cfg_listen_port" )

conf.d/dropbear.sh

@@ -1,5 +0,0 @@
-# dropbear config
-
-cfg_listen_port='2234'
-
-service_args="-R -w -F -p ${cfg_listen_port}"

conf.d/fcgiwrap

@@ -4,5 +4,3 @@ cfg_user='http'
 cfg_group='http'
 cfg_socket='/run/fcgiwrap.sock'
 service_pidfile='/run/fcgiwrap.pid'
-
-service_args="-s ${cfg_socket} -P ${service_pidfile} -u ${cfg_user} -g ${cfg_group} -- /usr/bin/fcgiwrap"

conf.d/kmscon

@@ -0,0 +1,4 @@
+# KMSCON config
+
+kmscon_font_name='terminus'
+kmscon_palette='solarized'

conf.d/kmscon.sh

@@ -1,9 +0,0 @@
-# KMSCON config
-
-kmscon_font_name='terminus'
-kmscon_palette='solarized'
-
-# The space at the start is important.
-service_args+=" --hwaccel --drm \
-				--font-name ${kmscon_font_name} \
-				--palette ${kmscon_palette}"

conf.d/ldm.sh

@@ -1,5 +0,0 @@
-cfg_uid='1000'
-cfg_gid='95'
-cfg_mountpoint='/media/'
-
-service_args=( -u "$cfg_uid" -g "$cfg_gid" -p "$cfg_mountpoint" )

conf.d/ngetty

@@ -0,0 +1,2 @@
+# On which ttys to launch ngetty
+service_args=( 2 3 )

conf.d/ngetty.sh

@@ -1,3 +0,0 @@
-# dropbear config
-
-service_args='2 3'

init.d/dnscrypt

@@ -5,3 +5,10 @@ depends dnscrypt-backup
 
 #service_respawn='true'
 service_command='/usr/bin/dnscrypt-proxy'
+service_args=(
+	"--local-address=${local_ip}:${local_port}"
+	"--resolver-address=${resolver_ip}:${resolver_port}"
+	"--provider-name=${provider_name}"
+	"--provider-key=${provider_key}"
+	"--user=${local_user}"
+)

init.d/dnscrypt-backup

@@ -2,3 +2,10 @@
 
 #service_respawn='true'
 service_command='/usr/bin/dnscrypt-proxy'
+service_args=(
+	"--local-address=${local_ip}:${local_port}"
+	"--resolver-address=${resolver_ip}:${resolver_port}"
+	"--provider-name=${provider_name}"
+	"--provider-key=${provider_key}"
+	"--user=${local_user}"
+)

init.d/dropbear

@@ -2,4 +2,3 @@
 
 service_respawn=true
 service_command='/usr/bin/dropbear'
-service_args=( -R -w -F )

init.d/fcgiwrap

@@ -3,3 +3,4 @@
 
 #service_respawn='true'
 service_command='/usr/bin/spawn-fcgi'
+service_args=( -s "$cfg_socket" -P "$service_pidfile" -u "$cfg_user" -g "$cfg_group" -- /usr/bin/fcgiwrap )

init.d/kmscon

@@ -1,7 +1,12 @@
 #!/usr/bin/env watchman
 
-tty=${service_name##*-};
+tty="${service_name##*-}"
 
 service_respawn='true'
 service_command='/usr/bin/kmscon'
-service_args=( --vt "$tty" )
+service_args=(
+	--vt "$tty"
+	--hwaccel --drm
+	--font-name "$kmscon_font_name"
+	--palette "$kmscon_palette"
+)

init.d/ldm

@@ -1,5 +0,0 @@
-#!/usr/bin/env watchman
-depends systemd-udevd || return 1
-
-#service_respawn='true'
-service_command='/usr/bin/ldm'