/[smecontribs]/rpms/smeserver-mod_maxminddb/contribs10/smeserver-mod_maxminddb-1.1.0-bz12052-httpd24.patch
ViewVC logotype

Diff of /rpms/smeserver-mod_maxminddb/contribs10/smeserver-mod_maxminddb-1.1.0-bz12052-httpd24.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.2 by jpp, Mon Jul 25 04:59:43 2022 UTC Revision 1.3 by jpp, Mon Jul 25 07:09:36 2022 UTC
# Line 27  diff -Nur --no-dereference smeserver-mod Line 27  diff -Nur --no-dereference smeserver-mod
27  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  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  --- 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  +++ 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 @@  @@ -0,0 +1,23 @@
31  +{  +{
32  +  $OUT ="   # Mod_maxminddb\n";  +  $OUT ="   # Mod_maxminddb\n";
33  +  return "   #disabled\n" unless ( ($modMaxminddb{'status'}||'disabled') eq 'enabled' ||  defined (${'httpd-admin'}{'ValidFromGeoIP'}) );  +  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';  +  $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ?  'yes' : 'no';
35  + if (($haveSSL eq 'yes') && ($port eq $httpsPort) ) {  + if (($haveSSL eq 'yes') && ($port eq $httpsPort) ) {
36  + $OUT .="   <Location /server-manager>  + $OUT .="   <Location /server-manager>
37    +        Require ip $localAccess $externalSSLAccess
38  +        Require env AllowCountries  +        Require env AllowCountries
39  +   </Location>\n" if (-d "/etc/e-smith/web/panels/manager/" && (${'httpd-admin'}{'GeoIPManager'} || 'enabled' ) eq 'enabled' );  +   </Location>\n" if (-d "/etc/e-smith/web/panels/manager/" && (${'httpd-admin'}{'GeoIPManager'} || 'enabled' ) eq 'enabled' );
40  + $OUT .="   <Location /server-common>  + $OUT .="   <Location /server-common>
41    +        Require ip $localAccess $externalSSLAccess
42  +        Require env AllowCountries  +        Require env AllowCountries
43  +   </Location>\n" if ( (${'httpd-admin'}{'GeoIPManager'} || 'enabled' ) eq 'enabled' || (${'httpd-admin'}{'GeoIPUser'} || 'enabled' ) eq 'enabled' || (${'httpd-admin'}{'GeoIPPassword'} || 'enabled' ) eq 'enabled') ;  +   </Location>\n" if ( (${'httpd-admin'}{'GeoIPManager'} || 'enabled' ) eq 'enabled' || (${'httpd-admin'}{'GeoIPUser'} || 'enabled' ) eq 'enabled' || (${'httpd-admin'}{'GeoIPPassword'} || 'enabled' ) eq 'enabled') ;
44  + $OUT .="   <Location /user-manager>  + $OUT .="   <Location /user-manager>
45    +        Require ip $localAccess $externalSSLAccess
46  +        Require env AllowCountries  +        Require env AllowCountries
47  +   </Location>\n" if (-d "/etc/e-smith/web/panels/user/" && (${'httpd-admin'}{'GeoIPUser'} || 'enabled' ) eq 'enabled' );  +   </Location>\n" if (-d "/etc/e-smith/web/panels/user/" && (${'httpd-admin'}{'GeoIPUser'} || 'enabled' ) eq 'enabled' );
48  + $OUT .="   <Location /user-password>  + $OUT .="   <Location /user-password>
49    +        Require ip $localAccess $externalSSLAccess
50  +        Require env AllowCountries  +        Require env AllowCountries
51  +   </Location>\n" if (-d "/etc/e-smith/web/panels/password/" && (${'httpd-admin'}{'GeoIPPassword'} || 'enabled' ) eq 'enabled' );  +   </Location>\n" if (-d "/etc/e-smith/web/panels/password/" && (${'httpd-admin'}{'GeoIPPassword'} || 'enabled' ) eq 'enabled' );
52  + }  + }

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed