misc updates

6 files changed, 11 insertions, 6 deletions

diff --git a/files/usr/local/etc/dovecot/dovecot-ldap-userdb.conf.ext.imap_server b/files/usr/local/etc/dovecot/dovecot-ldap-userdb.conf.ext.imap_server
index 6a7ce4e..11ce97f 100644
--- a/files/usr/local/etc/dovecot/dovecot-ldap-userdb.conf.ext.imap_server
+++ b/files/usr/local/etc/dovecot/dovecot-ldap-userdb.conf.ext.imap_server
@@ -11,7 +11,7 @@ user_attrs = \\
   =uid=${dovecot_vmail_uid}, \\
   =gid=${dovecot_vmail_uid}, \\
   =home=${dovecot_vmail_dir}/%{ldap:uid}, \\
-  mailQuota=quota_rule=\*:storage=%{ldap:mailQuota}
+  mailQuota=quota_rule=*:storage=%{ldap:mailQuota}
 
 iterate_attrs = uid=user
 iterate_filter = (mailAddress=*)
diff --git a/files/usr/local/sbin/jailctl.freebsd_hypervisor b/files/usr/local/sbin/jailctl.freebsd_hypervisor
index 8719297..99578bd 100644
--- a/files/usr/local/sbin/jailctl.freebsd_hypervisor
+++ b/files/usr/local/sbin/jailctl.freebsd_hypervisor
@@ -561,7 +561,7 @@ Options:
 
   [ $# -eq 0 ] || cmd::usage 'too many arguments'
 
-  { [ $terse = true ] || echo 'JAIL STATUS'
+  { [ $terse = true ] || echo 'JAIL STATUS VERSION'
     for file in "$JAIL_HOME"/*/jail.conf; do
       [ -e "$file" ] || continue
 
@@ -575,7 +575,7 @@ Options:
         else
           status=stopped
         fi
-        printf '%s %s\n' "$name" "$status"
+        printf '%s %s %s\n' "$name" "$status" "$("${JAIL_HOME}/${name}/os/bin/freebsd-version" 2>/dev/null)"
       fi
     done
   } | column -t
@@ -854,6 +854,8 @@ cmd::show(){
 
   jail::exists "$jail" || die "no such jail: ${jail}"
 
+  printf -- '---------------------------- FREEBSD VERSION -----------------------------\n'
+  "${JAIL_HOME}/${jail}/os/bin/freebsd-version" ||:
   printf -- '------------------------- JAIL CONFIGURATION -------------------------\n'
   cat "${JAIL_HOME}/${jail}/jail.conf"
   printf -- '\n---------------------------- ZFS DATASET -----------------------------\n'
diff --git a/scripts/common/30-dns b/scripts/common/30-dns
index e2d5ad6..1df12ef 100644
--- a/scripts/common/30-dns
+++ b/scripts/common/30-dns
@@ -3,6 +3,9 @@
 # For IDM servers, the resolver is localhost. In that case, we delay copying
 # this file until the IDM stack is fully up and running.
 if [ "$BOXCONF_HOSTCLASS" = idm_server ]; then
+  if [ "${idm_bootstrap:-}" = true ]; then
+    printf 'nameserver %s\n' "$bootstrap_resolvers" > /etc/resolv.conf
+  fi
   return
 fi
 
diff --git a/scripts/hostclass/imap_server/10-solr b/scripts/hostclass/imap_server/10-solr
index a30d6fd..7d89ea2 100644
--- a/scripts/hostclass/imap_server/10-solr
+++ b/scripts/hostclass/imap_server/10-solr
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${solr_version:='9.7.0'}
+: ${solr_version:='9.8.1'}
 
 solr_uid=161
 solr_user=solr
diff --git a/scripts/hostclass/imap_server/20-tika b/scripts/hostclass/imap_server/20-tika
index 3b4aa47..2cde126 100644
--- a/scripts/hostclass/imap_server/20-tika
+++ b/scripts/hostclass/imap_server/20-tika
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${tika_version:='2.9.2'}
+: ${tika_version:='3.1.0'}
 : ${tika_uid:='787'}
 
 tika_user=tika
diff --git a/vars/os/freebsd b/vars/os/freebsd
index 90367bf..ff597ff 100644
--- a/vars/os/freebsd
+++ b/vars/os/freebsd
@@ -18,7 +18,7 @@ nfscbd_port=7745
 nginx_user=www
 nginx_conf_dir=/usr/local/etc/nginx
 nslcd_user=nslcd
-php_version=82
+php_version=83
 postgresql_version=16
 python_version=311
 saslauthd_runtime_dir=/var/run/saslauthd