From 4da6b9c320e6b49d38af5cb6b5861480141f24cd Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 6 Oct 2015 16:23:19 +0000 Subject: - add -s support to s6-svscan - change examples to support -s - change examples to invoke s6-rc, remove servicedirs --- examples/ROOT/img/services-network/sshd/README | 5 ----- examples/ROOT/img/services-network/sshd/log/README | 1 - examples/ROOT/img/services-network/sshd/log/run | 4 ---- examples/ROOT/img/services-network/sshd/notification-fd | 1 - examples/ROOT/img/services-network/sshd/rules/ip4/0.0.0.0_0/deny | 0 .../ROOT/img/services-network/sshd/rules/ip4/127.0.0.1_32/allow | 0 examples/ROOT/img/services-network/sshd/run | 6 ------ 7 files changed, 17 deletions(-) delete mode 100644 examples/ROOT/img/services-network/sshd/README delete mode 100644 examples/ROOT/img/services-network/sshd/log/README delete mode 100755 examples/ROOT/img/services-network/sshd/log/run delete mode 100644 examples/ROOT/img/services-network/sshd/notification-fd delete mode 100644 examples/ROOT/img/services-network/sshd/rules/ip4/0.0.0.0_0/deny delete mode 100644 examples/ROOT/img/services-network/sshd/rules/ip4/127.0.0.1_32/allow delete mode 100755 examples/ROOT/img/services-network/sshd/run (limited to 'examples/ROOT/img/services-network/sshd') diff --git a/examples/ROOT/img/services-network/sshd/README b/examples/ROOT/img/services-network/sshd/README deleted file mode 100644 index 2d55a5e..0000000 --- a/examples/ROOT/img/services-network/sshd/README +++ /dev/null @@ -1,5 +0,0 @@ -Service directory for a sshd server over IPv4, -implemented via s6-networking and dropbear. -The rules subdirectory implements access control; in -this example, only 127.0.0.1 is allowed to connect -(which isn't exactly useful for a SSH server). diff --git a/examples/ROOT/img/services-network/sshd/log/README b/examples/ROOT/img/services-network/sshd/log/README deleted file mode 100644 index 392ede8..0000000 --- a/examples/ROOT/img/services-network/sshd/log/README +++ /dev/null @@ -1 +0,0 @@ -Logging service for sshd. diff --git a/examples/ROOT/img/services-network/sshd/log/run b/examples/ROOT/img/services-network/sshd/log/run deleted file mode 100755 index d07f180..0000000 --- a/examples/ROOT/img/services-network/sshd/log/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/command/execlineb -P -s6-setuidgid log -exec -c -s6-log t s1000000 n20 /var/log/sshd diff --git a/examples/ROOT/img/services-network/sshd/notification-fd b/examples/ROOT/img/services-network/sshd/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/examples/ROOT/img/services-network/sshd/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/examples/ROOT/img/services-network/sshd/rules/ip4/0.0.0.0_0/deny b/examples/ROOT/img/services-network/sshd/rules/ip4/0.0.0.0_0/deny deleted file mode 100644 index e69de29..0000000 diff --git a/examples/ROOT/img/services-network/sshd/rules/ip4/127.0.0.1_32/allow b/examples/ROOT/img/services-network/sshd/rules/ip4/127.0.0.1_32/allow deleted file mode 100644 index e69de29..0000000 diff --git a/examples/ROOT/img/services-network/sshd/run b/examples/ROOT/img/services-network/sshd/run deleted file mode 100755 index 3a35a11..0000000 --- a/examples/ROOT/img/services-network/sshd/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/command/execlineb -P -fdmove -c 2 1 -fdmove 1 3 -s6-tcpserver4 -1 -- 0.0.0.0 22 -s6-tcpserver-access -vvDRl0 -t 5000 -i rules -dropbear -iEg -- cgit v1.3.1