[mailman] fix #751581 - changed systemd service file to create error log with proper permissions, changed logr

Jan Kaluža jkaluza at fedoraproject.org
Wed Jan 11 08:28:57 UTC 2012


commit 47c88e86217a467382eae616c4624722452fe374
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Wed Jan 11 09:24:39 2012 +0100

    fix #751581 - changed systemd service file to create error log with proper
    permissions, changed logrotate conf to swifth to proper username/group

 mailman.logrotate |    1 +
 mailman.service   |    3 +++
 mailman.spec      |   14 +++++++++-----
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/mailman.logrotate b/mailman.logrotate
index 4a5c1c4..b06ade3 100644
--- a/mailman.logrotate
+++ b/mailman.logrotate
@@ -1,6 +1,7 @@
 @LOG_DIR@/bounce @LOG_DIR@/digest @LOG_DIR@/error @LOG_DIR@/post @LOG_DIR@/smtp @LOG_DIR@/smtp-failure @LOG_DIR@/qrunner @LOG_DIR@/locks @LOG_DIR@/fromusenet @LOG_DIR@/subscribe @LOG_DIR@/vette {
     missingok
     sharedscripts
+    su root root
     postrotate
         @MMDIR@/bin/mailmanctl reopen >/dev/null 2>&1 || true
     endscript
diff --git a/mailman.service b/mailman.service
index 16700c7..65bb52a 100644
--- a/mailman.service
+++ b/mailman.service
@@ -5,6 +5,9 @@ After=syslog.target network.target
 [Service]
 ExecStartPre=/usr/bin/mailman-update-cfg
 ExecStartPre=/usr/bin/install -m644 -o root -g root /usr/lib/mailman/cron/crontab.in /etc/cron.d/mailman
+ExecStartPre=/bin/touch /var/log/mailman/error
+ExecStartPre=/bin/chown mailman:mailman /var/log/mailman/error
+ExecStartPre=/bin/chmod 660 /var/log/mailman/error
 ExecStart=/usr/lib/mailman/bin/mailmanctl -s start
 ExecReload=/usr/lib/mailman/bin/mailmanctl restart
 ExecStop=/usr/bin/mailman-update-cfg
diff --git a/mailman.spec b/mailman.spec
index 8a9de07..41fb7b0 100644
--- a/mailman.spec
+++ b/mailman.spec
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.14
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 3
 Group: Applications/Internet
 Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -287,9 +287,9 @@ chmod 0644 $RPM_BUILD_ROOT/%{mmdir}/tests/fblast.py
 #chmod 0755 $RPM_BUILD_ROOT/%{mmdir}/pythonlib/korean/c/_koco.so
 
 # Directories...
-#mkdir -p $RPM_BUILD_ROOT/%{lockdir}
+mkdir -p $RPM_BUILD_ROOT/%{lockdir}
 mkdir -p $RPM_BUILD_ROOT/%{logdir}
-#mkdir -p $RPM_BUILD_ROOT/%{piddir}
+mkdir -p $RPM_BUILD_ROOT/%{piddir}
 mkdir -p $RPM_BUILD_ROOT/%{queuedir}
 
 install -p -D %{SOURCE9} %{buildroot}%{_sysconfdir}/tmpfiles.d/mailman.conf
@@ -530,18 +530,22 @@ exit 0
 %dir %attr(2775,root,%{mmgroup}) %{configdir}
 %attr(0644, root, %{mmgroup}) %config(noreplace) %verify(not md5 size mtime) %{configdir}/sitelist.cfg
 %{configdir}/mm_cfg.*
-#%attr(2775,root,%{mmgroup}) %{lockdir}
 %attr(2775,root,%{mmgroup}) %{logdir}
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/mailman.conf
 %attr(2775,root,%{mmgroup}) %{queuedir}
-#%attr(2775,root,%{mmgroup}) %{piddir}
 %attr(0644,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/cron.d/mailman
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
 %attr(0755,root,root) %{_bindir}/mailman-update-cfg
+%dir %attr(2775,root,%{mmgroup}) %{piddir}
+%dir %attr(2775,root,%{mmgroup}) %{lockdir}
 # fix for security issue #459530
 %attr(2770,%{cgiuser},%{mmgroup}) %{archivesdir}/private
 
 %changelog
+* Wed Jan 11 2012 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.14-13
+- fix #751581 - changed systemd service file to create error log with proper
+  permissions, changed logrotate conf to swifth to proper username/group
+
 * Wed Jan 11 2012 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.14-12
 - fix #773188 - fix typo in reset_pw.py causing it to not work
 


More information about the scm-commits mailing list