Permalink
Browse files

Merge branch 'master' into openbsd_integration

  • Loading branch information...
2 parents 791e389 + 8dedbca commit 36296995a15c75ee40c083e07dbfe812d814040f @mrash committed May 27, 2012
Showing with 3 additions and 9 deletions.
  1. +1 −3 packaging/psad-nodeps.spec
  2. +1 −3 packaging/psad-require-makemaker.spec
  3. +1 −3 packaging/psad.spec
@@ -100,7 +100,6 @@ install -m 644 nf2csv.1 $RPM_BUILD_ROOT%{_mandir}/man1/
### put the current hostname into the psad C binaries
### (kmsgsd and psadwatchd).
perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psad.conf
-perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psadwatchd.conf
/bin/touch %psadlogdir/fwdata
chown root.root %psadlogdir/fwdata
@@ -119,8 +118,7 @@ chmod 0600 %psadvarlibdir/psadfifo
if grep -q "EMAIL.*root.*localhost" /etc/psad/psad.conf;
then
echo "[+] You can edit the EMAIL_ADDRESSES variable in /etc/psad/psad.conf"
-echo " /etc/psad/psadwatchd.conf to have email alerts sent to an address"
-echo " other than root\@localhost"
+echo " to have email alerts sent to an address other than root\@localhost"
fi
if grep -q "HOME_NET.*CHANGEME" /etc/psad/psad.conf;
@@ -243,7 +243,6 @@ cp -r deps/snort_rules $RPM_BUILD_ROOT%_sysconfdir/%name
### put the current hostname into the psad C binaries
### (kmsgsd and psadwatchd).
perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psad.conf
-perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psadwatchd.conf
/bin/touch %psadlogdir/fwdata
chown root.root %psadlogdir/fwdata
@@ -262,8 +261,7 @@ chmod 0600 %psadvarlibdir/psadfifo
if grep -q "EMAIL.*root.*localhost" /etc/psad/psad.conf;
then
echo "[+] You can edit the EMAIL_ADDRESSES variable in /etc/psad/psad.conf"
-echo " /etc/psad/psadwatchd.conf to have email alerts sent to an address"
-echo " other than root\@localhost"
+echo " to have email alerts sent to an address other than root\@localhost"
fi
if grep -q "HOME_NET.*CHANGEME" /etc/psad/psad.conf;
View
@@ -242,7 +242,6 @@ cp -r deps/snort_rules $RPM_BUILD_ROOT%_sysconfdir/%name
### put the current hostname into the psad C binaries
### (kmsgsd and psadwatchd).
perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psad.conf
-perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psadwatchd.conf
/bin/touch %psadlogdir/fwdata
chown root.root %psadlogdir/fwdata
@@ -261,8 +260,7 @@ chmod 0600 %psadvarlibdir/psadfifo
if grep -q "EMAIL.*root.*localhost" /etc/psad/psad.conf;
then
echo "[+] You can edit the EMAIL_ADDRESSES variable in /etc/psad/psad.conf"
-echo " /etc/psad/psadwatchd.conf to have email alerts sent to an address"
-echo " other than root\@localhost"
+echo " to have email alerts sent to an address other than root\@localhost"
fi
if grep -q "HOME_NET.*CHANGEME" /etc/psad/psad.conf;

0 comments on commit 3629699

Please sign in to comment.