diff -Nur --no-dereference e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks --- e-smith-base-5.8.0.old/createlinks 2021-03-30 18:22:52.408000000 -0400 +++ e-smith-base-5.8.0/createlinks 2021-03-30 18:25:49.571000000 -0400 @@ -301,6 +301,7 @@ my $event = "e-smith-base-update"; +event_link("remove-templates-custom", $event, "02"); templates2events("/etc/smartd.conf", $event); templates2events("/home/e-smith/ssl.pem/pem", $event); templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event); @@ -333,7 +334,7 @@ #-------------------------------------------------- my $event = "console-save"; - +event_link("remove-templates-custom", $event, "02"); templates2events("/etc/smartd.conf", $event); templates2events("/home/e-smith/ssl.pem/pem", $event); event_link("set-hostname", $event, "10"); @@ -352,7 +353,7 @@ #-------------------------------------------------- $event = "bootstrap-console-save"; - +event_link("remove-templates-custom", $event, "02"); templates2events("/etc/smartd.conf", $event); templates2events("/home/e-smith/ssl.pem/pem", $event); event_link("rmmod-bonding", $event, "10"); @@ -458,6 +459,7 @@ $event = "post-upgrade"; +event_link("remove-templates-custom", $event, "02"); templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event); event_link("fix-startup", $event, "05"); event_link("rotate_timestamped_logfiles", $event, "05"); @@ -489,6 +491,7 @@ $event = "remoteaccess-update"; +event_link("remove-templates-custom", $event, "02"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcpd"); event_link("systemd-default", $event, "88"); event_link("systemd-reload", $event, "89"); diff -Nur --no-dereference e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/remove-templates-custom e-smith-base-5.8.0/root/etc/e-smith/events/actions/remove-templates-custom --- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/remove-templates-custom 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/remove-templates-custom 2021-03-30 18:23:05.843000000 -0400 @@ -0,0 +1,25 @@ +#!/usr/bin/perl +use Digest::MD5 qw(md5 md5_hex md5_base64); +use strict; +use warnings; + +my %files = ( + '/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/20LoadModule80PHP' => 'f1754b2ea09ec195d816b3e6d4b044a5', #smeserver-php-scl + '/etc/e-smith/templates-custom/etc/hosts.allow/sshd' => 'd08f437bc0b38e996341f564cf446828', #smeserver-denyhosts + '/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/35SSL00Listen443' => 'a3d1cf339126da076c1dcc2b21602bc9', #smeserver-softethervpn-server + '/etc/e-smith/templates-custom/etc/dhcpd.conf/25DomainNameServers' => 'c201caf9528713b55708173a3ef26f18', #smeserver-dhcpmanager + '/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeDefault' => 'ad4468c7b2ad8f275514e7ce61747651', #smeserver-dhcpmanager + '/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeMax' => 'a450dbc91dc0d6443b29069d829c0a51', #smeserver-dhcpmanager + '/etc/e-smith/templates-custom/etc/dhcpd.conf/25Routers' => 'd14a9b0153af3b7c608bb59eaccc24fc' #smeserver-dhcpmanager + +); + +for my $filename (keys %files) { + next unless ( -f $filename); + open (my $fh, '<', $filename) or die "Can't open '$filename': $!"; + binmode ($fh); + my $sum =Digest::MD5->new->addfile($fh)->hexdigest; + next unless $files{$filename} eq $sum; + warn "md5sum matches, deleting fragment $filename identified as owned by a previous rpm\n"; + unlink $filename or warn "failed to remove $filename\n"; +}