examples: minimize differences for systemd examples

Our nntpd and httpd are similar so configuration differences
should be minimized

diff --git a/examples/public-inbox-httpd.socket b/examples/public-inbox-httpd.socket
index da37aec9718c6e0170ea607c2989a7218d72896b..1a1ed7357e0d92fd3fc9e441112ea7ec08ac49ca 100644 (file)
--- a/examples/public-inbox-httpd.socket
+++ b/examples/public-inbox-httpd.socket
@@ -3,7 +3,7 @@
 Description = public-inbox-httpd socket
 
 [Socket]
 Description = public-inbox-httpd socket
 
 [Socket]

-ListenStream = 127.0.0.1:280
+ListenStream = 80

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

diff --git a/examples/public-inbox-httpd@.service b/examples/public-inbox-httpd@.service
index 4efea2ad0bae51dcbabefacdaf4238374b454f61..56117ef09368405ac21683d62b33d14edfda0c63 100644 (file)
--- a/examples/public-inbox-httpd@.service
+++ b/examples/public-inbox-httpd@.service
@@ -17,7 +17,9 @@ PERL_INLINE_DIRECTORY=/tmp/.pub-inline
 
 LimitNOFILE = 30000
 ExecStartPre = /bin/mkdir -p -m 1777 /tmp/.pub-inline
 
 LimitNOFILE = 30000
 ExecStartPre = /bin/mkdir -p -m 1777 /tmp/.pub-inline

-ExecStart = /usr/local/bin/public-inbox-httpd
+ExecStart = /usr/local/bin/public-inbox-httpd \
+-1 /var/log/public-inbox/httpd.out.log
+StandardError = syslog

 Sockets = public-inbox-httpd.socket
 KillSignal = SIGQUIT
 User = nobody
 Sockets = public-inbox-httpd.socket
 KillSignal = SIGQUIT
 User = nobody

diff --git a/examples/public-inbox-nntpd@.service b/examples/public-inbox-nntpd@.service
index bdd97341d0b705d06c9ec9aab480fd4f2cb114a4..62202c2fa54e18a9f11da0fe0540f2c904a23864 100644 (file)
--- a/examples/public-inbox-nntpd@.service
+++ b/examples/public-inbox-nntpd@.service
@@ -18,8 +18,8 @@ PERL_INLINE_DIRECTORY=/tmp/.pub-inline
 LimitNOFILE = 30000
 ExecStartPre = /bin/mkdir -p -m 1777 /tmp/.pub-inline
 ExecStart = /usr/local/bin/public-inbox-nntpd \
 LimitNOFILE = 30000
 ExecStartPre = /bin/mkdir -p -m 1777 /tmp/.pub-inline
 ExecStart = /usr/local/bin/public-inbox-nntpd \

--1 /var/log/public-inbox/nntpd.out.log \
--2 /var/log/public-inbox/nntpd.err.log
+-1 /var/log/public-inbox/nntpd.out.log
+StandardError = syslog

 Sockets = public-inbox-nntpd.socket
 KillSignal = SIGQUIT
 User = nobody
 Sockets = public-inbox-nntpd.socket
 KillSignal = SIGQUIT
 User = nobody