diff -Nur e-smith-packetfilter-2.6.0.old/createlinks e-smith-packetfilter-2.6.0/createlinks --- e-smith-packetfilter-2.6.0.old/createlinks 2021-03-04 16:01:39.921000000 -0500 +++ e-smith-packetfilter-2.6.0/createlinks 2021-03-05 01:25:40.537000000 -0500 @@ -21,18 +21,12 @@ safe_symlink("reload", "root/etc/e-smith/events/$_/services2adjust/masq"); } -my %service2order = -( - # Set up the packet filter rules before bringing up networks. - # But, after the bootstrap-console has had a chance to configure masq - masq => "36", -); +my $event ="e-smith-packetfilter-update"; +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ulogd"); +event_link("systemd-reload", $event, "89"); +event_link("systemd-default", $event, "88"); +templates2events("/etc/logrotate.d/ulogd", $event); -foreach my $service (keys %service2order) -{ -# removed for systemd -# service_link_enhanced($service, $service2order{$service}, 7); -} #systemd foreach my $target (qw(multi-user sme-server)) @@ -41,6 +35,7 @@ foreach my $unit (qw( masq.service + ulogd.service )) { symlink("../$unit", diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ulogd/status e-smith-packetfilter-2.6.0/root/etc/e-smith/db/configuration/defaults/ulogd/status --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ulogd/status 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/etc/e-smith/db/configuration/defaults/ulogd/status 2021-03-04 16:38:38.292000000 -0500 @@ -0,0 +1 @@ +enabled diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ulogd/type e-smith-packetfilter-2.6.0/root/etc/e-smith/db/configuration/defaults/ulogd/type --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ulogd/type 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/etc/e-smith/db/configuration/defaults/ulogd/type 2021-03-04 16:38:26.949000000 -0500 @@ -0,0 +1 @@ +service diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/db/configuration/force/ulogd/status e-smith-packetfilter-2.6.0/root/etc/e-smith/db/configuration/force/ulogd/status --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/db/configuration/force/ulogd/status 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/etc/e-smith/db/configuration/force/ulogd/status 2021-03-04 16:39:04.280000000 -0500 @@ -0,0 +1 @@ +enabled diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/logrotate.d/ulogd/50log e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/ulogd/50log --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/logrotate.d/ulogd/50log 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/ulogd/50log 2021-03-05 01:22:20.009000000 -0500 @@ -0,0 +1,23 @@ +/var/log/ulogd/ulogd.log { + missingok + notifempty + weekly + compress + sharedscripts + postrotate + /usr/bin/systemctl reload ulogd > /dev/null 2>&1 + endscript +} + +/var/log/iptables/*.log { + missingok + notifempty + daily + compress + sharedscripts + postrotate + /usr/bin/systemctl reload ulogd > /dev/null 2>&1 + endscript +} + + diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/10global e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/10global --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/10global 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/10global 2021-03-05 00:42:31.135000000 -0500 @@ -0,0 +1,7 @@ +[global] +nlgroup=1 +logfile=/var/log/ulogd/ulogd.log +loglevel=5 +rmem=131071 +bufsize=150000 + diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/20plugins e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/20plugins --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/20plugins 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/20plugins 2021-03-05 00:46:44.053000000 -0500 @@ -0,0 +1,38 @@ + +###################################################################### +# PLUGIN OPTIONS +###################################################################### +# We have to configure and load all the plugins we want to use +# general rules: +# +# 0. don't specify any plugin for ulogd to load them all +# 1. load the plugins _first_ from the global section +# 2. options for each plugin in seperate section below + +#plugin="/usr/lib64/ulogd/ulogd_inppkt_NFLOG.so" +plugin="/usr/lib64/ulogd/ulogd_inppkt_ULOG.so" +#plugin="/usr/lib64/ulogd/ulogd_inppkt_UNIXSOCK.so" +#plugin="/usr/lib64/ulogd/ulogd_inpflow_NFCT.so" +#plugin="/usr/lib64/ulogd/ulogd_filter_IFINDEX.so" +plugin="/usr/lib64/ulogd/ulogd_filter_IP2STR.so" +#plugin="/usr/lib64/ulogd/ulogd_filter_IP2BIN.so" +#plugin="/usr/lib64/ulogd/ulogd_filter_IP2HBIN.so" +plugin="/usr/lib64/ulogd/ulogd_filter_PRINTPKT.so" +#plugin="/usr/lib64/ulogd/ulogd_filter_HWHDR.so" +#plugin="/usr/lib64/ulogd/ulogd_filter_PRINTFLOW.so" +#plugin="/usr/lib64/ulogd/ulogd_filter_MARK.so" +plugin="/usr/lib64/ulogd/ulogd_output_LOGEMU.so" +#plugin="/usr/lib64/ulogd/ulogd_output_SYSLOG.so" +#plugin="/usr/lib64/ulogd/ulogd_output_XML.so" +#plugin="/usr/lib64/ulogd/ulogd_output_SQLITE3.so" +#plugin="/usr/lib64/ulogd/ulogd_output_GPRINT.so" +#plugin="/usr/lib64/ulogd/ulogd_output_NACCT.so" +#plugin="/usr/lib64/ulogd/ulogd_output_PCAP.so" +#plugin="/usr/lib64/ulogd/ulogd_output_PGSQL.so" +#plugin="/usr/lib64/ulogd/ulogd_output_MYSQL.so" +#plugin="/usr/lib64/ulogd/ulogd_output_DBI.so" +plugin="/usr/lib64/ulogd/ulogd_raw2packet_BASE.so" +#plugin="/usr/lib64/ulogd/ulogd_inpflow_NFACCT.so" +#plugin="/usr/lib64/ulogd/ulogd_output_GRAPHITE.so" +#plugin="/usr/lib64/ulogd/ulogd_output_JSON.so" + diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/30stacks e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/30stacks --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/30stacks 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/30stacks 2021-03-05 00:47:14.410000000 -0500 @@ -0,0 +1,4 @@ + +#our base stack ULOG to LOGEMU +stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU + diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/40configs e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/40configs --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/40configs 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/40configs 2021-03-05 01:29:19.297000000 -0500 @@ -0,0 +1,10 @@ +[ulog1] +# denylog: +# netlink multicast group (the same as the iptables --ulog-nlgroup param) +nlgroup=1 + + +[emu1] +file="/var/log/iptables/denylog.log" +sync=1 + diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/basic e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/basic --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/basic 2008-10-07 13:36:41.000000000 -0400 +++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/basic 1969-12-31 19:00:00.000000000 -0500 @@ -1,12 +0,0 @@ -[global] -nlgroup=1 -logfile=/dev/stdout -loglevel=5 -rmem=131071 -bufsize=150000 -plugin={ -f "/usr/lib64/ulogd/ulogd_BASE.so" ? "/usr/lib64/ulogd/ulogd_BASE.so" : "/usr/lib/ulogd/ulogd_BASE.so" } -plugin={ -f "/usr/lib64/ulogd/ulogd_LOGEMU.so" ? "/usr/lib64/ulogd/ulogd_LOGEMU.so" : "/usr/lib/ulogd/ulogd_LOGEMU.so" } - -[LOGEMU] -file="/dev/stdout" -sync=1 diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/yum/post-actions/ulogd.action e-smith-packetfilter-2.6.0/root/etc/yum/post-actions/ulogd.action --- e-smith-packetfilter-2.6.0.old/root/etc/yum/post-actions/ulogd.action 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/etc/yum/post-actions/ulogd.action 2021-03-05 01:28:09.563000000 -0500 @@ -0,0 +1 @@ +ulogd:any:/sbin/e-smith/expand-template /etc/logrotate.d/ulogd diff -Nur e-smith-packetfilter-2.6.0.old/root/usr/lib/systemd/system/sme-server.target.d/53koozali.conf e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/sme-server.target.d/53koozali.conf --- e-smith-packetfilter-2.6.0.old/root/usr/lib/systemd/system/sme-server.target.d/53koozali.conf 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/sme-server.target.d/53koozali.conf 2021-03-04 16:36:47.274000000 -0500 @@ -0,0 +1,3 @@ +[Unit] +Wants=ulogd.service + diff -Nur e-smith-packetfilter-2.6.0.old/root/usr/lib/systemd/system/ulogd.service e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/ulogd.service --- e-smith-packetfilter-2.6.0.old/root/usr/lib/systemd/system/ulogd.service 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/ulogd.service 2021-03-05 01:59:37.680000000 -0500 @@ -0,0 +1,17 @@ +[Unit] +Description=Netfilter Userspace Logging Daemon +Before=masq.service + +[Service] +User=root +Group=root +Restart=always +TimeoutSec=0 +Type=forking + +PIDFile=/run/ulog/ulogd.pid +ExecStart=/usr/sbin/ulogd --daemon --uid ulog --pidfile /run/ulog/ulogd.pid +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=sme-server.target multi-user.target diff -Nur e-smith-packetfilter-2.6.0.old/root/usr/lib/tmpfiles.d/ulog.conf e-smith-packetfilter-2.6.0/root/usr/lib/tmpfiles.d/ulog.conf --- e-smith-packetfilter-2.6.0.old/root/usr/lib/tmpfiles.d/ulog.conf 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-packetfilter-2.6.0/root/usr/lib/tmpfiles.d/ulog.conf 2021-03-05 02:07:26.178000000 -0500 @@ -0,0 +1 @@ +d /run/ulog 2755 ulog ulog