Mercurial > syslog2iptables

changeset 73:4685767c0c85 stable-1-0-17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
RHEL7 systemd and /var/run on tmpfs
author Carl Byington <carl@five-ten-sg.com>
date Thu, 09 Feb 2017 15:01:05 -0800
parents ea7b7a0d0039
children 5ae085b398f4
files Makefile.am syslog2iptables.spec.in
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Thu Feb 09 12:58:21 2017 -0800
+++ b/Makefile.am	Thu Feb 09 15:01:05 2017 -0800
@@ -15,7 +15,7 @@
 		   sed -e "s,SYSCONFDIR,$(sysconfdir),g" >>syslog2iptables
 
 syslog2iptables.service: syslog2iptables.service.rc
-	   cat syslog2iptables.rc	  | \
+	   cat syslog2iptables.service.rc	  | \
 		   sed -e "s,SBINDIR,$(sbindir),g"	| \
 		   sed -e "s,SYSCONFDIR,$(sysconfdir),g" >>syslog2iptables.service
 
--- a/syslog2iptables.spec.in	Thu Feb 09 12:58:21 2017 -0800
+++ b/syslog2iptables.spec.in	Thu Feb 09 15:01:05 2017 -0800
@@ -12,16 +12,14 @@
 
 Requires(post,preun):   /sbin/chkconfig
 Requires(post,preun):   /sbin/service
-Requires:               iptables
-Requires:               coreutils
+Requires:               iptables, coreutils
 BuildRequires:          gcc gcc-c++
 %if "%{?dist}" == ".el7"
 Requires(pre):  systemd-sysv, shadow-utils
 Requires(post): systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
-Requires:       coreutils
-Requires:       systemd-units
+Requires:       rsyslog, systemd-units
 BuildRequires:  systemd-units
 %endif
 
@@ -85,6 +83,7 @@
 %postun
 if [ $1 -ge 1 ]; then
     # package upgrade, not uninstall
+    (cd %{_sysconfdir}; ./%{name}.conf.make)
 %if "%{?dist}" == ".el7"
     /bin/systemctl try-restart %{name}.service &>/dev/null || :
 %else