Unify systemd support

- Move it from debian/ and centos/ - Ensure Debian package installs .service/.socket - Enable socket-activated service - Clean up redundant CentOS config files
skibbipl · Mar 11, 2015 · 7fcaf66 · 7fcaf66
1 parent 2c7f4e1
commit 7fcaf66
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 178 deletions.
diff --git a/centos/sources/logging.conf b/centos/sources/logging.conf
diff --git a/centos/sources/rspamd.service b/centos/sources/rspamd.service
diff --git a/centos/sources/tmpfiles.d b/centos/sources/tmpfiles.d
diff --git a/centos/sources/workers.conf b/centos/sources/workers.conf
diff --git a/debian/rspamd.init b/debian/rspamd.init
diff --git a/debian/rspamd.install b/debian/rspamd.install
diff --git a/debian/rules b/debian/rules
@@ -16,11 +16,13 @@ override_dh_auto_configure:
 		-DEXAMPLESDIR=/usr/share/doc/rspamd/examples \
 		-DLIBDIR=/usr/lib \
 		-DINCLUDEDIR=/usr/include \
+		-DSYSTEMDDIR=/lib/systemd/system \
 		-DNO_SHARED=ON \
 		-DDEBIAN_BUILD=1 \
 		-DINSTALL_EXAMPLES=ON \
 		-DFORCE_GMIME24=ON \
-		-DENABLE_HIREDIS=ON
+		-DENABLE_HIREDIS=ON \
+		-DWANT_SYSTEMD_UNITS=ON
 
 override_dh_auto_clean:
 	dh_auto_clean

diff --git a/linux/rspamd_debian.in b/linux/rspamd_debian.in
diff --git a/rspamd.service b/rspamd.service
@@ -1,14 +1,7 @@
 [Unit]
 Description=rapid spam filtering system
+After=nss-lookup.target
 
 [Service]
-Type=simple
-# Replace Pre/Post with RuntimeDirectory once it is available
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -m700 -p /run/rspamd
-ExecStartPre=/bin/chown _rspamd:_rspamd /run/rspamd
-ExecStart=/usr/bin/rspamd -f -c /etc/rspamd/rspamd.conf
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStopPost=/bin/rm -r /run/rspamd
-WorkingDirectory=/var/lib/rspamd
+ExecStart=/usr/bin/rspamd -c /etc/rspamd/rspamd.conf -f
 User=_rspamd
diff --git a/rspamd.socket b/rspamd.socket
@@ -3,9 +3,6 @@ Description=rapid spam filtering system
 
 [Socket]
 ListenStream=11333
-ListenStream=127.0.0.1:11334
-ListenStream=127.0.0.1:11336
-FreeBind=true
+ListenStream=[::1]:11334
 
-[Install]
-WantedBy=sockets.target
+BindIPv6Only=both