/[smeserver]/rpms/e-smith-manager/sme10/e-smith-manager-2.8.0-bz12129-httpd24-2.patch
ViewVC logotype

Annotation of /rpms/e-smith-manager/sme10/e-smith-manager-2.8.0-bz12129-httpd24-2.patch

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

Revision 1.1 - (hide annotations) (download)
Sat Jul 30 01:36:55 2022 UTC (2 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-manager-2_8_0-38_el7_sme, e-smith-manager-2_8_0-37_el7_sme, HEAD 
* Fri Jul 29 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-37.sme
- update to httpd 2.4 access syntax for httpd-admin [SME: 12129]
1 jpp 1.1 diff -Nur --no-dereference e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess
2     --- e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess 2006-11-02 11:38:41.000000000 -0500
3     +++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85DefaultAccess 2022-07-29 21:32:11.814000000 -0400
4     @@ -5,8 +5,6 @@
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     diff -Nur --no-dereference e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess
15     --- e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess 2006-11-02 11:38:41.000000000 -0500
16     +++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85ServerResourcesAccess 2022-07-29 21:32:11.814000000 -0400
17     @@ -2,9 +2,7 @@
18    
19     <Directory /home/e-smith/files/server-resources>
20     Options +Indexes
21     - order deny,allow
22     - deny from all
23     {
24     - $OUT .= " allow from $localAccess\n";
25     + $OUT .= " Require ip $localAccess\n";
26     }
27     </Directory>
28     diff -Nur --no-dereference e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand
29     --- e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand 2006-11-02 11:38:41.000000000 -0500
30     +++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15brand 2022-07-29 21:32:11.815000000 -0400
31     @@ -5,8 +5,6 @@
32     <Directory "/home/e-smith/web/common">
33     Options Indexes Includes
34     AllowOverride None
35     - order deny,allow
36     - deny from all
37     - allow from all
38     + Require all granted
39     </Directory>
40    
41     diff -Nur --no-dereference e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common
42     --- e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common 2022-07-29 21:30:49.098000000 -0400
43     +++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common 2022-07-29 21:33:44.326000000 -0400
44     @@ -5,32 +5,24 @@
45     <Directory "/etc/e-smith/web/common/cgi-bin">
46     AllowOverride None
47     Options ExecCGI
48     - order deny,allow
49     - deny from all
50     - allow from { $localAccess }
51     - Satisfy all
52     + <RequireAll>
53     + Require ip { $localAccess }
54     + </RequireAll>
55     </Directory>
56    
57     <Directory "/etc/e-smith/web/common">
58     Options Includes
59     AllowOverride None
60     - order deny,allow
61     - deny from all
62     - allow from all
63     + Require all granted
64     <FilesMatch ".*\.tmpl">
65     - Order allow,deny
66     - Deny from all
67     + Require all denied
68     </FilesMatch>
69     </Directory>
70    
71     <Directory "/etc/e-smith/web/panels/manager/common">
72     Options Includes FollowSymLinks
73     AllowOverride None
74     - order deny,allow
75     - deny from all
76     - allow from all
77     AuthType basic
78     -
79     TKTAuthLoginURL /server-common/cgi-bin/login
80     {
81     my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} || "30m";
82     @@ -41,7 +33,9 @@
83     $OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
84     }
85     TKTAuthUnauthURL /server-common/cgi-bin/logout
86     - require valid-user
87     - Satisfy all
88     + <RequireAll>
89     + require valid-user
90     + Require all granted
91     + </RequireAll>
92     </Directory>
93    
94     diff -Nur --no-dereference e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager
95     --- e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager 2022-07-29 21:30:49.099000000 -0400
96     +++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager 2022-07-29 21:32:11.816000000 -0400
97     @@ -6,9 +6,6 @@
98     <Directory "/etc/e-smith/web/panels/manager/html" >
99     Options Includes FollowSymLinks ExecCGI
100     AllowOverride None
101     - order deny,allow
102     - deny from all
103     - allow from { $localAccess }
104     AuthType Basic
105     TKTAuthLoginURL /server-common/cgi-bin/login
106     {
107     @@ -18,16 +15,15 @@
108     }
109     TKTAuthTimeoutRefresh 0.66
110     TKTAuthUnauthURL /server-common/cgi-bin/logout
111     - require user admin
112     - Satisfy all
113     + <RequireAll>
114     + require user admin
115     + Require ip { $localAccess }
116     + </RequireAll>
117     </Directory>
118    
119     <Directory "/etc/e-smith/web/panels/manager/cgi-bin">
120     Options Includes FollowSymLinks ExecCGI
121     AllowOverride None
122     - order deny,allow
123     - deny from all
124     - allow from { $localAccess }
125     AuthType Basic
126     TKTAuthLoginURL /server-common/cgi-bin/login
127     {
128     @@ -39,6 +35,8 @@
129     $OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
130     }
131     TKTAuthUnauthURL /server-common/cgi-bin/logout
132     - require user admin
133     - Satisfy all
134     + <RequireAll>
135     + require user admin
136     + Require ip { $localAccess }
137     + </RequireAll>
138     </Directory>
139     diff -Nur --no-dereference e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password
140     --- e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password 2022-07-29 21:30:49.121000000 -0400
141     +++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20password 2022-07-29 21:32:11.816000000 -0400
142     @@ -3,15 +3,11 @@
143     # e-smith-password panel
144     #------------------------------------------------------------
145     <Directory "/etc/e-smith/web/panels/password/html">
146     - order deny,allow
147     - deny from all
148     - allow from { $localAccess }
149     + Require ip { $localAccess }
150     </Directory>
151    
152     <Directory "/etc/e-smith/web/panels/password/cgi-bin">
153     Options Includes FollowSymlinks
154     - order deny,allow
155     - deny from all
156     - allow from { $localAccess }
157     + Require ip { $localAccess }
158     </Directory>
159    
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed