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
--- 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
+++ 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
@@ -5,8 +5,6 @@
 <Directory />
     Options None
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from none
+    Require all denied
 </Directory>
 
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
--- 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
+++ 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
@@ -2,9 +2,7 @@
 
 <Directory /home/e-smith/files/server-resources>
     Options +Indexes
-    order deny,allow
-    deny from all
 {
-    $OUT .= "    allow from $localAccess\n";
+    $OUT .= "    Require ip $localAccess\n";
 }
 </Directory>
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
--- 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
+++ 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
@@ -5,8 +5,6 @@
 <Directory "/home/e-smith/web/common">
     Options Indexes Includes
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from all
+    Require all granted
 </Directory>
 
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
--- 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
+++ 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
@@ -5,32 +5,24 @@
 <Directory "/etc/e-smith/web/common/cgi-bin">
     AllowOverride None
     Options ExecCGI
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
-    Satisfy all
+    <RequireAll>
+        Require ip { $localAccess }
+    </RequireAll>
 </Directory>
 
 <Directory "/etc/e-smith/web/common">
     Options Includes
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from all
+    Require all granted
     <FilesMatch ".*\.tmpl">
-        Order allow,deny
-        Deny from all
+        Require all denied
     </FilesMatch>
 </Directory>
 
 <Directory "/etc/e-smith/web/panels/manager/common">
     Options Includes FollowSymLinks
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from all
     AuthType basic
-
     TKTAuthLoginURL /server-common/cgi-bin/login
 {
 	my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} || "30m";
@@ -41,7 +33,9 @@
 	$OUT .= "    TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
 }
     TKTAuthUnauthURL /server-common/cgi-bin/logout
-    require valid-user
-    Satisfy all
+    <RequireAll>
+        require valid-user
+        Require all granted
+    </RequireAll>
 </Directory>
 
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
--- 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
+++ 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
@@ -6,9 +6,6 @@
 <Directory "/etc/e-smith/web/panels/manager/html" >
     Options Includes FollowSymLinks ExecCGI
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
     AuthType Basic
     TKTAuthLoginURL /server-common/cgi-bin/login
 {    
@@ -18,16 +15,15 @@
 }  
     TKTAuthTimeoutRefresh 0.66 
     TKTAuthUnauthURL /server-common/cgi-bin/logout
-    require user admin
-    Satisfy all
+    <RequireAll>
+	require user admin
+	Require ip { $localAccess }
+    </RequireAll>
 </Directory>
 
 <Directory "/etc/e-smith/web/panels/manager/cgi-bin">
     Options Includes FollowSymLinks ExecCGI
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
     AuthType Basic
     TKTAuthLoginURL /server-common/cgi-bin/login
 {    
@@ -39,6 +35,8 @@
         $OUT .= "    TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
 }   
     TKTAuthUnauthURL /server-common/cgi-bin/logout
-    require user admin
-    Satisfy all
+    <RequireAll>
+	require user admin
+	Require ip { $localAccess }
+    </RequireAll>
 </Directory>
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
--- 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
+++ 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
@@ -3,15 +3,11 @@
 # e-smith-password panel
 #------------------------------------------------------------
 <Directory "/etc/e-smith/web/panels/password/html">
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
+    Require ip { $localAccess }
 </Directory>
 
 <Directory "/etc/e-smith/web/panels/password/cgi-bin">
     Options Includes FollowSymlinks
-    order deny,allow
-    deny from all
-    allow from { $localAccess }
+    Require ip { $localAccess }
 </Directory>