MailScanner/v5
1
1
Fork 0
mirror of https://github.com/MailScanner/v5.git synced 2024-09-20 23:36:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #68 from shawniverson/detectsystemd

Browse source 
Better systemd detection
This commit is contained in:
Shawn Iverson 2017-07-24 18:01:07 -04:00 committed by GitHub
parent d6fbd99d32 5af8eb0c09
commit def0800696
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/DEBIAN/postinst vendored
View file

@ -148,7 +148,7 @@ if [ -f '/lib/systemd/system/mailscanner.service' ]; then
fi
# Check for systemd
if [ -d '/usr/lib/systemd' ]; then
if [ -f '/lib/systemd/systemd' -o -f '/usr/lib/systemd/systemd' ]; then
cp /usr/lib/MailScanner/systemd/ms-systemd /lib/systemd/system/mailscanner.service
# add symlink to init script
elif [ ! -L '/etc/init.d/mailscanner' ]; then
@ -269,7 +269,7 @@ if [ -f '/etc/clamav/clamd.conf' ]; then
sed -i "s/${CAVOLD}/${CAVNEW}/g" /etc/clamav/clamd.conf
fi
if [ -d '/usr/lib/systemd' ]; then
if [ -f '/lib/systemd/systemd' -o -f '/usr/lib/systemd/systemd' ]; then
systemctl enable mailscanner.service
else
update-rc.d mailscanner defaults 80 80

7
rhel/mailscanner.spec
View file

@ -525,7 +525,7 @@ if [ -d '/usr/share/MailScanner/reports' -a ! -L '/etc/MailScanner/reports' ]; t
fi
# RHEL/CentOS7/Fedora >14
if [ -d '/usr/lib/systemd' ]; then
if [ -f '/lib/systemd/systemd' -o -f '/usr/lib/systemd/systemd' ]; then
# copy in systemd wrapper and sendmail services
if [ -d '/usr/lib/systemd/system' -a ! -e '/usr/lib/systemd/system/mailscanner' -a -f '/usr/lib/MailScanner/systemd/ms-systemd' ]; then
cp /usr/lib/MailScanner/systemd/ms-systemd /usr/lib/systemd/system/mailscanner.service
@ -589,7 +589,7 @@ exit 0
%preun
if [ $1 = 0 ]; then
# We are being deleted, not upgraded
if [ -d '/usr/lib/systemd' ]; then
if [ -f '/lib/systemd/systemd' -o -f '/usr/lib/systemd/systemd' ]; then
systemctl stop mailscanner.service >/dev/null 2>&1
systemctl disable mailscanner.service
rm -f /usr/lib/systemd/system/mailscanner.service
@ -1171,6 +1171,9 @@ exit 0
%changelog
* Mon Jul 24 2017 Shawn Iverson <shawniverson@gmail.com>
- Better detection of systemd
* Wed May 3 2017 Shawn Iverson <shawniverson@gmail.com>
- Add RHEL/CentOS 7 systemd support for mailscanner and sendmail

5
suse/mailscanner.spec
View file

@ -509,7 +509,7 @@ if [ -d '/usr/share/MailScanner/reports' -a ! -L '/etc/MailScanner/reports' ]; t
fi
# Check for systemd
if [ -d '/usr/lib/systemd' -a -f '/usr/lib/MailScanner/systemd/ms-systemd' ]; then
if [ -f '/lib/systemd/systemd' -o -f '/usr/lib/systemd/systemd' ]; then
cp /usr/lib/MailScanner/systemd/ms-systemd /usr/lib/systemd/system/mailscanner.service
# create init.d symlink
elif [ -d '/etc/init.d' -a ! -L '/etc/init.d/mailscanner' -a -f '/usr/lib/MailScanner/init/ms-init' ]; then
@ -1104,6 +1104,9 @@ exit 0
%changelog
* Mon Jul 24 2017 Shawn Iverson <shawniverson@gmail.com>
- Better detection of systemd
* Sun May 28 2017 Shawn Iverson <shawniverson@gmail.com>
- mailscanner systemd support for SuSE Linux