diff -ruN smeserver-libreswan-0.5.old/createlinks smeserver-libreswan-0.5/createlinks --- smeserver-libreswan-0.5.old/createlinks 2022-07-20 12:14:45.024142349 +0100 +++ smeserver-libreswan-0.5/createlinks 2023-05-24 16:38:18.199353592 +0100 @@ -6,14 +6,27 @@ # our event specific for updating with yum without reboot $event = "smeserver-libreswan-update"; + #add here the path to your templates needed to expand #see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event foreach my $file (qw( - /etc/systemd/system-preset/49-koozali.preset + /etc/systemd/system-preset/49-koozali.preset + /etc/ipsec.conf + /etc/ipsec.secrets + /etc/ipsec.d/ipsec.conf + /etc/ipsec.d/ipsec.secrets + /etc/rc.d/init.d/masq + /etc/sysctl.conf )) { - templates2events( $file, $event ); + templates2events($file, qw( + smeserver-libreswan-update + post-upgrade + console-save + bootstrap-console-save + remoteaccess-update + )); } #action needed in case we have a systemd unit @@ -21,43 +34,17 @@ event_link("systemd-reload", $event, "50"); #action specific to this package -event_link("ipsec-update", $event, "60"); - -#services we need to restart -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ipsec"); - -# ipsec-update -my $event = "ipsec-update"; -foreach (qw( - /etc/ipsec.conf - /etc/ipsec.secrets - /etc/ipsec.d/ipsec.conf - /etc/ipsec.d/ipsec.secrets - /etc/rc.d/init.d/masq - /etc/sysctl.conf - )) +foreach my $event_link (qw ( + smeserver-libreswan-update + remoteaccess-update + console-save +)) { - templates2events("$_", qw( - post-upgrade - console-save - bootstrap-console-save - remoteaccess-update - ipsec-update - )); + event_link("ipsec-update", $event_link, "60"); } -#-------------------------------------------------- -# actions for ipsec-update event -#-------------------------------------------------- - -event_link("ipsec-update", $event, "10"); - -# Runlevel init links. -#service_link_enhanced("ipsec", "S95", "7"); -#service_link_enhanced("ipsec", "K21", "6"); -#service_link_enhanced("ipsec", "K21", "0"); -#service_link_enhanced("ipsec", "K21", "1"); - +#services we need to restart +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ipsec"); safe_symlink("adjust", "root/etc/e-smith/events/$event/services2adjust/masq"); # Set up generic logfile timestamp renaming/symlinking @@ -76,3 +63,6 @@ $event = "logrotate"; safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ipsec"); + + + diff -ruN smeserver-libreswan-0.5.old/root/etc/e-smith/templates/etc/ipsec.conf/10Setup smeserver-libreswan-0.5/root/etc/e-smith/templates/etc/ipsec.conf/10Setup --- smeserver-libreswan-0.5.old/root/etc/e-smith/templates/etc/ipsec.conf/10Setup 2022-07-20 12:14:45.024142349 +0100 +++ smeserver-libreswan-0.5/root/etc/e-smith/templates/etc/ipsec.conf/10Setup 2023-05-24 16:28:44.595406873 +0100 @@ -32,7 +32,7 @@ $OUT .= " protostack=netkey\n"; $OUT .= " plutodebug=$debugstatus\n"; $OUT .= " #klipsdebug=none\n"; - $OUT .= " plutostderrlog=/var/log/pluto/pluto.log\n"; + $OUT .= " log=/var/log/pluto/pluto.log\n"; $OUT .= " dumpdir=/var/run/pluto/\n"; if ( $keepalive ne '' ) { diff -ruN smeserver-libreswan-0.5.old/root/etc/e-smith/templates/etc/ipsec.d/ipsec.conf/10Connection smeserver-libreswan-0.5/root/etc/e-smith/templates/etc/ipsec.d/ipsec.conf/10Connection --- smeserver-libreswan-0.5.old/root/etc/e-smith/templates/etc/ipsec.d/ipsec.conf/10Connection 2022-07-20 12:14:45.024142349 +0100 +++ smeserver-libreswan-0.5/root/etc/e-smith/templates/etc/ipsec.d/ipsec.conf/10Connection 2023-05-24 16:28:44.595406873 +0100 @@ -256,7 +256,7 @@ } my $reauth = $ipsecDB->get_prop( $ipsecprop, 'reauth' ) || ''; - if ( $reauth eq 'y' || $reauth eq '1' ) { + if ( $reauth eq 'y' || $reauth eq 'yes' || $reauth eq '1' ) { $OUT .= " reauth=yes\n"; } } # End if ( $ipsecstatus eq 'enabled' )