diff -urN smeserver-openvpn-bridge-2.1.old/createlinks smeserver-openvpn-bridge-2.1/createlinks --- smeserver-openvpn-bridge-2.1.old/createlinks 2021-02-08 10:00:30.142202494 +0000 +++ smeserver-openvpn-bridge-2.1/createlinks 2021-02-08 15:59:14.489481691 +0000 @@ -6,12 +6,12 @@ safe_symlink("restart", "root/etc/e-smith/events/network-create/services2adjust/openvpn-bridge"); safe_symlink("restart", "root/etc/e-smith/events/network-delete/services2adjust/openvpn-bridge"); -service_link_enhanced("openvpn-bridge", "S80", "7"); -service_link_enhanced("openvpn-bridge", "K25", "6"); -service_link_enhanced("openvpn-bridge", "K25", "0"); +#service_link_enhanced("openvpn-bridge", "S80", "7"); +#service_link_enhanced("openvpn-bridge", "K25", "6"); +#service_link_enhanced("openvpn-bridge", "K25", "0"); -safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/openvpn-bridge'); +#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/openvpn-bridge'); safe_symlink("/var/service/openvpn-bridge" , 'root/service/openvpn-bridge'); safe_touch("root/var/service/openvpn-bridge/down"); @@ -28,3 +28,28 @@ event_link("openvpn-bridge-update-crl", "openvpn-bridge-update", "30"); event_link("openvpn-bridge-reload-ccd", "openvpn-bridge-reload-ccd", "20"); event_link("openvpn-bridge-update-crl", "openvpn-bridge-reload-ccd", "30"); + +# our event specific for updating with yum without reboot +$event = "smeserver-openvpn-bridge-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/crontab + /etc/openvpn/bridge/management-pass.txt + /etc/openvpn/bridge/openvpn.conf + +)) +{ + templates2events( $file, $event ); +} + +#action needed in case we have a systemd unit +event_link("systemd-default", $event, "10"); +event_link("systemd-reload", $event, "50"); + +#action specific to this package +event_link("openvpn-bridge-update", $event, "60"); +#services we need to restart +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/openvpn-bridge"); diff -urN smeserver-openvpn-bridge-2.1.old/root/usr/lib/systemd/system/openvpn-bridge.service smeserver-openvpn-bridge-2.1/root/usr/lib/systemd/system/openvpn-bridge.service --- smeserver-openvpn-bridge-2.1.old/root/usr/lib/systemd/system/openvpn-bridge.service 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-openvpn-bridge-2.1/root/usr/lib/systemd/system/openvpn-bridge.service 2021-02-08 16:01:59.796681570 +0000 @@ -0,0 +1,9 @@ +[Unit] +Description=OpenVPN Server to Server +After=network.service +[Service] +Type=forking +ExecStart=/usr/sbin/systemd/openvpn-bridge +[Install] +WantedBy=sme-server.target + diff -urN smeserver-openvpn-bridge-2.1.old/root/usr/sbin/systemd/openvpn-bridge smeserver-openvpn-bridge-2.1/root/usr/sbin/systemd/openvpn-bridge --- smeserver-openvpn-bridge-2.1.old/root/usr/sbin/systemd/openvpn-bridge 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-openvpn-bridge-2.1/root/usr/sbin/systemd/openvpn-bridge 2021-02-13 14:24:39.487170316 +0000 @@ -0,0 +1,5 @@ +#!/bin/sh + +exec 2>&1 + +exec /usr/sbin/openvpn --config /etc/openvpn/bridge/openvpn.conf --cd /etc/openvpn/bridge