1 |
diff -Nur e-smith-packetfilter-2.6.0.old/createlinks e-smith-packetfilter-2.6.0/createlinks |
diff -Nur e-smith-packetfilter-2.6.0.old/createlinks e-smith-packetfilter-2.6.0/createlinks |
2 |
--- e-smith-packetfilter-2.6.0.old/createlinks 2021-03-04 16:01:39.921000000 -0500 |
--- e-smith-packetfilter-2.6.0.old/createlinks 2021-03-04 16:01:39.921000000 -0500 |
3 |
+++ e-smith-packetfilter-2.6.0/createlinks 2021-03-04 16:41:51.234000000 -0500 |
+++ e-smith-packetfilter-2.6.0/createlinks 2021-03-04 16:52:55.378000000 -0500 |
4 |
@@ -21,18 +21,8 @@ |
@@ -21,18 +21,10 @@ |
5 |
safe_symlink("reload", "root/etc/e-smith/events/$_/services2adjust/masq"); |
safe_symlink("reload", "root/etc/e-smith/events/$_/services2adjust/masq"); |
6 |
} |
} |
7 |
|
|
11 |
- # But, after the bootstrap-console has had a chance to configure masq |
- # But, after the bootstrap-console has had a chance to configure masq |
12 |
- masq => "36", |
- masq => "36", |
13 |
-); |
-); |
14 |
+ safe_symlink("restart", "root/etc/e-smith/events/e-smith-packetfilter-update/services2adjust/ulogd"); |
- |
|
|
|
15 |
-foreach my $service (keys %service2order) |
-foreach my $service (keys %service2order) |
16 |
-{ |
-{ |
17 |
-# removed for systemd |
-# removed for systemd |
18 |
-# service_link_enhanced($service, $service2order{$service}, 7); |
-# service_link_enhanced($service, $service2order{$service}, 7); |
19 |
-} |
-} |
20 |
|
+my $event ="e-smith-packetfilter-update"; |
21 |
|
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ulogd"); |
22 |
|
+event_link("systemd-reload", $event, "89"); |
23 |
|
+event_link("systemd-default", $event, "88"); |
24 |
|
|
25 |
#systemd |
#systemd |
26 |
foreach my $target (qw(multi-user sme-server)) |
foreach my $target (qw(multi-user sme-server)) |
27 |
@@ -41,6 +31,7 @@ |
@@ -41,6 +33,7 @@ |
28 |
|
|
29 |
foreach my $unit (qw( |
foreach my $unit (qw( |
30 |
masq.service |
masq.service |
49 |
+enabled |
+enabled |
50 |
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 |
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 |
51 |
--- 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.old/root/etc/e-smith/templates/etc/ulogd.conf/basic 2008-10-07 13:36:41.000000000 -0400 |
52 |
+++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/basic 2021-03-04 16:34:43.379000000 -0500 |
+++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/basic 2021-03-05 00:12:05.938000000 -0500 |
53 |
@@ -1,12 +1,125 @@ |
@@ -1,12 +1,125 @@ |
54 |
[global] |
[global] |
55 |
nlgroup=1 |
nlgroup=1 |
176 |
+} |
+} |
177 |
[LOGEMU] |
[LOGEMU] |
178 |
-file="/dev/stdout" |
-file="/dev/stdout" |
179 |
+file="/var/log/ulogd/ulogd.syslogemu" |
+file="/var/log/iptables/ulogd.syslogemu" |
180 |
sync=1 |
sync=1 |
181 |
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 |
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 |
182 |
--- 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.old/root/usr/lib/systemd/system/sme-server.target.d/53koozali.conf 1969-12-31 19:00:00.000000000 -0500 |
187 |
+ |
+ |
188 |
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 |
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 |
189 |
--- 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.old/root/usr/lib/systemd/system/ulogd.service 1969-12-31 19:00:00.000000000 -0500 |
190 |
+++ e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/ulogd.service 2021-03-04 16:14:51.769000000 -0500 |
+++ e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/ulogd.service 2021-03-04 23:58:38.429000000 -0500 |
191 |
@@ -0,0 +1,11 @@ |
@@ -0,0 +1,18 @@ |
192 |
+[Unit] |
+[Unit] |
193 |
+Description=Netfilter Userspace Logging Daemon |
+Description=Netfilter Userspace Logging Daemon |
194 |
+Before=masq.service |
+Before=masq.service |
195 |
+ |
+ |
196 |
+[Service] |
+[Service] |
197 |
|
+User=root |
198 |
|
+Group=root |
199 |
|
+Restart=always |
200 |
|
+TimeoutSec=0 |
201 |
+Type=forking |
+Type=forking |
202 |
|
+ |
203 |
+PIDFile=/run/ulog/ulogd.pid |
+PIDFile=/run/ulog/ulogd.pid |
204 |
+ExecStart=/usr/sbin/ulogd --daemon --uid ulog --pidfile /run/ulog/ulogd.pid |
+#ExecStart=/usr/sbin/ulogd --daemon --uid ulog --pidfile /run/ulog/ulogd.pid |
205 |
|
+ExecStart=/usr/sbin/ulogd --daemon --pidfile /run/ulog/ulogd.pid |
206 |
|
+#ExecStart=/usr/sbin/ulogd --daemon |
207 |
+ |
+ |
208 |
+[Install] |
+[Install] |
209 |
+WantedBy=sme-server.target multi-user.target |
+WantedBy=sme-server.target multi-user.target |