smeserver-isoqlog/contribs10/smeserver-isoqlog-2.2.1-bz12049-24syntax.patch

diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28isoqlogProxyPass smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28isoqlogProxyPass
--- smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28isoqlogProxyPass    2012-08-21 02:53:33.000000000 -0400
+++ smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28isoqlogProxyPass        2022-07-29 01:39:09.247000000 -0400
@@ -18,9 +18,7 @@
 
     <Location /isoqlog>
         SSLRequireSSL on
-        order deny,allow
-        deny from all
-        allow from $localAccess $externalSSLAccess
+        Require ip $localAccess $externalSSLAccess
     </Location>
 
 HERE
diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/85DefaultAccess smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/85DefaultAccess
--- smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/85DefaultAccess    2012-08-21 00:34:21.000000000 -0400
+++ smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/85DefaultAccess        2022-07-29 01:39:09.249000000 -0400
@@ -5,9 +5,7 @@
 <Directory />
     Options None
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from none
+    Require all denied
 </Directory>
 
 
diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/90isoqlog smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/90isoqlog
--- smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/90isoqlog  2022-07-29 01:38:18.635000000 -0400
+++ smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/90isoqlog      2022-07-29 01:42:03.088000000 -0400
@@ -10,9 +10,7 @@
         php_admin_value session.save_path /var/lib/php/isoqlog-session
         php_admin_value openbase_dir /var/lib/qmailtools/isoqlog/htdocs:/var/lib/php/isoqlog-session
         AllowOverride None
-        order deny,allow
-        deny from all
-        allow from 127.0.0.1
+        Require ip 127.0.0.1
 </Directory>
 
 # /ca is only allowed for admin and explicitely authorized users
@@ -20,7 +18,10 @@
         AuthName "Isoqlog Admin"
         AuthType Basic
         TKTAuthLoginURL /server-common/cgi-bin/login
-        require user admin {getUsersList("isoqlog");}
+       <RequireAll>
+          Require user admin {getUsersList("isoqlog");}
+          Require ip 127.0.0.1
+       </RequireAll>
 {
         my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} || "30m";
         $OUT = "    TKTAuthTimeout $ManagerTimeout\n";
@@ -29,6 +30,5 @@
         my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} || "0.66";
         $OUT .= "    TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
 }
-        Satisfy all
 </Location>
 
1	diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28isoqlogProxyPass smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28isoqlogProxyPass
2	--- smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28isoqlogProxyPass 2012-08-21 02:53:33.000000000 -0400
3	+++ smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28isoqlogProxyPass 2022-07-29 01:39:09.247000000 -0400
4	@@ -18,9 +18,7 @@
5
6	<Location /isoqlog>
7	SSLRequireSSL on
8	- order deny,allow
9	- deny from all
10	- allow from $localAccess $externalSSLAccess
11	+ Require ip $localAccess $externalSSLAccess
12	</Location>
13
14	HERE
15	diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/85DefaultAccess smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/85DefaultAccess
16	--- smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/85DefaultAccess 2012-08-21 00:34:21.000000000 -0400
17	+++ smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/85DefaultAccess 2022-07-29 01:39:09.249000000 -0400
18	@@ -5,9 +5,7 @@
19	<Directory />
20	Options None
21	AllowOverride None
22	- order deny,allow
23	- deny from all
24	- allow from none
25	+ Require all denied
26	</Directory>
27
28
29	diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/90isoqlog smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/90isoqlog
30	--- smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/90isoqlog 2022-07-29 01:38:18.635000000 -0400
31	+++ smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/90isoqlog 2022-07-29 01:42:03.088000000 -0400
32	@@ -10,9 +10,7 @@
33	php_admin_value session.save_path /var/lib/php/isoqlog-session
34	php_admin_value openbase_dir /var/lib/qmailtools/isoqlog/htdocs:/var/lib/php/isoqlog-session
35	AllowOverride None
36	- order deny,allow
37	- deny from all
38	- allow from 127.0.0.1
39	+ Require ip 127.0.0.1
40	</Directory>
41
42	# /ca is only allowed for admin and explicitely authorized users
43	@@ -20,7 +18,10 @@
44	AuthName "Isoqlog Admin"
45	AuthType Basic
46	TKTAuthLoginURL /server-common/cgi-bin/login
47	- require user admin {getUsersList("isoqlog");}
48	+ <RequireAll>
49	+ Require user admin {getUsersList("isoqlog");}
50	+ Require ip 127.0.0.1
51	+ </RequireAll>
52	{
53	my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} \|\| "30m";
54	$OUT = " TKTAuthTimeout $ManagerTimeout\n";
55	@@ -29,6 +30,5 @@
56	my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} \|\| "0.66";
57	$OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
58	}
59	- Satisfy all
60	</Location>
61