smeserver-mod_maxminddb/contribs10/smeserver-mod_maxminddb-1.1.0-bz12052-httpd24.patch

diff -Nur --no-dereference smeserver-mod_maxminddb-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/79externalSSLAccessStringGeoip smeserver-mod_maxminddb-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/79externalSSLAccessStringGeoip
--- smeserver-mod_maxminddb-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/79externalSSLAccessStringGeoip       2022-07-24 01:10:54.985000000 -0400
+++ smeserver-mod_maxminddb-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/79externalSSLAccessStringGeoip   2022-07-25 00:58:53.699000000 -0400
@@ -1,3 +1,4 @@
+
 {
     #---------------------------------------------------------------------
     # Grab ValidFromGeoIP access list property of httpd-admin
@@ -5,11 +6,12 @@
     # this list, as well as local networks.
     #---------------------------------------------------------------------
     
-    $OUT = '';
+    $OUT = '# Mod_maxminddb variable definition';
 
     my $validFromGeoIP = ${'httpd-admin'}{'ValidFromGeoIP'};
-    return unless defined $validFromGeoIP;
+    return "#disabled\n" unless (defined $validFromGeoIP && ($modMaxminddb{'status'}||'disabled') eq 'enabled' );
     $validFromGeoIP =~ s/,/|/g;
-    $OUT .= "        SetEnvIf MM_COUNTRY_CODE ^($validFromGeoIP) AllowCountries\n";
-    $externalSSLAccess .= " env=AllowCountries";
-}
+    $OUT .= "\nSetEnvIf MM_COUNTRY_CODE ^($validFromGeoIP) AllowCountries\n";
+    # prior apache 2.4  you could combine ip and env by doing  $externalSSLAccess .= ' env=AllowCountries';
+    # now you should add "Require env AllowCountries" in Files, Directory or Location section
+ }
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 @@
+{
+  $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 env AllowCountries
+   </Location>\n" if (-d "/etc/e-smith/web/panels/manager/" && (${'httpd-admin'}{'GeoIPManager'} || 'enabled' ) eq 'enabled' );
+ $OUT .="   <Location /server-common>
+        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 env AllowCountries
+   </Location>\n" if (-d "/etc/e-smith/web/panels/user/" && (${'httpd-admin'}{'GeoIPUser'} || 'enabled' ) eq 'enabled' );
+ $OUT .="   <Location /user-password>
+        Require env AllowCountries
+   </Location>\n" if (-d "/etc/e-smith/web/panels/password/" && (${'httpd-admin'}{'GeoIPPassword'} || 'enabled' ) eq 'enabled' );
+ }
+}
1	jpp	1.1	diff -Nur --no-dereference smeserver-mod_maxminddb-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/79externalSSLAccessStringGeoip smeserver-mod_maxminddb-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/79externalSSLAccessStringGeoip
2			--- smeserver-mod_maxminddb-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/79externalSSLAccessStringGeoip 2022-07-24 01:10:54.985000000 -0400
3	jpp	1.2	+++ smeserver-mod_maxminddb-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/79externalSSLAccessStringGeoip 2022-07-25 00:58:53.699000000 -0400
4			@@ -1,3 +1,4 @@
5			+
6			{
7			#---------------------------------------------------------------------
8			# Grab ValidFromGeoIP access list property of httpd-admin
9			@@ -5,11 +6,12 @@
10			# this list, as well as local networks.
11			#---------------------------------------------------------------------
12
13			- $OUT = '';
14			+ $OUT = '# Mod_maxminddb variable definition';
15
16			my $validFromGeoIP = ${'httpd-admin'}{'ValidFromGeoIP'};
17			- return unless defined $validFromGeoIP;
18			+ return "#disabled\n" unless (defined $validFromGeoIP && ($modMaxminddb{'status'}\|\|'disabled') eq 'enabled' );
19	jpp	1.1	$validFromGeoIP =~ s/,/\|/g;
20	jpp	1.2	- $OUT .= " SetEnvIf MM_COUNTRY_CODE ^($validFromGeoIP) AllowCountries\n";
21	jpp	1.1	- $externalSSLAccess .= " env=AllowCountries";
22			-}
23	jpp	1.2	+ $OUT .= "\nSetEnvIf MM_COUNTRY_CODE ^($validFromGeoIP) AllowCountries\n";
24			+ # prior apache 2.4 you could combine ip and env by doing $externalSSLAccess .= ' env=AllowCountries';
25			+ # now you should add "Require env AllowCountries" in Files, Directory or Location section
26	jpp	1.1	+ }
27	jpp	1.2	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
28			--- 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
29			+++ 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
30			@@ -0,0 +1,19 @@
31			+{
32			+ $OUT =" # Mod_maxminddb\n";
33			+ return " #disabled\n" unless ( ($modMaxminddb{'status'}\|\|'disabled') eq 'enabled' \|\| defined (${'httpd-admin'}{'ValidFromGeoIP'}) );
34			+ $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no';
35			+ if (($haveSSL eq 'yes') && ($port eq $httpsPort) ) {
36			+ $OUT .=" <Location /server-manager>
37			+ Require env AllowCountries
38			+ </Location>\n" if (-d "/etc/e-smith/web/panels/manager/" && (${'httpd-admin'}{'GeoIPManager'} \|\| 'enabled' ) eq 'enabled' );
39			+ $OUT .=" <Location /server-common>
40			+ Require env AllowCountries
41			+ </Location>\n" if ( (${'httpd-admin'}{'GeoIPManager'} \|\| 'enabled' ) eq 'enabled' \|\| (${'httpd-admin'}{'GeoIPUser'} \|\| 'enabled' ) eq 'enabled' \|\| (${'httpd-admin'}{'GeoIPPassword'} \|\| 'enabled' ) eq 'enabled') ;
42			+ $OUT .=" <Location /user-manager>
43			+ Require env AllowCountries
44			+ </Location>\n" if (-d "/etc/e-smith/web/panels/user/" && (${'httpd-admin'}{'GeoIPUser'} \|\| 'enabled' ) eq 'enabled' );
45			+ $OUT .=" <Location /user-password>
46			+ Require env AllowCountries
47			+ </Location>\n" if (-d "/etc/e-smith/web/panels/password/" && (${'httpd-admin'}{'GeoIPPassword'} \|\| 'enabled' ) eq 'enabled' );
48			+ }
49			+}