Merge pull request #137 from shawniverson/123117systemd

mariadb dependency for systemd
MailScanner · Dec 31, 2017 · c49c291 · c49c291
2 parents 089f75c + a25cb9a
commit c49c291
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/changelog b/changelog
@@ -15,6 +15,7 @@
 - Include 2 perl modules for spammassassin from debian tree
 - Support for Fedora 27
 - Fix install.sh modifying clamav-wrapper before MailScanner is installed
+- Add mariadb as a prerequisite service for mailscanner systemd unit
 
 09/29/2017 Changes in    v5.0.6-5
 ==================================

diff --git a/common/usr/lib/MailScanner/systemd/ms-systemd b/common/usr/lib/MailScanner/systemd/ms-systemd
@@ -2,7 +2,8 @@
 Description=LSB: MailScanner daemon
 Documentation=man:systemd-sysv-generator(8)
 SourcePath=/usr/lib/MailScanner/init/ms-init
-After=network-online.target remote-fs.target rsyslog.service
+After=network-online.target remote-fs.target rsyslog.service mariadb.service
+Wants=network-online.target mariadb.service
 
 [Service]
 Type=forking
@@ -14,6 +15,9 @@ GuessMainPID=no
 RemainAfterExit=yes
 ExecStart=/usr/lib/MailScanner/init/ms-init start
 ExecStop=/usr/lib/MailScanner/init/ms-init stop
+EnvironmentFile=-/etc/MailScanner/defaults
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/var/run/MailScanner.pid
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target