diff -urN smeserver-webfilter-0.2.16.old/createlinks smeserver-webfilter-0.2.16/createlinks --- smeserver-webfilter-0.2.16.old/createlinks 2015-11-19 15:29:48.000000000 +0000 +++ smeserver-webfilter-0.2.16/createlinks 2022-08-13 11:08:45.269450744 +0100 @@ -2,7 +2,11 @@ use esmith::Build::CreateLinks qw(:all); -foreach my $event (qw/bootstrap-console-save http-proxy-update/){ +my $pkg= "smeserver-webfilter"; +my $update_event = "${pkg}-update"; + + +foreach my $event (qw/bootstrap-console-save http-proxy-update smeserver-webfilter-update /){ templates2events("/etc/squid/squid.conf", $event); templates2events("/etc/squid/squidGuard.conf", $event); templates2events("/usr/share/squidGuard/conf.txt", $event); @@ -10,14 +14,26 @@ templates2events("/etc/logrotate.d/squidGuard", $event); templates2events("/etc/squidclamav.conf", $event); templates2events("/etc/e-smith/sql/init/squiddblogd", $event); -} +}; + +event_services($update_event, qw( + squidGuard restart + httpd-e-smith restart + transparent-proxying restart +)); + +# squid-db-logd restart + safe_symlink("restart", "root/etc/e-smith/events/http-proxy-update/services2adjust/mysql.init"); safe_symlink("restart", "root/etc/e-smith/events/http-proxy-update/services2adjust/squid-db-logd"); event_link("squidguard-update-databases", 'http-proxy-update', "10"); + safe_symlink("/etc/e-smith/templates-default/template-begin-shell", "root/etc/e-smith/templates/etc/cron.daily/squidGuard/template-begin"); + panel_link("webfilter", "manager"); + safe_touch('root/var/squidGuard/blacklists/black/domains'); safe_touch('root/var/squidGuard/blacklists/black/urls'); safe_touch('root/var/squidGuard/blacklists/white/domains'); @@ -26,10 +42,12 @@ safe_touch('root/var/log/squidGuard/deny.log'); safe_touch('root/var/log/squidGuard/white.log'); safe_touch('root/var/log/squidGuard/squidGuard.log'); -safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/squid-db-logd'); -safe_symlink("/var/service/squid-db-logd" , 'root/service/squid-db-logd'); -service_link_enhanced("squid-db-logd", "S98", "7"); -service_link_enhanced("squid-db-logd", "K15", "6"); -service_link_enhanced("squid-db-logd", "K35", "0"); -service_link_enhanced("squid-db-logd", "K35", "1"); + +#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/squid-db-logd'); +#safe_symlink("/var/service/squid-db-logd" , 'root/service/squid-db-logd'); + +#service_link_enhanced("squid-db-logd", "S98", "7"); +#service_link_enhanced("squid-db-logd", "K15", "6"); +#service_link_enhanced("squid-db-logd", "K35", "0"); +#service_link_enhanced("squid-db-logd", "K35", "1"); diff -urN smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidguard/DisabledCategories smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidguard/DisabledCategories --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidguard/DisabledCategories 2015-11-19 15:29:48.000000000 +0000 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidguard/DisabledCategories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -child,liste_bu,sexual_education,cleaning,reaffected,cooking,bank,astrology,financial,jobsearch,marketingware,strict_redirector,strong_redirector,tricheur,mixed_adult,dangerous_material diff -urN smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidguard/status smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidguard/status --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidguard/status 2015-11-19 15:29:48.000000000 +0000 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidguard/status 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -enabled diff -urN smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidguard/type smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidguard/type --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidguard/type 2015-11-19 15:29:48.000000000 +0000 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidguard/type 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -service diff -urN smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidGuard/DisabledCategories smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidGuard/DisabledCategories --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidGuard/DisabledCategories 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidGuard/DisabledCategories 2015-11-19 15:29:48.000000000 +0000 @@ -0,0 +1 @@ +child,liste_bu,sexual_education,cleaning,reaffected,cooking,bank,astrology,financial,jobsearch,marketingware,strict_redirector,strong_redirector,tricheur,mixed_adult,dangerous_material diff -urN smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidGuard/status smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidGuard/status --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidGuard/status 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidGuard/status 2015-11-19 15:29:48.000000000 +0000 @@ -0,0 +1 @@ +enabled diff -urN smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidGuard/type smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidGuard/type --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidGuard/type 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidGuard/type 2015-11-19 15:29:48.000000000 +0000 @@ -0,0 +1 @@ +service diff -urN smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/transparent-proxying/status smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/transparent-proxying/status --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/transparent-proxying/status 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/transparent-proxying/status 2015-11-19 15:29:48.000000000 +0000 @@ -0,0 +1 @@ +enabled diff -urN smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/transparent-proxying/type smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/transparent-proxying/type --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/transparent-proxying/type 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/transparent-proxying/type 2015-11-19 15:29:48.000000000 +0000 @@ -0,0 +1 @@ +service