examples: consolidate systemd socket examples

systemd.socket(5) files can actually contain multiple listen
sockets, so shave down inode overhead and simplify config
file management by consolidating all applicable ports into
a single file for each daemon.

diff --git a/MANIFEST b/MANIFEST
index 196b9627f796c2ab026ec5f34634fdc60dde47b3..9900b77653c583f02f72e6c5b9783c18e3e1fb14 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -134,13 +134,10 @@ examples/nginx_proxy
 examples/public-inbox-config
 examples/public-inbox-httpd.socket
 examples/public-inbox-httpd@.service
 examples/public-inbox-config
 examples/public-inbox-httpd.socket
 examples/public-inbox-httpd@.service

-examples/public-inbox-imap-onion.socket

 examples/public-inbox-imapd.socket
 examples/public-inbox-imapd@.service
 examples/public-inbox-imapd.socket
 examples/public-inbox-imapd@.service

-examples/public-inbox-imaps.socket

 examples/public-inbox-nntpd.socket
 examples/public-inbox-nntpd@.service
 examples/public-inbox-nntpd.socket
 examples/public-inbox-nntpd@.service

-examples/public-inbox-nntps.socket

 examples/public-inbox-watch.service
 examples/public-inbox.psgi
 examples/unsubscribe-milter.socket
 examples/public-inbox-watch.service
 examples/public-inbox.psgi
 examples/unsubscribe-milter.socket

diff --git a/examples/public-inbox-imap-onion.socket b/examples/public-inbox-imap-onion.socket
deleted file mode 100644 (file)
index 76b4e7c..0000000
--- a/examples/public-inbox-imap-onion.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-# ==> /etc/systemd/system/public-inbox-imap-onion.socket <==
-# This unit is for the corresponding line in torrc(5):
-# HiddenServicePort 143 unix:/run/imapd.onion.sock
-[Unit]
-Description = public-inbox-imap .onion socket
-
-[Socket]
-ListenStream = /run/imapd.onion.sock
-Service = public-inbox-imapd@1.service
-
-[Install]
-WantedBy = sockets.target

diff --git a/examples/public-inbox-imapd.socket b/examples/public-inbox-imapd.socket
index fcd924fd2ad02b2483f82a1065549be15f9d5dc8..c3c55ea1aedfd15a7547f0d0fd0d6b296fd47ef3 100644 (file)
--- a/examples/public-inbox-imapd.socket
+++ b/examples/public-inbox-imapd.socket
@@ -1,11 +1,23 @@
 # ==> /etc/systemd/system/public-inbox-imapd.socket <==
 # ==> /etc/systemd/system/public-inbox-imapd.socket <==

+# This contains 5 sockets for an public-inbox-imapd instance.
+# The TCP ports are well-known ports registered in /etc/services.
+# The /run/imapd.onion.sock entry is meant for the Tor hidden service
+# enabled by the following line in the torrc(5) file:
+#   HiddenServicePort 143 unix:/run/imapd.onion.sock

 [Unit]
 [Unit]

-Description = public-inbox-imapd socket
+Description = public-inbox-imapd sockets

 
 [Socket]
 ListenStream = 0.0.0.0:143
 
 [Socket]
 ListenStream = 0.0.0.0:143

+ListenStream = 0.0.0.0:993
+ListenStream = /run/imapd.onion.sock
+
+# Separating IPv4 from IPv6 listeners makes for nicer output
+# of IPv4 addresses in various reporting/monitoring tools

 BindIPv6Only = ipv6-only
 ListenStream = [::]:143
 BindIPv6Only = ipv6-only
 ListenStream = [::]:143

+ListenStream = [::]:993
+

 Service = public-inbox-imapd@1.service
 
 [Install]
 Service = public-inbox-imapd@1.service
 
 [Install]

diff --git a/examples/public-inbox-imapd@.service b/examples/public-inbox-imapd@.service
index e0446ed33f2367496dac1e035bf230330f3b288c..f7428d85366a16d0443aadec27aeda955c784e41 100644 (file)
--- a/examples/public-inbox-imapd@.service
+++ b/examples/public-inbox-imapd@.service
@@ -7,10 +7,8 @@
 
 [Unit]
 Description = public-inbox-imapd IMAP server %i
 
 [Unit]
 Description = public-inbox-imapd IMAP server %i

-Wants = public-inbox-imapd.socket public-inbox-imaps.socket \
-public-inbox-imap-onion.socket
-After = public-inbox-imapd.socket public-inbox-imaps.socket \
-public-inbox-imap-onion.socket
+Wants = public-inbox-imapd.socket
+After = public-inbox-imapd.socket

 
 [Service]
 Environment = PI_CONFIG=/home/pi/.public-inbox/config \
 
 [Service]
 Environment = PI_CONFIG=/home/pi/.public-inbox/config \


