check which file exists

Signed-off-by: Daniel Hansson <[email protected]>
nextcloud · Sep 22, 2024 · f030a55 · f030a55
1 parent 7c222dc
commit f030a55
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/network/geoblock.sh b/network/geoblock.sh
@@ -221,10 +221,19 @@ fi
 cat << GEOBLOCKCONF_CREATE > "$GEOBLOCK_MOD_CONF"
 <IfModule mod_maxminddb.c>
   MaxMindDBEnable On
-  MaxMindDBFile DB $GEOBLOCK_DIR/GeoLite2-Country.mmdb
 
-  MaxMindDBEnv MM_CONTINENT_CODE DB/continent/code
-  MaxMindDBEnv MM_COUNTRY_CODE DB/country/iso_code
+  # Check for IPinfo mmdb
+  <IfFile "$GEOBLOCK_DIR/IPInfo-Country.mmdb">
+    MaxMindDBFile DB $GEOBLOCK_DIR/IPInfo-Country.mmdb
+    MaxMindDBEnv MM_CONTINENT_CODE DB/continent
+    MaxMindDBEnv MM_COUNTRY_CODE DB/country
+  </IfFile>
+  # Check for Maxmind mmdb
+  <IfFile "$GEOBLOCK_DIR/GeoLite2-Country.mmdb">
+    MaxMindDBFile DB $GEOBLOCK_DIR/GeoLite2-Country.mmdb
+    MaxMindDBEnv MM_CONTINENT_CODE DB/continent/code
+    MaxMindDBEnv MM_COUNTRY_CODE DB/country/iso_code
+  </IfFile>
 </IfModule>
 
   # Geoblock rules