--- rpms/smeserver-mod_maxminddb/contribs10/smeserver-mod_maxminddb-1.1.0-bz12052-httpd24.patch	2022/07/25 04:59:43	1.2
+++ rpms/smeserver-mod_maxminddb/contribs10/smeserver-mod_maxminddb-1.1.0-bz12052-httpd24.patch	2022/07/25 07:09:36	1.3
@@ -27,22 +27,26 @@ diff -Nur --no-dereference smeserver-mod
 diff -Nur --no-dereference smeserver-mod_maxminddb-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/98geoipallow smeserver-mod_maxminddb-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/98geoipallow
 --- smeserver-mod_maxminddb-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/98geoipallow	1969-12-31 19:00:00.000000000 -0500
 +++ smeserver-mod_maxminddb-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/98geoipallow	2022-07-25 00:58:53.941000000 -0400
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,23 @@
 +{
 +  $OUT ="   # Mod_maxminddb\n";
 +  return "   #disabled\n" unless ( ($modMaxminddb{'status'}||'disabled') eq 'enabled' ||  defined (${'httpd-admin'}{'ValidFromGeoIP'}) );
 +  $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ?  'yes' : 'no';
 + if (($haveSSL eq 'yes') && ($port eq $httpsPort) ) {
 + $OUT .="   <Location /server-manager>
++        Require ip $localAccess $externalSSLAccess
 +        Require env AllowCountries
 +   </Location>\n" if (-d "/etc/e-smith/web/panels/manager/" && (${'httpd-admin'}{'GeoIPManager'} || 'enabled' ) eq 'enabled' );
 + $OUT .="   <Location /server-common>
++        Require ip $localAccess $externalSSLAccess
 +        Require env AllowCountries
 +   </Location>\n" if ( (${'httpd-admin'}{'GeoIPManager'} || 'enabled' ) eq 'enabled' || (${'httpd-admin'}{'GeoIPUser'} || 'enabled' ) eq 'enabled' || (${'httpd-admin'}{'GeoIPPassword'} || 'enabled' ) eq 'enabled') ;
 + $OUT .="   <Location /user-manager>
++        Require ip $localAccess $externalSSLAccess
 +        Require env AllowCountries
 +   </Location>\n" if (-d "/etc/e-smith/web/panels/user/" && (${'httpd-admin'}{'GeoIPUser'} || 'enabled' ) eq 'enabled' );
 + $OUT .="   <Location /user-password>
++        Require ip $localAccess $externalSSLAccess
 +        Require env AllowCountries
 +   </Location>\n" if (-d "/etc/e-smith/web/panels/password/" && (${'httpd-admin'}{'GeoIPPassword'} || 'enabled' ) eq 'enabled' );
 + }