@@ -29,8 +27,7 @@ StandardError = syslog
 # simultaneous services
 NonBlocking = true
 
 # simultaneous services
 NonBlocking = true
 

-Sockets = public-inbox-imapd.socket public-inbox-imaps.socket \
-public-inbox-imap-onion.socket
+Sockets = public-inbox-imapd.socket

 
 KillSignal = SIGQUIT
 User = nobody
 
 KillSignal = SIGQUIT
 User = nobody

diff --git a/examples/public-inbox-imaps.socket b/examples/public-inbox-imaps.socket
deleted file mode 100644 (file)
index b61cc74..0000000
--- a/examples/public-inbox-imaps.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-# ==> /etc/systemd/system/public-inbox-imaps.socket <==
-[Unit]
-Description = public-inbox-imaps socket
-
-[Socket]
-ListenStream = 0.0.0.0:993
-BindIPv6Only = ipv6-only
-ListenStream = [::]:993
-Service = public-inbox-imapd@1.service
-
-[Install]
-WantedBy = sockets.target

diff --git a/examples/public-inbox-nntpd.socket b/examples/public-inbox-nntpd.socket
index eeddf34336a871ec44ad82dfbd843c3893bb1f28..0a3ccb2fb827ec4276b6cc0c2a84b16c73714cfc 100644 (file)
--- a/examples/public-inbox-nntpd.socket
+++ b/examples/public-inbox-nntpd.socket
@@ -1,9 +1,23 @@
 # ==> /etc/systemd/system/public-inbox-nntpd.socket <==
 # ==> /etc/systemd/system/public-inbox-nntpd.socket <==

+# This contains 5 sockets for an public-inbox-nntpd instance.
+# The TCP ports are well-known ports registered in /etc/services.
+# The /run/nntpd.onion.sock entry is meant for the Tor hidden service
+# enabled by the following line in the torrc(5) file:
+#   HiddenServicePort 119 unix:/run/nntpd.onion.sock

 [Unit]
 [Unit]

-Description = public-inbox-nntpd socket
+Description = public-inbox-nntpd sockets

 
 [Socket]
 
 [Socket]

-ListenStream = 119
+ListenStream = 0.0.0.0:119
+ListenStream = 0.0.0.0:563
+ListenStream = /run/nntpd.onion.sock
+
+# Separating IPv4 from IPv6 listeners makes for nicer output
+# of IPv4 addresses in various reporting/monitoring tools
+BindIPv6Only = ipv6-only
+ListenStream = [::]:119
+ListenStream = [::]:563
+

 Service = public-inbox-nntpd@1.service
 
 [Install]
 Service = public-inbox-nntpd@1.service
 
 [Install]

diff --git a/examples/public-inbox-nntpd@.service b/examples/public-inbox-nntpd@.service
index 4dd2f5d7a8862d0abc6809527bef80825d50bf32..d6aea067a05e3852a296fc5596e256ec67571e60 100644 (file)
--- a/examples/public-inbox-nntpd@.service
+++ b/examples/public-inbox-nntpd@.service
@@ -7,8 +7,8 @@
 
 [Unit]
 Description = public-inbox NNTP server %i
 
 [Unit]
 Description = public-inbox NNTP server %i

-Wants = public-inbox-nntpd.socket public-inbox-nntps.socket
-After = public-inbox-nntpd.socket public-inbox-nntps.socket
+Wants = public-inbox-nntpd.socket
+After = public-inbox-nntpd.socket

 
 [Service]
 Environment = PI_CONFIG=/home/pi/.public-inbox/config \
 
 [Service]
 Environment = PI_CONFIG=/home/pi/.public-inbox/config \


@@ -27,7 +27,7 @@ StandardError = syslog
 # simultaneous services
 NonBlocking = true
 
 # simultaneous services
 NonBlocking = true
 

-Sockets = public-inbox-nntpd.socket public-inbox-nntps.socket
+Sockets = public-inbox-nntpd.socket

 
 KillSignal = SIGQUIT
 User = nobody
 
 KillSignal = SIGQUIT
 User = nobody

diff --git a/examples/public-inbox-nntps.socket b/examples/public-inbox-nntps.socket
deleted file mode 100644 (file)
index fa67819..0000000
--- a/examples/public-inbox-nntps.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-# ==> /etc/systemd/system/public-inbox-nntps.socket <==
-[Unit]
-Description = public-inbox-nntps socket
-
-[Socket]
-ListenStream = 0.0.0.0:563
-BindIPv6Only = ipv6-only
-ListenStream = [::]:563
-Service = public-inbox-nntpd@1.service
-
-[Install]
-WantedBy = sockets.target