From 52e82728c1275ec7de57aa5b1dd3b3740fd2b264 Mon Sep 17 00:00:00 2001 From: Cullum Smith Date: Mon, 4 Nov 2024 22:30:06 -0500 Subject: misc fixes --- files/usr/local/libexec/poudriere-cron.pkg_repository | 2 +- scripts/hostclass/smtp_server/10-rspamd | 3 ++- scripts/os/freebsd/10-sysctls | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/files/usr/local/libexec/poudriere-cron.pkg_repository b/files/usr/local/libexec/poudriere-cron.pkg_repository index dce1830..ce20ced 100644 --- a/files/usr/local/libexec/poudriere-cron.pkg_repository +++ b/files/usr/local/libexec/poudriere-cron.pkg_repository @@ -19,7 +19,7 @@ for jail in "$@"; do poudriere bulk -j "$jail" -f /usr/local/etc/poudriere.d/idm-pkglist -p "$ports_tree" -z idm > /dev/null poudriere pkgclean -j "$jail" -f /usr/local/etc/poudriere.d/idm-pkglist -p "$ports_tree" -z idm -y > /dev/null poudriere bulk -j "$jail" -f /usr/local/etc/poudriere.d/pkglist -p "$ports_tree" > /dev/null - poudriere pkgclean -j "$jail" -f /usr/local/etc/poudriere.d/pkglist -p "$ports_tree" -y > /dev/null + poudriere pkgclean -j "$jail" -f /usr/local/etc/poudriere.d/pkglist -p "$ports_tree" -y > /dev/null 2>&1 done poudriere distclean -p "$ports_tree" -a -y > /dev/null diff --git a/scripts/hostclass/smtp_server/10-rspamd b/scripts/hostclass/smtp_server/10-rspamd index 215788b..4cc66c6 100644 --- a/scripts/hostclass/smtp_server/10-rspamd +++ b/scripts/hostclass/smtp_server/10-rspamd @@ -29,7 +29,8 @@ pkg install -y \ postfix \ redis \ rspamd \ - nginx + nginx \ + ca_root_nss # Create ZFS dataset for Redis DBs. create_dataset -o "mountpoint=${redis_data_dir}" "${state_dataset}/redis" diff --git a/scripts/os/freebsd/10-sysctls b/scripts/os/freebsd/10-sysctls index b07a46c..1f5d70f 100644 --- a/scripts/os/freebsd/10-sysctls +++ b/scripts/os/freebsd/10-sysctls @@ -34,7 +34,7 @@ set_sysctl \ net.inet.tcp.msl=2500 \ net.inet.tcp.mssdflt=1448 \ net.inet.tcp.nolocaltimewait=1 \ - net.inet.tcp.path_mtu_discovery=0 \ + net.inet.tcp.path_mtu_discovery=1 \ net.inet.tcp.recvbuf_max="$tcp_buffer_size" \ net.inet.tcp.recvspace=65536 \ net.inet.tcp.sendbuf_inc=65536 \ @@ -70,8 +70,8 @@ if [ "$BOXCONF_VIRTUALIZATION_TYPE" != jail ]; then security.bsd.see_other_gids="$see_other_uids" \ security.bsd.see_other_uids="$see_other_uids" \ security.bsd.unprivileged_read_msgbuf=0 \ - vfs.nfsd.enable_locallocks=0 \ - vfs.nfsd.issue_delegations=1 \ + vfs.nfsd.enable_locallocks=1 \ + vfs.nfsd.issue_delegations=0 \ vfs.zfs.min_auto_ashift=12 # FreeBSD automatically scales kern.maxfilesperproc with the amount of memory. -- cgit v1.2.3