/[smecontribs]/rpms/smeserver-webfilter/contribs10/smeserver-webfilter-0.2.16-Update-createlinks-and-Get-capitalisation-correct-in-db.patch
ViewVC logotype

Contents of /rpms/smeserver-webfilter/contribs10/smeserver-webfilter-0.2.16-Update-createlinks-and-Get-capitalisation-correct-in-db.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Sat Aug 13 10:50:13 2022 UTC (21 months, 2 weeks ago) by brianr
Branch: MAIN
CVS Tags: smeserver-webfilter-0_2_16-5_el7_sme, smeserver-webfilter-0_2_16-4_el7_sme, HEAD 
* Sat Aug 13 2022 Brian Read <brianr@bjsystems.co.uk> 0.2.16-4.sme
- Update creatlinks for systemd and fix capitalisation of squidGuard in config db [SME: 11978]
- Add in DB entries for transparent-proxying
1 diff -urN smeserver-webfilter-0.2.16.old/createlinks smeserver-webfilter-0.2.16/createlinks
2 --- smeserver-webfilter-0.2.16.old/createlinks 2015-11-19 15:29:48.000000000 +0000
3 +++ smeserver-webfilter-0.2.16/createlinks 2022-08-13 11:08:45.269450744 +0100
4 @@ -2,7 +2,11 @@
5
6 use esmith::Build::CreateLinks qw(:all);
7
8 -foreach my $event (qw/bootstrap-console-save http-proxy-update/){
9 +my $pkg= "smeserver-webfilter";
10 +my $update_event = "${pkg}-update";
11 +
12 +
13 +foreach my $event (qw/bootstrap-console-save http-proxy-update smeserver-webfilter-update /){
14 templates2events("/etc/squid/squid.conf", $event);
15 templates2events("/etc/squid/squidGuard.conf", $event);
16 templates2events("/usr/share/squidGuard/conf.txt", $event);
17 @@ -10,14 +14,26 @@
18 templates2events("/etc/logrotate.d/squidGuard", $event);
19 templates2events("/etc/squidclamav.conf", $event);
20 templates2events("/etc/e-smith/sql/init/squiddblogd", $event);
21 -}
22 +};
23 +
24 +event_services($update_event, qw(
25 + squidGuard restart
26 + httpd-e-smith restart
27 + transparent-proxying restart
28 +));
29 +
30 +# squid-db-logd restart
31 +
32
33 safe_symlink("restart", "root/etc/e-smith/events/http-proxy-update/services2adjust/mysql.init");
34 safe_symlink("restart", "root/etc/e-smith/events/http-proxy-update/services2adjust/squid-db-logd");
35
36 event_link("squidguard-update-databases", 'http-proxy-update', "10");
37 +
38 safe_symlink("/etc/e-smith/templates-default/template-begin-shell", "root/etc/e-smith/templates/etc/cron.daily/squidGuard/template-begin");
39 +
40 panel_link("webfilter", "manager");
41 +
42 safe_touch('root/var/squidGuard/blacklists/black/domains');
43 safe_touch('root/var/squidGuard/blacklists/black/urls');
44 safe_touch('root/var/squidGuard/blacklists/white/domains');
45 @@ -26,10 +42,12 @@
46 safe_touch('root/var/log/squidGuard/deny.log');
47 safe_touch('root/var/log/squidGuard/white.log');
48 safe_touch('root/var/log/squidGuard/squidGuard.log');
49 -safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/squid-db-logd');
50 -safe_symlink("/var/service/squid-db-logd" , 'root/service/squid-db-logd');
51 -service_link_enhanced("squid-db-logd", "S98", "7");
52 -service_link_enhanced("squid-db-logd", "K15", "6");
53 -service_link_enhanced("squid-db-logd", "K35", "0");
54 -service_link_enhanced("squid-db-logd", "K35", "1");
55 +
56 +#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/squid-db-logd');
57 +#safe_symlink("/var/service/squid-db-logd" , 'root/service/squid-db-logd');
58 +
59 +#service_link_enhanced("squid-db-logd", "S98", "7");
60 +#service_link_enhanced("squid-db-logd", "K15", "6");
61 +#service_link_enhanced("squid-db-logd", "K35", "0");
62 +#service_link_enhanced("squid-db-logd", "K35", "1");
63
64 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
65 --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidguard/DisabledCategories 2015-11-19 15:29:48.000000000 +0000
66 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidguard/DisabledCategories 1970-01-01 01:00:00.000000000 +0100
67 @@ -1 +0,0 @@
68 -child,liste_bu,sexual_education,cleaning,reaffected,cooking,bank,astrology,financial,jobsearch,marketingware,strict_redirector,strong_redirector,tricheur,mixed_adult,dangerous_material
69 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
70 --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidguard/status 2015-11-19 15:29:48.000000000 +0000
71 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidguard/status 1970-01-01 01:00:00.000000000 +0100
72 @@ -1 +0,0 @@
73 -enabled
74 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
75 --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidguard/type 2015-11-19 15:29:48.000000000 +0000
76 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidguard/type 1970-01-01 01:00:00.000000000 +0100
77 @@ -1 +0,0 @@
78 -service
79 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
80 --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidGuard/DisabledCategories 1970-01-01 01:00:00.000000000 +0100
81 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidGuard/DisabledCategories 2015-11-19 15:29:48.000000000 +0000
82 @@ -0,0 +1 @@
83 +child,liste_bu,sexual_education,cleaning,reaffected,cooking,bank,astrology,financial,jobsearch,marketingware,strict_redirector,strong_redirector,tricheur,mixed_adult,dangerous_material
84 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
85 --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidGuard/status 1970-01-01 01:00:00.000000000 +0100
86 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidGuard/status 2015-11-19 15:29:48.000000000 +0000
87 @@ -0,0 +1 @@
88 +enabled
89 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
90 --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/squidGuard/type 1970-01-01 01:00:00.000000000 +0100
91 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/squidGuard/type 2015-11-19 15:29:48.000000000 +0000
92 @@ -0,0 +1 @@
93 +service
94 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
95 --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/transparent-proxying/status 1970-01-01 01:00:00.000000000 +0100
96 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/transparent-proxying/status 2015-11-19 15:29:48.000000000 +0000
97 @@ -0,0 +1 @@
98 +enabled
99 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
100 --- smeserver-webfilter-0.2.16.old/root/etc/e-smith/db/configuration/defaults/transparent-proxying/type 1970-01-01 01:00:00.000000000 +0100
101 +++ smeserver-webfilter-0.2.16/root/etc/e-smith/db/configuration/defaults/transparent-proxying/type 2015-11-19 15:29:48.000000000 +0000
102 @@ -0,0 +1 @@
103 +service
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed