/[smecontribs]/rpms/smeserver-BackupPC/contribs10/smeserver-BackupPC-0.2-bz12036-24syntax.patch
ViewVC logotype

Contents of /rpms/smeserver-BackupPC/contribs10/smeserver-BackupPC-0.2-bz12036-24syntax.patch

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


Revision 1.2 - (show annotations) (download)
Mon Aug 1 01:43:25 2022 UTC (2 years, 4 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-BackupPC-0_2-13_el7_sme, smeserver-BackupPC-0_2-15_el7_sme, smeserver-BackupPC-0_2-14_el7_sme, HEAD
Changes since 1.1: +52 -0 lines
* Sun Jul 31 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.2-13.sme
- update to httpd 2.4 syntax [SME: 12036]
  including Requires, and bkpc-conf

1 diff -urN smeserver-BackupPC-0.2.old/root/etc/e-smith/templates/etc/httpd/bkpc-conf/httpd.conf/85DefaultAccess smeserver-BackupPC-0.2/root/etc/e-smith/templates/etc/httpd/bkpc-conf/httpd.conf/85DefaultAccess
2 --- smeserver-BackupPC-0.2.old/root/etc/e-smith/templates/etc/httpd/bkpc-conf/httpd.conf/85DefaultAccess 2022-07-22 11:43:27.145830596 +0300
3 +++ smeserver-BackupPC-0.2/root/etc/e-smith/templates/etc/httpd/bkpc-conf/httpd.conf/85DefaultAccess 2022-07-22 11:56:46.128716095 +0300
4 @@ -5,9 +5,7 @@
5 <Directory />
6 Options None
7 AllowOverride None
8 - order deny,allow
9 - deny from all
10 - allow from none
11 + Require all denied
12 </Directory>
13
14
15 diff -urN smeserver-BackupPC-0.2.old/root/etc/e-smith/templates/etc/httpd/bkpc-conf/httpd.conf/90BackupPC smeserver-BackupPC-0.2/root/etc/e-smith/templates/etc/httpd/bkpc-conf/httpd.conf/90BackupPC
16 --- smeserver-BackupPC-0.2.old/root/etc/e-smith/templates/etc/httpd/bkpc-conf/httpd.conf/90BackupPC 2022-07-22 11:43:27.145830596 +0300
17 +++ smeserver-BackupPC-0.2/root/etc/e-smith/templates/etc/httpd/bkpc-conf/httpd.conf/90BackupPC 2022-07-22 12:19:48.715584042 +0300
18 @@ -5,17 +5,12 @@
19 <Directory /usr/share/BackupPC/html/>
20 Options None
21 AllowOverride None
22 - order deny,allow
23 - deny from all
24 - allow from 127.0.0.1
25 + Require ip 127.0.0.1
26 </Directory>
27
28 <Directory /usr/share/BackupPC/sbin/>
29 Options ExecCGI
30 AllowOverride None
31 - order deny,allow
32 - deny from all
33 - allow from 127.0.0.1
34 AuthName "BackupPC"
35 AuthType Basic
36 TKTAuthLoginURL /server-common/cgi-bin/login
37 @@ -27,8 +22,10 @@
38 my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} || "0.66";
39 $OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
40 }
41 - require valid-user
42 - Satisfy all
43 + <RequireAll>
44 + Require valid-user
45 + Require ip 127.0.0.1
46 + </RequireAll>
47 </Directory>
48
49
50 diff -urN smeserver-BackupPC-0.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28BackupPCProxyPass smeserver-BackupPC-0.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28BackupPCProxyPass
51 --- smeserver-BackupPC-0.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28BackupPCProxyPass 2022-07-22 11:43:27.144830601 +0300
52 +++ smeserver-BackupPC-0.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28BackupPCProxyPass 2022-07-22 12:23:55.791313061 +0300
53 @@ -21,9 +21,7 @@
54
55 <Location /BackupPC>
56 SSLRequireSSL on
57 - order deny,allow
58 - deny from all
59 - allow from $localAccess $externalSSLAccess
60 + Require ip $localAccess $externalSSLAccess
61 </Location>
62
63 HERE
64 diff -Nur --no-dereference smeserver-BackupPC-0.2.old/root/etc/httpd/bkpc-conf/httpd.conf smeserver-BackupPC-0.2/root/etc/httpd/bkpc-conf/httpd.conf
65 --- smeserver-BackupPC-0.2.old/root/etc/httpd/bkpc-conf/httpd.conf 2022-07-31 21:34:49.060000000 -0400
66 +++ smeserver-BackupPC-0.2/root/etc/httpd/bkpc-conf/httpd.conf 2022-07-31 21:40:48.635000000 -0400
67 @@ -57,7 +57,6 @@
68
69 LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
70 LoadModule unixd_module modules/mod_unixd.so
71 -LoadModule access_compat_module modules/mod_access_compat.so
72 LoadModule authn_core_module modules/mod_authn_core.so
73 LoadModule : modules/mod_authz_core.so
74
75 @@ -158,9 +157,7 @@
76 <Directory />
77 Options None
78 AllowOverride None
79 - order deny,allow
80 - deny from all
81 - allow from none
82 + Require all denied
83 </Directory>
84
85
86 @@ -171,23 +168,20 @@
87 <Directory /usr/share/BackupPC/html/>
88 Options None
89 AllowOverride None
90 - order deny,allow
91 - deny from all
92 - allow from 127.0.0.1
93 + Require ip 127.0.0.1
94 </Directory>
95
96 <Directory /usr/share/BackupPC/sbin/>
97 Options ExecCGI
98 AllowOverride None
99 - order deny,allow
100 - deny from all
101 - allow from 127.0.0.1
102 AuthName "BackupPC"
103 - AuthType Basic
104 + AuthType Basic
105 TKTAuthLoginURL /server-common/cgi-bin/login
106 - require valid-user
107 SetEnv IMGHDR_SRC "/server-common/server-manager.jpg"
108 - Satisfy all
109 + <RequireAll>
110 + Require valid-user
111 + Require ip 127.0.0.1
112 + </RequireAll>
113 </Directory>
114
115

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