From 4124a179d85025273a1ed8f35c91d9122458acc6 Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Thu, 21 Mar 2024 10:31:13 -0700
Subject: [PATCH] haraka: conditionally add geoip fs mount

---
 .gitlab-ci.yml      | 10 +++++++++-
 provision/haraka.sh | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdf6cb13..ac64cdb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 image: auchida/freebsd:latest
-# timeout: 90
 
 # Instructions for creating your own test runner:
 # https://github.com/msimerson/Mail-Toaster-6/wiki/Develop-CI-Testing/
@@ -20,6 +19,7 @@ stages:
 
 host_setup:
   stage: host_setup
+  timeout: 5m
   script:
     - sh test/get_jail_ip.sh
     - echo "export TOASTER_HOSTNAME=`hostname`" >> mail-toaster.conf
@@ -33,6 +33,7 @@ host_setup:
 
 dns:
   stage: dns
+  timeout: 5m
   script:
     - sh provision/dns.sh
 # enabling caching doubles gitlab runner builds (~30 to 60m)
@@ -43,15 +44,18 @@ dns:
 
 db:
   stage: db
+  timeout: 5m
   script:
     - sh provision/mysql.sh
     - sh provision/redis.sh
+    # - sh provision/geoip.sh
   tags:
     - freebsd
     - ssh
 
 mailstore:
   stage: mailstore
+  timeout: 10m
   script:
     - sh provision/vpopmail.sh
     - sh provision/dovecot.sh
@@ -61,6 +65,7 @@ mailstore:
 
 mta:
   stage: mta
+  timeout: 10m
   script:
     - sh provision/clamav.sh
     - sh provision/dcc.sh
@@ -72,6 +77,7 @@ mta:
 
 webmail:
   stage: webmail
+  timeout: 10m
   script:
     - sh provision/haproxy.sh
     - sh provision/webmail.sh
@@ -84,6 +90,7 @@ webmail:
 
 extras:
   stage: extras
+  timeout: 10m
   script:
     - sh provision/spamassassin.sh
 #   - sh provision/elasticsearch.sh
@@ -94,6 +101,7 @@ extras:
 
 test:
   stage: test
+  timeout: 5m
   script:
     - sh provision/mailtest.sh
   tags:
diff --git a/provision/haraka.sh b/provision/haraka.sh
index 7ad9af8e..7a11eef1 100755
--- a/provision/haraka.sh
+++ b/provision/haraka.sh
@@ -7,7 +7,7 @@ set -e
 export JAIL_START_EXTRA="devfs_ruleset=7"
 export JAIL_CONF_EXTRA="
 		devfs_ruleset = 7;"
-export JAIL_FSTAB="$ZFS_DATA_MNT/geoip/db $ZFS_JAIL_MNT/haraka/usr/local/share/GeoIP nullfs rw 0 0"
+export JAIL_FSTAB=""
 
 HARAKA_CONF="$ZFS_DATA_MNT/haraka/config"
 
@@ -45,6 +45,14 @@ install_geoip_dbs()
 		return
 	fi
 
+	local _fstab="$ZFS_DATA_MNT/haraka/etc/fstab"
+	if ! grep -qs GeoIP "$_fstab"; then
+		tell_status "adding GeoIP volumne to $_fstab"
+		tee -a "$_fstab" <<EO_GEOIP
+$ZFS_DATA_MNT/geoip/db $ZFS_JAIL_MNT/haraka/usr/local/share/GeoIP nullfs rw 0 0"
+EO_GEOIP
+	fi
+
 	if ! grep -qs ^geoip "$HARAKA_CONF/plugins"; then
 		tell_status "enabling Haraka geoip plugin"
 		sed -i.bak -e '/^# geoip/ s/# //' "$HARAKA_CONF/plugins"