diff -urN smeserver-BackupPC-0.2.old/createlinks smeserver-BackupPC-0.2/createlinks --- smeserver-BackupPC-0.2.old/createlinks 2013-11-12 18:07:16.000000000 +0000 +++ smeserver-BackupPC-0.2/createlinks 2021-01-26 11:58:07.025890602 +0000 @@ -2,20 +2,20 @@ use esmith::Build::CreateLinks qw(:all); -# Start and stop links +# Start and stop links - SME9 -service_link_enhanced("backuppc", "S98", "7"); -service_link_enhanced("backuppc", "K10", "6"); -service_link_enhanced("backuppc", "K10", "0"); -service_link_enhanced("backuppc", "K10", "1"); - -service_link_enhanced("httpd-bkpc", "S86", "7"); -service_link_enhanced("httpd-bkpc", "K15", "6"); -service_link_enhanced("httpd-bkpc", "K15", "0"); -service_link_enhanced("httpd-bkpc", "K15", "1"); +#service_link_enhanced("backuppc", "S98", "7"); +#service_link_enhanced("backuppc", "K10", "6"); +#service_link_enhanced("backuppc", "K10", "0"); +#service_link_enhanced("backuppc", "K10", "1"); + +#service_link_enhanced("httpd-bkpc", "S86", "7"); +#service_link_enhanced("httpd-bkpc", "K15", "6"); +#service_link_enhanced("httpd-bkpc", "K15", "0"); +#service_link_enhanced("httpd-bkpc", "K15", "1"); -safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-bkpc'); -safe_symlink("/var/service/httpd-bkpc" , 'root/service/httpd-bkpc'); +#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-bkpc'); +#safe_symlink("/var/service/httpd-bkpc" , 'root/service/httpd-bkpc'); # Panel links @@ -26,23 +26,32 @@ # Event symlinks -my $event = 'backuppc-update'; -templates2events("/etc/httpd/conf/httpd.conf", $event); -templates2events("/etc/sudoers", $event); -templates2events("/etc/httpd/bkpc-conf/httpd.conf", qw(backuppc-update bootstrap-console-save)); - -event_link("backuppc-checkupgrade", $event, "20"); -event_link("backuppc-genkey", $event, "10"); -event_link("backuppc-checkupgrade", "post-upgrade", "91"); -event_link("backuppc-genkey", "post-upgrade", "90"); - -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/backuppc"); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-bkpc"); -safe_symlink("sigusr1", "root/etc/e-smith/events/logrotate/services2adjust/httpd-bkpc"); +# our event specific for updating with yum without reboot +$event = 'smeserver-BackupPC-update'; #Must match rpm name + foreach my $file (qw(/etc/systemd/system-preset/49-koozali.preset + /etc/httpd/conf/httpd.conf + /etc/sudoers + /etc/httpd/bkpc-conf/httpd.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("backuppc-checkupgrade", $event, "20"); + event_link("backuppc-genkey", $event, "10"); + event_link("backuppc-checkupgrade", "post-upgrade", "91"); + event_link("backuppc-genkey", "post-upgrade", "90"); +#services we need to restart + #safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/backuppc"); + safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); + safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-bkpc"); + safe_symlink("sigusr1", "root/etc/e-smith/events/logrotate/services2adjust/httpd-bkpc"); # Create needed empty files -safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/bkpc_access_log"); -safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/bkpc_error_log"); -safe_touch("root/var/service/httpd-bkpc/down"); + safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/bkpc_access_log"); + safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/bkpc_error_log"); + safe_touch("root/var/service/httpd-bkpc/down"); diff -urN smeserver-BackupPC-0.2.old/createlinks.sav smeserver-BackupPC-0.2/createlinks.sav --- smeserver-BackupPC-0.2.old/createlinks.sav 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-BackupPC-0.2/createlinks.sav 2013-11-12 18:07:16.000000000 +0000 @@ -0,0 +1,48 @@ +#!/usr/bin/perl -w + +use esmith::Build::CreateLinks qw(:all); + +# Start and stop links + +service_link_enhanced("backuppc", "S98", "7"); +service_link_enhanced("backuppc", "K10", "6"); +service_link_enhanced("backuppc", "K10", "0"); +service_link_enhanced("backuppc", "K10", "1"); + +service_link_enhanced("httpd-bkpc", "S86", "7"); +service_link_enhanced("httpd-bkpc", "K15", "6"); +service_link_enhanced("httpd-bkpc", "K15", "0"); +service_link_enhanced("httpd-bkpc", "K15", "1"); + +safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-bkpc'); +safe_symlink("/var/service/httpd-bkpc" , 'root/service/httpd-bkpc'); + +# Panel links + +panel_link("backuppc", 'manager'); + +# Various symlinks + + +# Event symlinks + +my $event = 'backuppc-update'; +templates2events("/etc/httpd/conf/httpd.conf", $event); +templates2events("/etc/sudoers", $event); +templates2events("/etc/httpd/bkpc-conf/httpd.conf", qw(backuppc-update bootstrap-console-save)); + +event_link("backuppc-checkupgrade", $event, "20"); +event_link("backuppc-genkey", $event, "10"); +event_link("backuppc-checkupgrade", "post-upgrade", "91"); +event_link("backuppc-genkey", "post-upgrade", "90"); + +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/backuppc"); +safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-bkpc"); +safe_symlink("sigusr1", "root/etc/e-smith/events/logrotate/services2adjust/httpd-bkpc"); + +# Create needed empty files +safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/bkpc_access_log"); +safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/bkpc_error_log"); +safe_touch("root/var/service/httpd-bkpc/down"); +