/[smecontribs]/rpms/smeserver-webfilter/contribs10/smeserver-webfilter-0.2.16-bz11978-sme10.patch
ViewVC logotype

Contents of /rpms/smeserver-webfilter/contribs10/smeserver-webfilter-0.2.16-bz11978-sme10.patch

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


Revision 1.1 - (show annotations) (download)
Wed May 25 14:56:39 2022 UTC (2 years ago) by jpp
Branch: MAIN
CVS Tags: smeserver-webfilter-0_2_16-3_el7_sme, smeserver-webfilter-0_2_16-5_el7_sme, smeserver-webfilter-0_2_16-4_el7_sme, HEAD
* Wed May 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.2.16-2.sme
- import to SME 10 and Koozali buildsys [SME: 11978]

1 diff -Nur --no-dereference smeserver-webfilter-0.2.16.old/createlinks smeserver-webfilter-0.2.16/createlinks
2 --- smeserver-webfilter-0.2.16.old/createlinks 2015-11-19 10:29:48.000000000 -0500
3 +++ smeserver-webfilter-0.2.16/createlinks 2022-05-25 10:50:34.451000000 -0400
4 @@ -2,7 +2,7 @@
5
6 use esmith::Build::CreateLinks qw(:all);
7
8 -foreach my $event (qw/bootstrap-console-save http-proxy-update/){
9 +foreach my $event (qw/bootstrap-console-save http-proxy-update smeserver-webfilter-update/){
10 templates2events("/etc/squid/squid.conf", $event);
11 templates2events("/etc/squid/squidGuard.conf", $event);
12 templates2events("/usr/share/squidGuard/conf.txt", $event);
13 @@ -26,10 +26,23 @@
14 safe_touch('root/var/log/squidGuard/deny.log');
15 safe_touch('root/var/log/squidGuard/white.log');
16 safe_touch('root/var/log/squidGuard/squidGuard.log');
17 -safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/squid-db-logd');
18 +#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/squid-db-logd');
19 safe_symlink("/var/service/squid-db-logd" , 'root/service/squid-db-logd');
20 -service_link_enhanced("squid-db-logd", "S98", "7");
21 -service_link_enhanced("squid-db-logd", "K15", "6");
22 -service_link_enhanced("squid-db-logd", "K35", "0");
23 -service_link_enhanced("squid-db-logd", "K35", "1");
24 +#service_link_enhanced("squid-db-logd", "S98", "7");
25 +#service_link_enhanced("squid-db-logd", "K15", "6");
26 +#service_link_enhanced("squid-db-logd", "K35", "0");
27 +#service_link_enhanced("squid-db-logd", "K35", "1");
28
29 +my $event="smeserver-webfilter-update";
30 +
31 +#systemd-specific action mandatory for this package-update event
32 +event_link("systemd-reload", $event, "89");
33 +event_link("systemd-default", $event, "88");
34 +
35 +event_link("squidguard-update-databases", $event, "10");
36 +templates2events("/etc/httpd/conf/httpd.conf", $event);
37 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
38 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/squid-db-logd");
39 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
40 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/squidGuard");
41 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/squid");
42 diff -Nur --no-dereference smeserver-webfilter-0.2.16.old/root/usr/lib/systemd/system/squidGuard.service.d/50-koozali.conf smeserver-webfilter-0.2.16/root/usr/lib/systemd/system/squidGuard.service.d/50-koozali.conf
43 --- smeserver-webfilter-0.2.16.old/root/usr/lib/systemd/system/squidGuard.service.d/50-koozali.conf 1969-12-31 19:00:00.000000000 -0500
44 +++ smeserver-webfilter-0.2.16/root/usr/lib/systemd/system/squidGuard.service.d/50-koozali.conf 2022-05-25 10:52:43.257000000 -0400
45 @@ -0,0 +1,3 @@
46 +[Install]
47 +WantedBy=sme-server.target
48 +

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed