completely refactor service generation

Far too many changes to list, but having a ton of redundant files like
"type" were removed since they can be generated in the install script
instead. cg support is also added to every longrun.

cg/down

@@ -0,0 +1,8 @@
+#!/bin/execlineb -P
+
+envfile /etc/s6/config/template.conf
+importas -uD "" SV_CG_SEND_SIGHUP SV_CG_SEND_SIGHUP
+importas -uD "" SV_CG_TIMEOUT_STOPSEC SV_CG_TIMEOUT_STOPSEC
+importas -uD "" SV_CG_SEND_SIGKILL SV_CG_SEND_SIGKILL
+
+foreground { sh /usr/lib/artix/sv-cg.sh down daemon ${SV_CG_SEND_SIGHUP} ${SV_CG_TIMEOUT_STOPSEC} ${SV_CG_SEND_SIGKILL} }

cg/up

@@ -0,0 +1,6 @@
+#!/bin/execlineb -P
+
+envfile /etc/s6/config/template.conf
+importas -uD "" SV_CG_SETTINGS SV_CG_SETTINGS
+
+foreground { sh /usr/lib/artix/sv-cg.sh up daemon ${SV_CG_SETTINGS} }

conf

@@ -1,2 +1,34 @@
 # This configures the directives used for s6-log in the log service.
 DIRECTIVES="n3 s2000000 T"
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#SV_CG_SETTINGS="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#SV_CG_SETTINGS=""
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#SV_CG_SEND_SIGHUP="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#SV_CG_TIMEOUT_STOPSEC="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#SV_CG_SEND_SIGKILL="YES"

install.sh

@@ -8,6 +8,147 @@ ADMINSVDIR="${DESTDIR}"/etc/s6/adminsv
 FALLBACKSVDIR="${DESTDIR}"/etc/s6/fallbacksv
 CONFDIR="${DESTDIR}"/etc/s6/config
 
+cg_dependency_blacklist() {
+    case $dirname in
+        dbus-srv) return ;;
+        elogind-srv) return ;;
+        gdm-srv) return ;;
+        lightdm-srv) return ;;
+        lvmpolld-srv) return ;;
+        lxdm-srv) return ;;
+        sddm-srv) return ;;
+        xdm-srv) return ;;
+    esac
+    false
+}
+
+log_blacklist() {
+    case $dirname in
+        backuppc-srv) return ;;
+        bftpd-srv) return ;;
+        cgmanager-srv) return ;;
+        colord-srv) return ;;
+        colord-session-srv) return ;;
+        cronie-srv) return ;;
+        cupsd-srv) return ;;
+        ddclient-srv) return ;;
+        dhclient-srv) return ;;
+        dhcpd4-srv) return ;;
+        dhcpd6-srv) return ;;
+        elogind-srv) return ;;
+        espeakup-srv) return ;;
+        exim-srv) return ;;
+        fancontrol-srv) return ;;
+        hiawatha-srv) return ;;
+        kadmind-srv) return ;;
+        krb5kdc-srv) return ;;
+        mailman-srv) return ;;
+        metalog-srv) return ;;
+        named-srv) return ;;
+        nvidia-persistenced-srv) return ;;
+        opensips-srv) return ;;
+        pptpd-srv) return ;;
+        radiusd-srv) return ;;
+        rspamd-srv) return ;;
+        salt-api-srv) return ;;
+        salt-master-srv) return ;;
+        salt-master-srv) return ;;
+        salt-syndic-srv) return ;;
+        sshguard-srv) return ;;
+        sslh-srv) return ;;
+        tinydns-srv) return ;;
+        usbguard-srv) return ;;
+        vncserver-srv) return ;;
+        vsftpd-ipv6-srv) return ;;
+        vsftpd-srv) return ;;
+        xdm-srv) return ;;
+    esac
+    false
+}
+
+install_cg() {
+    srvname=$(basename "$dir" "$run_file" | sed -e 's/-srv//')
+    install -v -d "${TOPDIR}/$srvname-cg/dependencies.d"
+    for file in "cg"/*; do
+        install -v -m644 "$file" "${TOPDIR}/$srvname-cg"
+        filename=$(basename "$file")
+        sed -i "s/daemon/$srvname/g" "${TOPDIR}/$srvname-cg/$filename"
+        sed -i "s/template/$PKG/g" "${TOPDIR}/$srvname-cg/$filename"
+    done
+    touch "${TOPDIR}/$srvname-cg/dependencies.d/mount-cgroups"
+    echo "oneshot" >> "${TOPDIR}/$srvname-cg/type"
+    if ! echo "$dir" | grep -q "\-log"; then
+        install -v -d "${TOPDIR}/$srvname/contents.d"
+        echo "bundle" >> "${TOPDIR}/$srvname/type"
+        touch ${TOPDIR}/$srvname/contents.d/{$srvname-cg,$srvname-srv}
+        if ! log_blacklist; then
+            touch ${TOPDIR}/$srvname/contents.d/$srvname-log
+        fi
+    fi
+}
+
+install_conf() {
+    install -v -d "${CONFDIR}"
+    # If a config already exists, don't install the generic one.
+    if [ -f "srv/$PKG/$PKG.conf" ]; then
+        install -v -m644 "srv/$PKG/$PKG.conf" "${CONFDIR}/$PKG.conf"
+    else
+        install -v -m644 "conf" "${CONFDIR}/$PKG.conf"
+    fi
+}
+
+install_log() {
+    if log_blacklist; then
+        return
+    fi
+    srvname=$(basename "$dir" | sed 's/-srv//')
+    install -v -d "${TOPDIR}/$srvname-log"
+    install -v -m644 "log/run" "${TOPDIR}/$srvname-log"
+    sed -i "s/daemon/$srvname/g" "${TOPDIR}/$srvname-log/run"
+    sed -i "s/template/$PKG/g" "${TOPDIR}/$srvname-log/run"
+    echo "3" > "${TOPDIR}/$srvname-log/notification-fd"
+    echo "$srvname-srv" > "${TOPDIR}/$srvname-log/consumer-for"
+    echo "longrun" > "${TOPDIR}/$srvname-log/type"
+}
+
+install_srv() {
+    install -v -d "${TOPDIR}/$dirname"
+    for file in "$dir"/*; do
+        install -v -m644 "$file" "${TOPDIR}/$dirname"
+        filename=$(basename "$file")
+        case $filename in
+            run) echo "longrun" > "${TOPDIR}/$dirname/type" ;;
+            up) echo "oneshot" > "${TOPDIR}/$dirname/type" ;;
+        esac
+    done
+    if [ "$dirname" = "$srvname-srv" ] && ! log_blacklist; then
+        if ! cg_dependency_blacklist; then
+            install -v -d "${TOPDIR}/$dirname/dependencies.d"
+            touch "${TOPDIR}/$dirname/dependencies.d/$srvname-cg"
+        fi
+        if ! log_blacklist; then
+            echo "$srvname-log" > "${TOPDIR}/$dirname/producer-for"
+        fi
+    fi
+    # Install any contents.d/dependencies.d files if needed
+    for subdir in "$dir"/*; do
+        if [ -d "$subdir" ]; then
+            subdirname=$(basename "$subdir")
+            if [ "${subdirname}" = "contents.d" ]; then
+                echo "bundle" > "${TOPDIR}/$dirname/type"
+            fi
+            install -v -d "${TOPDIR}/$dirname/$subdirname"
+            for file in "$subdir"/*; do
+                install -v -m644 "$file" "${TOPDIR}/$dirname/$subdirname"
+            done
+        fi
+    done
+    if [ "${TOPDIR}" = "${ADMINSVDIR}" ]; then
+        install -v -d "${FALLBACKSVDIR}/$dirname"
+        cp -ar "${TOPDIR}/$dirname" "${FALLBACKSVDIR}/$dirname"
+    fi
+}
+
 for dir in "srv/$PKG"/*; do
     if [ -d "$dir" ]; then
         dirname=$(basename "$dir")
@@ -17,46 +158,18 @@ for dir in "srv/$PKG"/*; do
         else
             TOPDIR="${SVDIR}"
         fi
-        # Install log if needed
         srv_count=$(find "srv/$PKG" -name "*-srv" -type d | wc -l)
         log_count=$(find "srv/$PKG" -name "*-log" -type d | wc -l)
         if [ "$srv_count" -eq 1 ] && [ "$log_count" -eq 0 ] && echo "$dir" | grep -q "\-srv"; then
-            srvname=$(basename "$dir" | sed 's/-srv//')
+            install_log
-            install -v -d "${TOPDIR}/$srvname-log"
-            for file in "log"/*; do
-                install -v -m644 "$file" "${TOPDIR}/$srvname-log"
-                filename=$(basename "$file")
-                sed -i "s/daemon/$srvname/g" "${TOPDIR}/$srvname-log/$filename"
-                sed -i "s/template/$PKG/g" "${TOPDIR}/$srvname-log/$filename"
-            done
         fi
         if [ -f "srv/$PKG/$PKG.conf" ] || ([ "$srv_count" -gt 0 ] && echo "$dir" | grep -q "\-srv"); then
-            install -v -d "${CONFDIR}"
+            install_conf
-            # If a config already exists, don't install the generic one.
-            if [ -f "srv/$PKG/$PKG.conf" ]; then
-                install -v -m644 "srv/$PKG/$PKG.conf" "${CONFDIR}/$PKG.conf"
-            else
-                install -v -m644 "conf" "${CONFDIR}/$PKG.conf"
         fi
+        run_file=$(find "$dir" -name "run" -type f)
+        if [ -n "$run_file" ] && ! echo "$dir" | grep -q "\-log"; then
+            install_cg
         fi
-        # Install srv
+        install_srv
-        install -v -d "${TOPDIR}/$dirname"
-        for file in "$dir"/*; do
-            install -v -m644 "$file" "${TOPDIR}/$dirname"
-        done
-        if [ "${TOPDIR}" = "${ADMINSVDIR}" ]; then
-            install -v -d "${FALLBACKSVDIR}/$dirname"
-            cp -ar "${TOPDIR}/$dirname" "${FALLBACKSVDIR}/$dirname"
-        fi
-        # Install any dependencies.d files if needed
-        for subdir in "$dir"/*; do
-            if [ -d "$subdir" ]; then
-                subdirname=$(basename "$subdir")
-                install -v -d "${TOPDIR}/$dirname/$subdirname"
-                for file in "$subdir"/*; do
-                    install -v -m644 "$file" "${TOPDIR}/$dirname/$subdirname"
-                done
-            fi
-        done
     fi
 done

log/consumer-for

@@ -1 +0,0 @@
-daemon-srv

log/notification-fd

@@ -1 +0,0 @@
-3

log/pipeline-name

@@ -1 +0,0 @@
-daemon

log/type

@@ -1 +0,0 @@
-longrun

srv/acpid/acpid-srv/producer-for

@@ -1 +0,0 @@
-acpid-log

srv/acpid/acpid-srv/type

@@ -1 +0,0 @@
-longrun

srv/alsa-utils/alsa/type

@@ -1 +0,0 @@
-oneshot

srv/apache/apache-srv/producer-for

@@ -1 +0,0 @@
-apache-log

srv/apache/apache-srv/type

@@ -1 +0,0 @@
-longrun

srv/apcupsd/apcupsd-srv/producer-for

@@ -1 +0,0 @@
-apcupsd-log

srv/apcupsd/apcupsd-srv/type

@@ -1 +0,0 @@
-longrun

srv/apparmor/apparmor/type

@@ -1 +0,0 @@
-oneshot

srv/at/atd-srv/producer-for

@@ -1 +0,0 @@
-atd-log

srv/at/atd-srv/type

@@ -1 +0,0 @@
-longrun

srv/atftp/atftpd-srv/producer-for

@@ -1 +0,0 @@
-atftpd-log

srv/atftp/atftpd-srv/type

@@ -1 +0,0 @@
-longrun

srv/audit/audit.conf

@@ -10,3 +10,35 @@ USE_AUGENRULES=yes
 
 # This configures the directives used for s6-log in the log service.
 DIRECTIVES="n3 s2000000 T"
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#SV_CG_SETTINGS="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#SV_CG_SETTINGS=""
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#SV_CG_SEND_SIGHUP="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#SV_CG_TIMEOUT_STOPSEC="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#SV_CG_SEND_SIGKILL="YES"

srv/audit/auditctl/type

@@ -1 +0,0 @@
-oneshot

srv/audit/auditd-srv/producer-for

@@ -1 +0,0 @@
-auditd-log

srv/audit/auditd-srv/type

@@ -1 +0,0 @@
-longrun

srv/autofs/autofs-srv/producer-for

@@ -1 +0,0 @@
-autofs-log

srv/autofs/autofs-srv/type

@@ -1 +0,0 @@
-longrun

srv/avahi/avahi-daemon-srv/producer-for

@@ -1 +0,0 @@
-avahi-daemon-log

srv/avahi/avahi-daemon-srv/type

@@ -1 +0,0 @@
-longrun

srv/backlight/backlight/type

@@ -1 +0,0 @@
-oneshot

srv/backuppc/backuppc/type

@@ -1 +0,0 @@
-longrun

srv/bftpd/bftpd/type

@@ -1 +0,0 @@
-longrun

srv/bind/named/type

@@ -1 +0,0 @@
-longrun

srv/bitlbee/bitlbee-srv/producer-for

@@ -1 +0,0 @@
-bitlbee-log

srv/bitlbee/bitlbee-srv/type

@@ -1 +0,0 @@
-longrun

srv/bluez/bluetoothd-srv/producer-for

@@ -1 +0,0 @@
-bluetoothd-log

srv/bluez/bluetoothd-srv/type

@@ -1 +0,0 @@
-longrun

srv/boinc/boinc-srv/producer-for

@@ -1 +0,0 @@
-boinc-log

srv/boinc/boinc-srv/type

@@ -1 +0,0 @@
-longrun

srv/bolt/boltd-srv/producer-for

@@ -1 +0,0 @@
-boltd-log

srv/bolt/boltd-srv/type

@@ -1 +0,0 @@
-longrun

srv/brltty/brltty-srv/producer-for

@@ -1 +0,0 @@
-brltty-log

srv/brltty/brltty-srv/type

@@ -1 +0,0 @@
-longrun

srv/bumblebee/bumblebeed-srv/producer-for

@@ -1 +0,0 @@
-bumblebeed-log

srv/bumblebee/bumblebeed-srv/type

@@ -1 +0,0 @@
-longrun

srv/cgmanager/cgmanager/type

@@ -1 +0,0 @@
-longrun

srv/chrony/chronyd-srv/producer-for

@@ -1 +0,0 @@
-chronyd-log

srv/chrony/chronyd-srv/type

@@ -1 +0,0 @@
-longrun

srv/clamav/clamav.conf

@@ -1,3 +1,35 @@
 # This configures the directives used for s6-log in the log service.
 CLAMD_DIRECTIVES="n3 s2000000 T"
 FRESHCLAM_DIRECTIVES="n3 s2000000 T"
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#SV_CG_SETTINGS="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#SV_CG_SETTINGS=""
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#SV_CG_SEND_SIGHUP="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#SV_CG_TIMEOUT_STOPSEC="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#SV_CG_SEND_SIGKILL="YES"

srv/clamav/clamd-log/pipeline-name

@@ -1 +0,0 @@
-clamd

srv/clamav/clamd-log/type

@@ -1 +0,0 @@
-longrun

srv/clamav/clamd-srv/producer-for

@@ -1 +0,0 @@
-clamd-log

srv/clamav/clamd-srv/type

@@ -1 +0,0 @@
-longrun

srv/clamav/freshclam-log/pipeline-name

@@ -1 +0,0 @@
-freshclam

srv/clamav/freshclam-log/type

@@ -1 +0,0 @@
-longrun

srv/clamav/freshclam-srv/producer-for

@@ -1 +0,0 @@
-freshclam-log

srv/clamav/freshclam-srv/type

@@ -1 +0,0 @@
-longrun

srv/colord/colord-session/type

@@ -1 +0,0 @@
-longrun

srv/colord/colord/type

@@ -1 +0,0 @@
-longrun

srv/connman/connman.conf

@@ -3,3 +3,35 @@ OPTS=""
 
 # This configures the directives used for s6-log in the log service.
 DIRECTIVES="n3 s2000000 T"
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#SV_CG_SETTINGS="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#SV_CG_SETTINGS=""
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#SV_CG_SEND_SIGHUP="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#SV_CG_TIMEOUT_STOPSEC="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#SV_CG_SEND_SIGKILL="YES"

srv/connman/connmand-srv/producer-for

@@ -1 +0,0 @@
-connmand-log

srv/connman/connmand-srv/type

@@ -1 +0,0 @@
-longrun

srv/consul/consul-srv/producer-for

@@ -1 +0,0 @@
-consul-log

srv/consul/consul-srv/type

@@ -1 +0,0 @@
-longrun

srv/containerd/containerd-srv/producer-for

@@ -1 +0,0 @@
-containerd-log

srv/containerd/containerd-srv/type

@@ -1 +0,0 @@
-longrun

srv/coturn/coturn-srv/producer-for

@@ -1 +0,0 @@
-coturn-log

srv/coturn/coturn-srv/type

@@ -1 +0,0 @@
-longrun

srv/cpupower/cpupower/type

@@ -1 +0,0 @@
-oneshot

srv/cronie/cronie/type

@@ -1 +0,0 @@
-longrun

srv/cryptsetup/cryptsetup/type

@@ -1 +0,0 @@
-oneshot

srv/cups/cupsd/type

@@ -1 +0,0 @@
-longrun

srv/cyrus-sasl/cyrus-sasl.conf

@@ -3,3 +3,35 @@ AUTH_METHOD="pam"
 
 # This configures the directives used for s6-log in the log service.
 DIRECTIVES="n3 s2000000 T"
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#SV_CG_SETTINGS="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#SV_CG_SETTINGS=""
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#SV_CG_SEND_SIGHUP="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#SV_CG_TIMEOUT_STOPSEC="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#SV_CG_SEND_SIGKILL="YES"

srv/cyrus-sasl/saslauthd-srv/producer-for

@@ -1 +0,0 @@
-saslauthd-log

srv/cyrus-sasl/saslauthd-srv/type

@@ -1 +0,0 @@
-longrun

srv/darkhttpd/darkhttpd-srv/producer-for

@@ -1 +0,0 @@
-darkhttpd-log

srv/darkhttpd/darkhttpd-srv/type

@@ -1 +0,0 @@
-longrun

srv/darkhttpd/darkhttpd.conf

@@ -13,3 +13,35 @@ OPTS=""
 
 # This configures the directives used for s6-log in the log service.
 DIRECTIVES="n3 s2000000 T"
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#SV_CG_SETTINGS="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#SV_CG_SETTINGS=""
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#SV_CG_SEND_SIGHUP="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#SV_CG_TIMEOUT_STOPSEC="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#SV_CG_SEND_SIGKILL="YES"

srv/dbus/dbus-srv/producer-for

@@ -1 +0,0 @@
-dbus-log

srv/dbus/dbus-srv/type

@@ -1 +0,0 @@
-longrun

srv/dbus/dbus.conf

@@ -8,3 +8,35 @@ DBUS_UUIDGEN="no"
 
 # This configures the directives used for s6-log in the log service.
 DIRECTIVES="n3 s2000000 T"
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#SV_CG_SETTINGS="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#SV_CG_SETTINGS=""
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#SV_CG_SEND_SIGHUP="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#SV_CG_TIMEOUT_STOPSEC="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#SV_CG_SEND_SIGKILL="YES"

srv/ddclient/ddclient/type

@@ -1 +0,0 @@
-longrun

srv/deluge/deluge-web-log/pipeline-name

@@ -1 +0,0 @@
-deluge-web

srv/deluge/deluge-web-log/type

@@ -1 +0,0 @@
-longrun

srv/deluge/deluge-web-srv/producer-for

@@ -1 +0,0 @@
-deluge-web-log

srv/deluge/deluge-web-srv/type

@@ -1 +0,0 @@
-longrun

srv/deluge/deluge.conf

@@ -1,3 +1,35 @@
 # This configures the directives used for s6-log in the log service.
 DELUGE_WEB_DIRECTIVES="n3 s2000000 T"
 DELUGED_DIRECTIVES="n3 s2000000 T"
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#SV_CG_SETTINGS="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#SV_CG_SETTINGS=""
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#SV_CG_SEND_SIGHUP="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#SV_CG_TIMEOUT_STOPSEC="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#SV_CG_SEND_SIGKILL="YES"

srv/deluge/deluged-log/pipeline-name

@@ -1 +0,0 @@
-deluged