fixes

14 files changed, 52 insertions, 21 deletions

diff --git a/files/usr/local/etc/rc.d/solr.imap_server b/files/usr/local/etc/rc.d/solr.imap_server
index 70cc324..4a71c57 100644
--- a/files/usr/local/etc/rc.d/solr.imap_server
+++ b/files/usr/local/etc/rc.d/solr.imap_server
@@ -53,8 +53,8 @@ ${solr_java_home}/bin/java \
 -XX:+CrashOnOutOfMemoryError \
 -Djava.awt.headless=true \
 -Dlog4j.configurationFile=${solr_log4j_config_file} \
--Djetty.host=${solr_host} \
--Djetty.port=${solr_port} \
+-Dsolr.host.bind=${solr_host} \
+-Dsolr.port.listen=${solr_port} \
 -Djetty.home=${solr_install_dir}/server \
 -Dsolr.autoSoftCommit.maxTime=${solr_softcommit_ms} \
 -Dsolr.solr.home=${solr_data_dir} \
diff --git a/files/usr/local/sbin/jailctl.freebsd_hypervisor b/files/usr/local/sbin/jailctl.freebsd_hypervisor
index a0f5741..a855445 100644
--- a/files/usr/local/sbin/jailctl.freebsd_hypervisor
+++ b/files/usr/local/sbin/jailctl.freebsd_hypervisor
@@ -539,7 +539,7 @@ cmd::exec(){
 
   jail::exists "$jail" || die "no such jail: ${jail}"
 
-  jail::exec "$jail" "$@"
+  jexec "$jail" "$@"
 }
 
 cmd::list(){
@@ -840,7 +840,7 @@ cmd::shell(){
   jail::exists "$jail"  || die "no such jail: ${jail}"
   jail::running "$jail" || die "jail not running: ${jail}"
 
-  jail::exec "$jail" /bin/sh
+  jexec -l "$jail" /bin/sh
 }
 
 cmd::show(){
@@ -1025,11 +1025,6 @@ interface::epair::derive_name(){
   fi
 }
 
-jail::exec() {
-  local jail=$1; shift
-  jexec -l "$jail" "$@"
-}
-
 jail::exists(){
   test -f "${JAIL_HOME}/${1}/jail.conf"
 }
@@ -1082,9 +1077,11 @@ template::release2name(){
 
 template::update_release(){
   # Run freebsd-update within a the given template and take a fresh snapshot.
-  local template=$1 snapshot
+  local template=$1 snapshot release
+
+  release=$("${JAIL_HOME}/templates/${template}/bin/freebsd-version" -u | sed 's/-p[0-9]*$//')
 
-  PAGER=/bin/cat freebsd-update -b "${JAIL_HOME}/templates/${template}" --not-running-from-cron fetch install
+  PAGER=/bin/cat freebsd-update -b "${JAIL_HOME}/templates/${template}" --not-running-from-cron --currently-running "$release" fetch install
 
   snapshot=$("${JAIL_HOME}/templates/${template}/bin/freebsd-version")
   template::exists "${template}@${snapshot}" || zfs snapshot "${JAIL_DATASET}/templates/${template}@${snapshot}"
diff --git a/files/var/db/postgres/data17/pg_hba.conf.postgresql_server b/files/var/db/postgres/data18/pg_hba.conf.postgresql_server
index 4810eb9..4810eb9 100644
--- a/files/var/db/postgres/data17/pg_hba.conf.postgresql_server
+++ b/files/var/db/postgres/data18/pg_hba.conf.postgresql_server
diff --git a/files/var/db/postgres/data17/pg_ident.conf.postgresql_server b/files/var/db/postgres/data18/pg_ident.conf.postgresql_server
index 1076453..1076453 100644
--- a/files/var/db/postgres/data17/pg_ident.conf.postgresql_server
+++ b/files/var/db/postgres/data18/pg_ident.conf.postgresql_server
diff --git a/files/var/db/postgres/data17/postgresql.conf.postgresql_server b/files/var/db/postgres/data18/postgresql.conf.postgresql_server
index 55874e7..55874e7 100644
--- a/files/var/db/postgres/data17/postgresql.conf.postgresql_server
+++ b/files/var/db/postgres/data18/postgresql.conf.postgresql_server
diff --git a/lib/40-os b/lib/40-os
index c10da24..7949212 100644
--- a/lib/40-os
+++ b/lib/40-os
@@ -49,6 +49,28 @@ x
   rm -f /boot/loader.conf.bak
 }
 
+set_device_hint(){
+  [ "$BOXCONF_OS" = freebsd ] || bug 'set_device_hint can only be used on FreeBSD'
+
+  while [ $# -gt 0 ]; do
+    grep -qxF "${1%%=*}=\"${1#*=}\"" /boot/device.hints || BOXCONF_NEED_REBOOT=true
+    sed -i.bak "/^${1%%=*}=/{
+h
+s|=.*|=\"${1#*=}\"|
+}
+\${
+x
+/^\$/{
+s||${1%%=*}=\"${1#*=}\"|
+H
+}
+x
+}" /boot/device.hints
+    shift
+  done
+  rm -f /boot/device.hints.bak
+}
+
 load_kernel_module(){
   # Ensure the given kernel modules are loaded.
   # $1..$N = module names
diff --git a/scripts/hostclass/icinga_server/10-icingadb b/scripts/hostclass/icinga_server/10-icingadb
index 1004d72..349e5f8 100644
--- a/scripts/hostclass/icinga_server/10-icingadb
+++ b/scripts/hostclass/icinga_server/10-icingadb
@@ -58,6 +58,8 @@ if ! icinga_psql -c 'SELECT 1 FROM icingadb_schema'; then
   icinga_psql -f /usr/local/share/examples/icingadb/schema/pgsql/schema.sql
 fi
 
+icinga_psql -c "CREATE EXTENSION IF NOT EXISTS citext;"
+
 # Generate icinga database configuration.
 install_template -g "${icinga_local_user}" -m 0640 "${icingadb_conf_dir}/config.yml"
 
diff --git a/scripts/hostclass/idm_server/40-unbound b/scripts/hostclass/idm_server/40-unbound
index d38194f..b672960 100644
--- a/scripts/hostclass/idm_server/40-unbound
+++ b/scripts/hostclass/idm_server/40-unbound
@@ -19,7 +19,7 @@ unbound_whitelist_file="${unbound_conf_dir}/whitelist"
 : ${unbound_threads:="$nproc"}
 
 # Install unbound recursive resolver.
-pkg install -y unbound
+pkg install -y unbound ca_root_nss
 
 # Generate unbound configuration.
 install_directory -m 0755 -o "$unbound_user" "$unbound_blocklist_dir"
diff --git a/scripts/hostclass/imap_server/10-solr b/scripts/hostclass/imap_server/10-solr
index fe0850c..c7bd080 100644
--- a/scripts/hostclass/imap_server/10-solr
+++ b/scripts/hostclass/imap_server/10-solr
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${solr_version:='9.10.0'}
+: ${solr_version:='10.0.0'}
 
 solr_uid=161
 solr_user=solr
diff --git a/scripts/hostclass/imap_server/20-tika b/scripts/hostclass/imap_server/20-tika
index d282214..1491461 100644
--- a/scripts/hostclass/imap_server/20-tika
+++ b/scripts/hostclass/imap_server/20-tika
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${tika_version:='3.2.3'}
+: ${tika_version:='3.3.0'}
 : ${tika_uid:='787'}
 
 tika_user=tika
diff --git a/scripts/hostclass/pkg_repository b/scripts/hostclass/pkg_repository
index dedd7d7..2094552 100644
--- a/scripts/hostclass/pkg_repository
+++ b/scripts/hostclass/pkg_repository
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 : ${poudriere_versions:='15.0-RELEASE'}
-: ${poudriere_idm_versions:='14.3-RELEASE'}
+: ${poudriere_idm_versions:='14.4-RELEASE'}
 : ${poudriere_jobs:="$nproc"}
 : ${poudriere_dataset:="${state_dataset:-zroot}"}
 : ${poudriere_make_jobs_number:='4'}
@@ -87,8 +87,8 @@ for version in $poudriere_versions; do
   [ -d "${poudriere_data_dir}/jails/${jail}" ] || poudriere jail -c -j "$jail" -v "$version"
 
   poudriere jail -u  -j "$jail"
-  poudriere bulk -v  -j "$jail" -f "${poudriere_conf_dir}/pkglist"     -p latest
-  poudriere pkgclean -j "$jail" -f "${poudriere_conf_dir}/pkglist"     -p latest -y
+  poudriere bulk -v  -j "$jail" -f "${poudriere_conf_dir}/pkglist"     -p latest ||:
+  poudriere pkgclean -j "$jail" -f "${poudriere_conf_dir}/pkglist"     -p latest -y ||:
 
   install_directory -m 0755 "${poudriere_data_dir}/data/packages/${abi}"
   ln -snfv "../${jail}-latest" "${poudriere_data_dir}/data/packages/${abi}/latest"
@@ -101,8 +101,8 @@ for version in $poudriere_idm_versions; do
   [ -d "${poudriere_data_dir}/jails/${jail}" ] || poudriere jail -c -j "$jail" -v "$version"
 
   poudriere jail -u  -j "$jail"
-  poudriere bulk -v  -j "$jail" -f "${poudriere_conf_dir}/idm-pkglist" -p latest -z idm
-  poudriere pkgclean -j "$jail" -f "${poudriere_conf_dir}/idm-pkglist" -p latest -z idm -y
+  poudriere bulk -v  -j "$jail" -f "${poudriere_conf_dir}/idm-pkglist" -p latest -z idm ||:
+  poudriere pkgclean -j "$jail" -f "${poudriere_conf_dir}/idm-pkglist" -p latest -z idm -y ||:
 
   install_directory -m 0755 "${poudriere_data_dir}/data/packages/${abi}"
   ln -snfv "../${jail}-latest-idm" "${poudriere_data_dir}/data/packages/${abi}/latest-idm"
diff --git a/scripts/hostclass/ttrss_server b/scripts/hostclass/ttrss_server
index 8a40273..a690298 100644
--- a/scripts/hostclass/ttrss_server
+++ b/scripts/hostclass/ttrss_server
@@ -81,7 +81,7 @@ git -C "$ttrss_repo_dir" pull --ff-only
 git -C "$ttrss_repo_dir" switch "$ttrss_branch"
 
 # Fix permissions on writable directories.
-for dir in lock cache feed-icons ; do
+for dir in lock cache plugins.local templates.local themes.local; do
   chmod 755 "${ttrss_repo_dir}/${dir}"
   chown -R "${nginx_user}:${nginx_user}" "${ttrss_repo_dir}/${dir}"
 done
diff --git a/scripts/hostname/rlaptop1 b/scripts/hostname/rlaptop1
index b6e127f..e952583 100644
--- a/scripts/hostname/rlaptop1
+++ b/scripts/hostname/rlaptop1
@@ -1,3 +1,13 @@
 #!/bin/sh
 
 set_loader_conf "exec=copy_staging enable"
+
+set_device_hint \
+  hint.hdaa.0.nid19.config="as=1 seq=0" \
+  hint.hdaa.0.nid20.config="as=1 seq=2" \
+  hint.hdaa.0.nid23.config="as=1 seq=1" \
+  hint.hdaa.0.nid24.config="as=1 seq=2" \
+  hint.hdaa.0.nid26.config="as=1 seq=1" \
+  hint.hdaa.0.nid27.config="as=1 seq=2" \
+  hint.hdaa.0.nid30.config="as=1 seq=1" \
+  hint.hdaa.0.nid33.config="as=1 seq=15 device=Headphones"
diff --git a/vars/os/freebsd b/vars/os/freebsd
index d56b2c1..6a67a10 100644
--- a/vars/os/freebsd
+++ b/vars/os/freebsd
@@ -21,7 +21,7 @@ nginx_conf_dir=/usr/local/etc/nginx
 node_version=22
 nslcd_user=nslcd
 php_version=84
-postgresql_version=17
+postgresql_version=18
 python_version=311
 saslauthd_runtime_dir=/var/run/saslauthd
 saslauthd_user=cyrus