smeserver-phpki-ng/contribs10/smeserver-phpki-ng-0.3-httpd-typos.patch

diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules
--- smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules       2022-11-20 20:15:47.931000000 -0500
+++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules   2022-11-20 20:16:58.727000000 -0500
@@ -49,6 +49,7 @@
     authn_core
     authz_core
     authz_user
+    authz_host
        proxy_ajp 
        proxy_connect 
        proxy_express 
diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki
--- smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki 2022-11-20 20:15:47.931000000 -0500
+++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki     2022-11-20 20:19:00.398000000 -0500
@@ -26,16 +26,19 @@
        AuthName "PHPKI Admin"
         AuthType Basic
         TKTAuthLoginURL /server-common/cgi-bin/login
-        require user admin {getUsersList("phpki");}
+        <RequireAll>
+          Require user admin {getUsersList("phpki");}
+          Require ip 127.0.0.1
+        </RequireAll>
+
 {
         my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} || "30m";
         $OUT = "    TKTAuthTimeout $ManagerTimeout\n";
         my $Cookie = ${'httpd-admin'}{Cookie} || "disabled";
-        $OUT .= "    TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled";
+        $OUT .= "     TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled";
         my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} || "0.66";
-        $OUT .= "    TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
+        $OUT .= "     TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
 }
-        Satisfy all
 </Location>
 
 # Disable access to /admin, which is used to configure user/password 
1	jpp	1.1	diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules
2			--- smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules 2022-11-20 20:15:47.931000000 -0500
3			+++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules 2022-11-20 20:16:58.727000000 -0500
4			@@ -49,6 +49,7 @@
5			authn_core
6			authz_core
7			authz_user
8			+ authz_host
9			proxy_ajp
10			proxy_connect
11			proxy_express
12			diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki
13			--- smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki 2022-11-20 20:15:47.931000000 -0500
14			+++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki 2022-11-20 20:19:00.398000000 -0500
15	jpp	1.2	@@ -26,16 +26,19 @@
16	jpp	1.1	AuthName "PHPKI Admin"
17			AuthType Basic
18			TKTAuthLoginURL /server-common/cgi-bin/login
19			- require user admin {getUsersList("phpki");}
20			+ <RequireAll>
21			+ Require user admin {getUsersList("phpki");}
22			+ Require ip 127.0.0.1
23			+ </RequireAll>
24			+
25			{
26			my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} \|\| "30m";
27			$OUT = " TKTAuthTimeout $ManagerTimeout\n";
28			my $Cookie = ${'httpd-admin'}{Cookie} \|\| "disabled";
29			- $OUT .= " TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled";
30			+ $OUT .= " TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled";
31			my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} \|\| "0.66";
32			- $OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
33			+ $OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
34			}
35			- Satisfy all
36			</Location>
37
38			# Disable access to /admin, which is used to configure user/password