May 1, 2025 update

configs/boot/loader.conf

@@ -103,3 +103,16 @@ vfs.zfs.vdev.cache.max=134217728
 # https://lists.freebsd.org/pipermail/freebsd-bugs/2013-April/052301.html
 # my 8TB's don't support NCQ TRIM
 vfs.unmapped_buf_allowed=0
+
+#https://forums.freebsd.org/threads/bhyve-passthrough-usb-controller.67760/#post-431968
+#https://forums.freebsd.org/threads/usb-passthrough-bhyve-windows-10-guest.86669/
+#vmm_load="YES"
+#pptdevs="0/20/0"
+# need another USB PCIe card in the server if I want to pass USB to HomeAssistant
+
+# kldload cpuctl
+#cpuctl_load="YES"
+
+#wireguard
+#https://forums.freebsd.org/threads/wireguard-in-jail-with-kernel-support.86791/
+if_wg_load="YES"

configs/etc/ctl.conf

@@ -4,26 +4,6 @@ portal-group pg0 {
 	listen [::]
 }
 
-target iqn.nas.ahlawat.com:f11 {
-#	auth-group no-authentication
-	portal-group pg0
-    chap user secretsecret
-	lun 0 {
-		path /dev/zvol/ship/raw/FreeBSD11
-		size 128G
-	}
-}
-
-target iqn.nas.ahlawat.com:f12 {
-#	auth-group no-authentication
-	portal-group pg0
-    chap user secretsecret
-	lun 0 {
-		path /dev/zvol/ship/raw/FreeBSD12
-		size 128G
-	}
-}
-
 target iqn.nas.ahlawat.com:f13 {
 #	auth-group no-authentication
 	portal-group pg0
@@ -34,16 +14,6 @@ target iqn.nas.ahlawat.com:f13 {
 	}
 }
 
-target iqn.nas.ahlawat.com:f12p {
-#	auth-group no-authentication
-	portal-group pg0
-    chap user secretsecret
-	lun 0 {
-		path /dev/zvol/ship/raw/FreeBSD12p
-		size 128G
-	}
-}
-
 target iqn.nas.ahlawat.com:f13p {
 #	auth-group no-authentication
 	portal-group pg0

configs/etc/defaults/devfs.rules

@@ -13,7 +13,6 @@
 # references must include a dollar sign '$' in front of the
 # name to be expanded properly.
 #
-# $FreeBSD: releng/12.3/sbin/devfs/devfs.rules 338204 2018-08-22 15:55:23Z brd $
 #
 
 # Very basic and secure ruleset: Hide everything.
@@ -87,6 +86,12 @@ add include $devfsrules_unhide_login
 add path fuse unhide
 add path zfs unhide
 add path 'bpf*' unhide
+add path 'md*' unhide
+add path 'md*' mode 0777
+
+[devfsrules_jail_vnet=5]
+add include $devfsrules_jail
+add path pf unhide
 
 # members of group uucp can access all usb and tty devices
 [usbrules=100]

configs/etc/defaults/periodic.conf

@@ -13,14 +13,13 @@
 # For a more detailed explanation of all the periodic.conf variables, please
 # refer to the periodic.conf(5) manual page.
 #
-# $FreeBSD: releng/12.3/usr.sbin/periodic/periodic.conf 370770 2021-10-07 19:46:04Z asomers $
 #
 
 # What files override these defaults ?
-periodic_conf_files="/etc/periodic.conf /etc/periodic.conf.local"
+periodic_conf_files="/etc/periodic.conf /etc/periodic.conf.local ${_localbase}/etc/periodic.conf"
 
-# periodic script dirs
+# periodic script dirs. _localbase is being set in /usr/sbin/periodic
-local_periodic="/usr/local/etc/periodic"
+local_periodic="${_localbase}/etc/periodic"
 
 # Max time to sleep to avoid causing congestion on download servers
 anticongestion_sleeptime=3600
@@ -32,6 +31,7 @@ anticongestion_sleeptime=3600
 # that output.  $daily_output might be set to /var/log/daily.log if you
 # wish to log the daily output and have the files rotated by newsyslog(8)
 #
+daily_diff_flags="-b -U 0"				# flags for diff output
 daily_output="root"					# user or /file
 daily_show_success="YES"				# scripts returning 0
 daily_show_info="YES"					# scripts returning 1
@@ -109,9 +109,6 @@ daily_accounting_compress="NO"				# Gzip rotated files
 daily_accounting_flags=-q				# Flags to /usr/sbin/sa
 daily_accounting_save=3					# How many files to save
 
-# 330.news
-daily_news_expire_enable="YES"				# Run news.expire
-
 # 400.status-disks
 daily_status_disks_enable="NO"				# Check disk status
 daily_status_disks_df_flags="-l -h"			# df(1) flags for check
@@ -182,6 +179,11 @@ daily_scrub_zfs_pools=""			# empty string selects all pools
 daily_scrub_zfs_default_threshold="35"		# days between scrubs
 #daily_scrub_zfs_${poolname}_threshold="35"	# pool specific threshold
 
+# 801.trim-zfs
+daily_trim_zfs_enable="NO"
+daily_trim_zfs_pools=""				# empty string selects all pools
+daily_trim_zfs_flags=""				# zpool-trim(8) flags
+
 # 999.local
 daily_local="/etc/daily.local"				# Local scripts
 
@@ -252,7 +254,7 @@ security_show_badconfig="NO"				# scripts returning 2
 # These options are used by the security periodic(8) scripts spawned in
 # daily and weekly 450.status-security.
 security_status_logdir="/var/log"			# Directory for logs
-security_status_diff_flags="-b -u"			# flags for diff output
+security_status_diff_flags="-b -U 0"			# flags for diff output
 
 # Each of the security_status_*_period options below can have one of the
 # following values:
@@ -301,6 +303,7 @@ security_status_ipfdenied_period="daily"
 # 520.pfdenied
 security_status_pfdenied_enable="YES"
 security_status_pfdenied_period="daily"
+security_status_pfdenied_additionalanchors=""
 
 # 550.ipfwlimit
 security_status_ipfwlimit_enable="YES"

configs/etc/exports

@@ -1,6 +1,8 @@
-V4: / -network=192.168.10.0 -mask=255.255.255.0
+V4: / -network=192.168.10.0/24
 /mnt/ship/pxe/FreeBSD11 -alldirs -maproot=root
 /mnt/ship/pxe/FreeBSD12 -alldirs -maproot=root
 /mnt/ship/pxe/FreeBSD13 -alldirs -maproot=root
 /mnt/ship/pxe/FreeBSD12p -alldirs -maproot=root
 /mnt/ship/pxe/FreeBSD13p -alldirs -maproot=root
+/mnt/ship/backup -alldirs -maproot=root
+/mnt/ship/r-automated -alldirs -maproot=root 192.168.10.13

configs/etc/freebsd-update.conf

@@ -1,4 +1,3 @@
-# $FreeBSD: releng/12.3/usr.sbin/freebsd-update/freebsd-update.conf 370439 2021-08-29 16:58:35Z kevans $
 
 # Trusted keyprint.  Changing this is a Bad Idea unless you've received
 # a PGP-signed email from <security-officer@FreeBSD.org> telling you to
@@ -15,7 +14,7 @@ ServerName update.FreeBSD.org
 #Components src world kernel
 
 # Example for updating the userland and the kernel source code only:
-#Components src world
+#Components src/base src/sys world
 Components world
 # manually run - git pull in /usr/src - before recompiling the kernel
 

configs/etc/hosts

@@ -1,4 +1,3 @@
-# $FreeBSD: releng/12.3/lib/libc/net/hosts 338729 2018-09-17 18:56:47Z brd $
 #
 # Host Database
 #
@@ -13,26 +12,31 @@
 ::1			localhost
 127.0.0.1		localhost
 
-192.168.0.10		nas nas.ahlawat.com
+192.168.0.10		nasv1 nasv1.ahlawat.com
-fd01::10	nas nas.ahlawat.com
+fd01::10	nasv1 nasv1.ahlawat.com
-192.168.10.10		nas nas.ahlawat.com
+192.168.8.10		nas nas.ahlawat.com
-fd0a::10	nas nas.ahlawat.com
+fd08::10	nas nas.ahlawat.com
-192.168.48.10		nas nas.ahlawat.com
+192.168.10.10		nasv10 nasv10.ahlawat.com
-2001:470:480a::10	nas nas.ahlawat.com
+fd0a::10	nasv10 nasv10.ahlawat.com
+192.168.48.10		nasv48 nasv48.ahlawat.com
+2001:470:480a::10	nasv48 nasv48.ahlawat.com
 
-10.1.0.193 crucible.ad.inseego.com i01bitcru00.ad.inseego.com bitbucket.ad.inseego.com
+#10.1.0.193 crucible.ad.inseego.com i01bitcru00.ad.inseego.com bitbucket.ad.inseego.com
+
+13.56.245.15    rwe
+54.241.30.152   rwe-gw
 
 #
 # Imaginary network. 10.0.0.2 myname.my.domain myname 10.0.0.3 myfriend.my.domain myfriend
 #
-# According to RFC 1918, you can use the following IP networks for
+# According to RFC 1918, you can use the following IP blocks for
-# private nets which will never be connected to the Internet:
+# private internets:
 #
-#	10.0.0.0	-   10.255.255.255
+#	10.0.0.0	-   10.255.255.255	(10/8 prefix)
-#	172.16.0.0	-   172.31.255.255
+#	172.16.0.0	-   172.31.255.255	(172.16/12 prefix)
-#	192.168.0.0	-   192.168.255.255
+#	192.168.0.0	-   192.168.255.255	(192.168/16 prefix)
 #
-# In case you want to be able to connect to the Internet, you need
+# In case you want to make addresses available on the Internet, you need
 # real official assigned numbers.  Do not try to invent your own network
 # numbers but instead get one from your network provider (if any) or
 # from your regional registry (ARIN, APNIC, LACNIC, RIPE NCC, or AfriNIC.)

configs/etc/login.conf

@@ -7,7 +7,6 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-# $FreeBSD: releng/12.3/usr.bin/login/login.conf 369215 2021-02-04 03:15:28Z kevans $
 #
 
 # Default settings effectively disable resource limits, see the
@@ -25,7 +24,7 @@
 default:\
 	:passwd_format=sha512:\
 	:copyright=/etc/COPYRIGHT:\
-	:welcome=/etc/motd:\
+	:welcome=/var/run/motd:\
 	:setenv=BLOCKSIZE=K:\
 	:mail=/var/mail/$:\
 	:path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
@@ -49,8 +48,7 @@ default:\
 	:ignoretime@:\
 	:umask=022:\
 	:charset=UTF-8:\
-	:lang=en_US.UTF-8:
+	:lang=C.UTF-8:
-
 
 #
 # A collection of common class names - forward them all to 'default'
@@ -130,7 +128,7 @@ russian|Russian Users Accounts:\
 ##
 #standard:\
 #	:copyright=/etc/COPYRIGHT:\
-#	:welcome=/etc/motd:\
+#	:welcome=/var/run/motd:\
 #	:setenv=BLOCKSIZE=K:\
 #	:mail=/var/mail/$:\
 #	:path=~/bin /bin /usr/bin /usr/local/bin:\

configs/etc/ntp.conf

@@ -1,5 +1,4 @@
 #
-# $FreeBSD: releng/12.3/usr.sbin/ntp/ntpd/ntp.conf 365704 2020-09-14 01:20:57Z emaste $
 #
 # Default NTP servers for the FreeBSD operating system.
 #
@@ -20,24 +19,27 @@
 tos minclock 3 maxclock 6
 
 #
-# The following pool statement will give you a random set of NTP servers
+# The following pool statements will give you a random set of IPv4 and IPv6
-# geographically close to you.  A single pool statement adds multiple
+# NTP servers geographically close to you.  A single pool statement adds
-# servers from the pool, according to the tos minclock/maxclock targets.
+# multiple servers from the pool, according to the tos minclock/maxclock
+# targets.
 # See http://www.pool.ntp.org/ for details.  Note, pool.ntp.org encourages
 # users with a static IP and good upstream NTP servers to add a server
-# to the pool. See http://www.pool.ntp.org/join.html if you are interested.
+# to the pool.  See http://www.pool.ntp.org/join.html if you are interested.
 #
 # The option `iburst' is used for faster initial synchronization.
 #
-#pool 0.freebsd.pool.ntp.org iburst
+pool 0.freebsd.pool.ntp.org iburst
+pool 2.freebsd.pool.ntp.org iburst
 
 #
 # If you want to pick yourself which country's public NTP server
-# you want to sync against, comment out the above pool, uncomment
+# you want to sync against, comment out the above pool statements,
-# the next one, and replace CC with the country's abbreviation.
+# uncomment the next ones, and replace CC with the country's abbreviation.
-# Make sure that the hostname resolves to a proper IP address!
+# Make sure that the hostnames resolves to a proper IP address!
 #
 # pool 0.CC.pool.ntp.org iburst
+# pool 2.CC.pool.ntp.org iburst
 
 #
 # To configure a specific server, such as an organization-wide local

configs/etc/profile

@@ -1,4 +1,3 @@
-# $FreeBSD: releng/12.3/bin/sh/profile 363525 2020-07-25 11:57:39Z pstef $
 #
 # System-wide .profile file for sh(1).
 #

configs/etc/rc.conf

@@ -1,6 +1,6 @@
 zfs_enable="YES"
 
-kld_list="nmdm vmm ipfw ipdivert linux64 wg"
+kld_list="nmdm vmm ipfw ipdivert tcp_bbr linux64 wg"
 
 # Do not mark to autodetach otherwise ZFS gets very unhappy.
 geli_autodetach="NO"
@@ -18,7 +18,7 @@ ntpd_sync_on_start="YES"
 ntpd_enable="YES"
 
 powerdxx_enable="YES"
-powerdxx_flags=""
+powerdxx_flags="-a hiadaptive"
 
 smartd_enable="YES"
 nut_enable="YES"
@@ -30,42 +30,56 @@ firewall_type="open"
 firewall_logging="YES"
 firewall_logif="YES"
 
-# /interfaces
+# interfaces/
 cloned_interfaces_sticky="YES"
-cloned_interfaces="lagg0 bridge1 bridge2 bridge3 bridge5 bridge8 bridge9 bridge10 bridge48"
+cloned_interfaces="lagg0 bridge1 bridge2 bridge3 bridge5 bridge8 bridge9 bridge10 bridge48 bridge22 bridge99"
 
-ifconfig_lagg0="laggproto loadbalance laggport igb0 laggport igb1 up"
 ifconfig_igb0="up -rxcsum -rxcsum6 -txcsum -txcsum6 -lro -tso -vlanhwtso"
 ifconfig_igb1="up -rxcsum -rxcsum6 -txcsum -txcsum6 -lro -tso -vlanhwtso"
+ifconfig_lagg0="laggproto lacp laggport igb0 laggport igb1 up"
 
-vlans_lagg0="1 2 3 5 8 9 10 48"
+vlans_lagg0="1 2 3 5 8 9 10 48 22"
+#vlans_igb0="1 2 3 5 10 48 22"
+#vlans_igb1="8 9"
 
 ipv6_activate_all_interfaces="YES"
 rtsold_enable="YES"
 
 ifconfig_lagg0_1="inet 192.168.0.10/24"
 ifconfig_lagg0_1_ipv6="inet6 fd01::10/64 auto_linklocal accept_rtadv"
-ifconfig_lagg0_2="up"
+#ifconfig_igb0_1="inet 192.168.0.10/24"
-#ifconfig_lagg0_2="inet 192.168.2.10/24"
+#ifconfig_igb0_1_ipv6="inet6 fd01::10/64 auto_linklocal accept_rtadv"
-#ifconfig_lagg0_2_ipv6="inet6 fd02::10/64 auto_linklocal accept_rtadv"
+
-ifconfig_lagg0_3="up"
-#ifconfig_lagg0_3="inet 192.168.3.10/24"
-#ifconfig_lagg0_3_ipv6="inet6 fd03::10/64 auto_linklocal accept_rtadv"
-ifconfig_lagg0_5="up"
-#ifconfig_lagg0_5="inet 192.168.5.10/24"
-#ifconfig_lagg0_5_ipv6="inet6 fd05::10/64 auto_linklocal accept_rtadv"
-ifconfig_lagg0_8="up"
-# to avoid asymmetric routing - keep ip for vlan8 disabled
-#ifconfig_lagg0_8="inet 192.168.8.10/24"
-#ifconfig_lagg0_8_ipv6="inet6 fd08::10/64 auto_linklocal accept_rtadv"
-ifconfig_lagg0_9="up"
-#ifconfig_lagg0_9="inet 192.168.200.10/24"
-#ifconfig_lagg0_9_ipv6="inet6 fd09::10/64 auto_linklocal accept_rtadv"
 # required for lab servers netboot on vlan10
 ifconfig_lagg0_10="inet 192.168.10.10/24"
 ifconfig_lagg0_10_ipv6="inet6 fd0a::10/64 auto_linklocal accept_rtadv"
+#ifconfig_igb0_10="inet 192.168.10.10/24"
+#ifconfig_igb0_10_ipv6="inet6 fd0a::10/64 auto_linklocal accept_rtadv"
+
 ifconfig_lagg0_48="inet 192.168.48.10/24"
 ifconfig_lagg0_48_ipv6="inet6 2001:470:480a::10/64 auto_linklocal accept_rtadv"
+#ifconfig_igb0_48="inet 192.168.48.10/24"
+#ifconfig_igb0_48_ipv6="inet6 2001:470:480a::10/64 auto_linklocal accept_rtadv"
+
+# to avoid asymmetric routing - keep ip for vlan8 disabled
+# updated DNS entries to address the above concern
+ifconfig_lagg0_8="up"
+ifconfig_lagg0_8="inet 192.168.8.10/24"
+ifconfig_lagg0_8_ipv6="inet6 fd08::10/64 auto_linklocal accept_rtadv"
+#ifconfig_igb1_8="up"
+#ifconfig_igb1_8="inet 192.168.8.10/24"
+#ifconfig_igb1_8_ipv6="inet6 fd08::10/64 auto_linklocal accept_rtadv"
+
+ifconfig_lagg0_2="up"
+ifconfig_lagg0_3="up"
+ifconfig_lagg0_5="up"
+ifconfig_lagg0_9="up"
+ifconfig_lagg0_22="up"
+#ifconfig_igb0_2="up"
+#ifconfig_igb0_3="up"
+#ifconfig_igb0_5="up"
+#ifconfig_igb1_9="up"
+#ifconfig_igb1_22="up"
 
 ifconfig_bridge1="addm lagg0.1 up"
 ifconfig_bridge2="addm lagg0.2 up"
@@ -75,6 +89,17 @@ ifconfig_bridge8="addm lagg0.8 up"
 ifconfig_bridge9="addm lagg0.9 up"
 ifconfig_bridge10="addm lagg0.10 up"
 ifconfig_bridge48="addm lagg0.48 up"
+ifconfig_bridge22="addm lagg0.22 up"
+
+#ifconfig_bridge1="addm igb0.1 up"
+#ifconfig_bridge2="addm igb0.2 up"
+#ifconfig_bridge3="addm igb0.3 up"
+#ifconfig_bridge5="addm igb0.5 up"
+#ifconfig_bridge8="addm igb1.8 up"
+#ifconfig_bridge9="addm igb1.9 up"
+#ifconfig_bridge10="addm igb0.10 up"
+#ifconfig_bridge48="addm igb0.48 up"
+#ifconfig_bridge22="addm igb0.22 up"
 
 # adding IP to bridges does not work
 #ifconfig_bridge1="inet 192.168.0.10/24"

configs/etc/rctl.conf

@@ -1 +1,3 @@
 jail:ioc-jump:vmemoryuse:deny=4G/jail
+jail:ioc-ldap:vmemoryuse:deny=8G/jail
+jail:ioc-monitor:vmemoryuse:deny=16G/jail

configs/etc/sysctl.conf

@@ -1,4 +1,3 @@
-# $FreeBSD: releng/12.3/sbin/sysctl/sysctl.conf 337624 2018-08-11 13:28:03Z brd $
 #
 #  This file is read when going to multi-user and its contents piped thru
 #  ``sysctl'' to adjust kernel values.  ``man 5 sysctl.conf'' for details.
@@ -72,10 +71,10 @@ net.inet.tcp.mssdflt=1448
 net.inet.tcp.nolocaltimewait=1
 net.inet.tcp.path_mtu_discovery=0
 net.inet.tcp.reass.maxqueuelen=1448
-net.inet.tcp.recvbuf_inc=65536
+###net.inet.tcp.recvbuf_inc=65536
 net.inet.tcp.recvbuf_max=16777216
 net.inet.tcp.recvspace=262144
-net.inet.tcp.rfc6675_pipe=1
+###net.inet.tcp.rfc6675_pipe=1
 net.inet.tcp.sendbuf_inc=65536
 net.inet.tcp.sendbuf_max=16777216
 net.inet.tcp.sendspace=262144
@@ -98,14 +97,14 @@ net.link.bridge.pfil_onlyip=0
 net.local.stream.recvspace=164240
 net.local.stream.sendspace=164240
 net.route.netisr_maxqlen=2048
-net.raw.recvspace=65536
+###net.raw.recvspace=65536
-net.raw.sendspace=65536
+###net.raw.sendspace=65536
 vfs.zfs.arc_max=51539607552
 vfs.zfs.delay_min_dirty_percent=96
 vfs.zfs.dirty_data_max=12884901888
-vfs.zfs.prefetch_disable=0
+###vfs.zfs.prefetch_disable=0
 #vfs.zfs.top_maxinflight=128
-vfs.zfs.trim.txg_delay=2
+###vfs.zfs.trim.txg_delay=2
 vfs.zfs.txg.timeout=90
 vfs.zfs.vdev.aggregation_limit=1048576
 vfs.zfs.vdev.write_gap_limit=0
@@ -114,13 +113,14 @@ vfs.zfs.vdev.write_gap_limit=0
 #vfs.zfs.l2arc_write_boost=402653184
 #vfs.zfs.l2arc_write_max=402653184
 
-net.inet.tcp.functions_default=rack
+###net.inet.tcp.functions_default=rack
-net.inet.tcp.rack.tlpmethod=3
+###net.inet.tcp.rack.tlpmethod=3
-net.inet.tcp.rack.data_after_close=0
+###net.inet.tcp.rack.data_after_close=0
 
-# Verify RACK
+net.inet.tcp.functions_default=bbr
+# Verify BBR
 # sysctl net.inet.tcp.functions_available
-# sysctl net.inet.tcp.rack.
+# sysctl net.inet.tcp.bbr.
 
 #Cheap Disk Issues
 kern.cam.ada.default_timeout=60

configs/usr/local/etc/pkg/repos/pkgp.conf

@@ -1,18 +1,16 @@
 FreeBSD: {
     url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
-    enabled: no
+    enabled: yes 
 }
 
 pkgp-freebsd-pkg: {
     url: "http://pkgp-freebsd-pkg.ahlawat.com/${ABI}/latest",
-    mirror_type: "http",
+    enabled: no,
-    enabled: yes,
     priority: 10
 }
 
 pkgp123: {
     url: "http://pkgp.ahlawat.com/packages/pj123-default/",
-    mirror_type: "http",
     signature_type: "pubkey",
     pubkey: "/mnt/data/apps/certs/poudriere.cert",
     enabled: no,

configs/usr/local/etc/rc.d/gstat_exporter

@@ -1,44 +1,27 @@
 #!/bin/sh
 
-# Copyright (c) 2018-2022, diyIT.org
-# All rights reserved.
-#
-# BSD 2-Clause License ("Simplified BSD License" or "FreeBSD License")
-# https://diyit.org/license/
-#
-#
-
-# the two lines below are not just comments but required by rcorder; service -e
 # PROVIDE: gstat_exporter
-# REQUIRE: NETWORKING DAEMON
+# REQUIRE: LOGIN NETWORKING
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable gstat_exporter:
+#
+# gstat_exporter_enable (bool):   Set to "NO" by default.
+#                                 Set it to "YES" to enable gstat_exporter_enable.
 
 . /etc/rc.subr
 
-: ${gstat_exporter_enable="NO"}
-
 name=gstat_exporter
-rcvar=${name}_enable
+rcvar=gstat_exporter_enable
-
+desc="gstat_exporter daemon"
-GSTATEXPORTER="nohup /usr/local/bin/python3.9 /root/FreeBSD/scripts/gstat_exporter.py"
-
-start_cmd="${name}_start"
-stop_cmd="${name}_stop"
-restart_cmd="${name}_restart"
-
-gstat_exporter_start()
-{
-        $GSTATEXPORTER &
-}
-
-gstat_exporter_stop()
-{
-        ps ax | grep -ie gstat_exporter.py | grep -v grep | awk '{print $1}' | xargs kill -9
-}
-gstat_exporter_restart()
-{
-	gstat_exporter_stop
-	gstat_exporter_start
-}
 
 load_rc_config ${name}
+
+: ${gstat_exporter_enable:=NO}
+
+pidfile="/var/run/${name}.pid"
+command_interpreter=/usr/local/bin/python3.11
+command=/usr/local/bin/${name}.py
+start_cmd="/usr/sbin/daemon -f -p ${pidfile} $command_interpreter $command"
+
 run_rc_command "$1"

jails/config/atm/ldap.conf

@@ -1,15 +0,0 @@
-#
-# LDAP Defaults
-#
-
-# See ldap.conf(5) for details
-# This file should be world readable but not world writable.
-
-BASE	ou=people,dc=infra
-URI	ldaps://ldap.ahlawat.com:636
-ssl start_tls
-tls_cacert /mnt/certs/cacert.pem
-
-#SIZELIMIT	12
-#TIMELIMIT	15
-#DEREF		never

jails/config/atm/nslcd.conf

@@ -15,7 +15,8 @@ gid nslcd
 #uri ldaps://127.0.0.1/
 #uri ldapi://%2fvar%2frun%2fldapi_sock/
 # Note: %2f encodes the '/' used as directory separator
-uri ldaps://ldap.ahlawat.com:636
+# uri ldaps://ldap.ahlawat.com:636
+uri ldap://ldap.ahlawat.com:389
 
 # The LDAP version to use (defaults to 3
 # if supported by client library)

jails/config/atm/pkg-list-details-old.txt

@@ -1,6 +1,6 @@
-pkgp123____netatalk3-3.1.13_4,1
+pkgp123____bash-5.2.37
-pkgp123____nss-pam-ldapd-sasl-0.9.12_1
+pkgp123____netatalk3-3.2.10_2,1
-pkgp123____pkg-1.18.4
+pkgp123____nss-pam-ldapd-sasl-0.9.13_1
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp123____pkg-2.1.2
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4

jails/config/atm/pkg-list-details.txt

@@ -1,6 +1,6 @@
-pkgp123____netatalk3-3.1.13_4,1
+pkgp123____bash-5.2.37
-pkgp123____nss-pam-ldapd-sasl-0.9.12_1
+pkgp123____netatalk3-3.2.10_2,1
-pkgp123____pkg-1.18.4
+pkgp123____nss-pam-ldapd-sasl-0.9.13_1
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp123____pkg-2.1.2
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4

jails/config/atm/pkgp.conf

@@ -5,14 +5,12 @@ FreeBSD: {
 
 pkgp-freebsd-pkg: {
     url: "http://pkgp-freebsd-pkg.ahlawat.com/${ABI}/latest",
-    mirror_type: "http",
     enabled: yes,
     priority: 10
 }
 
 pkgp123: {
     url: "http://pkgp.ahlawat.com/packages/pj123-default",
-    mirror_type: "http",
     signature_type: "pubkey",
     pubkey: "/mnt/certs/poudriere.cert",
     enabled: yes,

jails/config/auto/pkg-list-details-old.txt

@@ -1,13 +1,9 @@
-pkgp123____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp123____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp123____nginx-devel-1.23.2_4
+pkgp-freebsd-pkg____nano-8.4
-pkgp123____pkg-1.18.4
+pkgp-freebsd-pkg____nginx-devel-1.28.0
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____py39-ansible-6.1.0
+pkgp-freebsd-pkg____py311-django42-4.2.20
-pkgp-freebsd-pkg____py39-django32-3.2.16
+pkgp-freebsd-pkg____py311-gunicorn-23.0.0_1
-pkgp-freebsd-pkg____py39-gunicorn-20.1.0
+pkgp-freebsd-pkg____py311-psycopg2-2.9.10
-pkgp-freebsd-pkg____py39-pillow-9.2.0
+pkgp-freebsd-pkg____sudo-1.9.16p2_1
-pkgp-freebsd-pkg____py39-pip-22.2.2
-pkgp-freebsd-pkg____py39-psycopg2-2.9.4
-pkgp-freebsd-pkg____py39-tkinter-3.9.15_6
-pkgp-freebsd-pkg____sudo-1.9.12p1

jails/config/auto/pkg-list-details.txt

@@ -1,13 +1,9 @@
-pkgp123____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp123____pkg-1.18.4
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nginx-devel-1.28.0
-pkgp-freebsd-pkg____nginx-devel-1.23.2_4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____py39-ansible-6.1.0
+pkgp-freebsd-pkg____py311-django42-4.2.20
-pkgp-freebsd-pkg____py39-django32-3.2.16
+pkgp-freebsd-pkg____py311-gunicorn-23.0.0_1
-pkgp-freebsd-pkg____py39-gunicorn-20.1.0
+pkgp-freebsd-pkg____py311-psycopg2-2.9.10
-pkgp-freebsd-pkg____py39-pillow-9.2.0
+pkgp-freebsd-pkg____sudo-1.9.16p2_1
-pkgp-freebsd-pkg____py39-pip-22.2.2
-pkgp-freebsd-pkg____py39-psycopg2-2.9.4
-pkgp-freebsd-pkg____py39-tkinter-3.9.15_6
-pkgp-freebsd-pkg____sudo-1.9.12p1

jails/config/auto/pkg-list-old.txt

@@ -1 +1 @@
-bash bash-completion nano nginx-devel pkg py39-ansible py39-django32 py39-gunicorn py39-pillow py39-pip py39-psycopg2 py39-tkinter sudo
+bash bash-completion nano nginx-devel pkg py311-django42 py311-gunicorn py311-psycopg2 sudo

jails/config/auto/pkg-list.txt

@@ -1 +1 @@
-bash bash-completion nano nginx-devel pkg py39-ansible py39-django32 py39-gunicorn py39-pillow py39-pip py39-psycopg2 py39-tkinter sudo
+bash bash-completion nano nginx-devel pkg py311-django42 py311-gunicorn py311-psycopg2 sudo

jails/config/book/cps

@@ -19,8 +19,8 @@
 name=cpsserver
 rcvar=${name}_enable
 
-#CPSSERVER="nohup /usr/local/bin/python3.9 /data/calibre-web/cps.py"
+CPSSERVER="nohup /usr/local/bin/python3.9 /data/calibre-web/cps.py"
-CPSSERVER="nohup /usr/local/bin/cps"
+#CPSSERVER="nohup /usr/local/bin/cps"
 
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
@@ -31,11 +31,15 @@ cpsserver_start()
         $CPSSERVER -p /data/big/app.db -g /data/big/gdrive.db &
         $CPSSERVER -p /data/fiction/app.db -g /data/fiction/gdrive.db &
         $CPSSERVER -p /data/movie/app.db -g /data/movie/gdrive.db &
+        $CPSSERVER -p /data/art/app.db -g /data/art/gdrive.db &
+        $CPSSERVER -p /data/home/app.db -g /data/home/gdrive.db &
+        $CPSSERVER -p /data/general/app.db -g /data/general/gdrive.db &
 }
 
 cpsserver_stop()
 {
         ps ax | grep -ie cps.py | grep -v grep | awk '{print $1}' | xargs kill -9
+#        ps ax | grep -ie cps | grep -v grep | awk '{print $1}' | xargs kill -9
 }
 cpsserver_restart()
 {

jails/config/book/pkg-list-details-old.txt

@@ -1,10 +1,14 @@
-pkgp123____libxml2-2.10.3_1
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp123____libxslt-1.1.37
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp123____pkg-1.18.4
+pkgp-freebsd-pkg____cyrus-sasl-2.1.28_5
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____libxml2-2.11.9
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____libxslt-1.1.42
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____py39-ldap-3.4.0
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____py39-pip-22.2.2
+pkgp-freebsd-pkg____py311-netifaces-plus-0.12.2_1
-pkgp-freebsd-pkg____py39-sqlite3-3.9.15_7
+pkgp-freebsd-pkg____py311-pip-23.3.2_4
-pkgp-freebsd-pkg____rust-1.64.0
+pkgp-freebsd-pkg____py311-pyasn1-0.6.0
+pkgp-freebsd-pkg____py311-pyasn1-modules-0.4.1
+pkgp-freebsd-pkg____py311-python-ldap-3.4.4
+pkgp-freebsd-pkg____py311-sqlite3-3.11.12_10
+pkgp-freebsd-pkg____rust-1.86.0

jails/config/book/pkg-list-details.txt

@@ -1,10 +1,14 @@
-pkgp123____libxml2-2.10.3_1
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp123____libxslt-1.1.37
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp123____pkg-1.18.4
+pkgp-freebsd-pkg____cyrus-sasl-2.1.28_5
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____libxml2-2.11.9
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____libxslt-1.1.42
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____py39-ldap-3.4.0
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____py39-pip-22.2.2
+pkgp-freebsd-pkg____py311-netifaces-plus-0.12.2_1
-pkgp-freebsd-pkg____py39-sqlite3-3.9.15_7
+pkgp-freebsd-pkg____py311-pip-23.3.2_4
-pkgp-freebsd-pkg____rust-1.65.0
+pkgp-freebsd-pkg____py311-pyasn1-0.6.0
+pkgp-freebsd-pkg____py311-pyasn1-modules-0.4.1
+pkgp-freebsd-pkg____py311-python-ldap-3.4.4
+pkgp-freebsd-pkg____py311-sqlite3-3.11.12_10
+pkgp-freebsd-pkg____rust-1.86.0

jails/config/book/pkg-list-old.txt

@@ -1 +1 @@
-bash bash-completion libxml2 libxslt nano pkg py39-ldap py39-pip py39-sqlite3 rust
+bash bash-completion cyrus-sasl libxml2 libxslt nano pkg py311-netifaces-plus py311-pip py311-pyasn1 py311-pyasn1-modules py311-python-ldap py311-sqlite3 rust

jails/config/book/pkg-list.txt

@@ -1 +1 @@
-bash bash-completion libxml2 libxslt nano pkg py39-ldap py39-pip py39-sqlite3 rust
+bash bash-completion cyrus-sasl libxml2 libxslt nano pkg py311-netifaces-plus py311-pip py311-pyasn1 py311-pyasn1-modules py311-python-ldap py311-sqlite3 rust

jails/config/calibre/pkg-list-details-old.txt

@@ -1,11 +1,11 @@
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____calibre-5.44.0_6
+pkgp-freebsd-pkg____calibre-8.3.0
-pkgp-freebsd-pkg____fluxbox-1.3.7_5
+pkgp-freebsd-pkg____fluxbox-1.3.7_10
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____sudo-1.9.12p1
+pkgp-freebsd-pkg____sudo-1.9.16p2_1
-pkgp-freebsd-pkg____tigervnc-server-1.12.0_5
+pkgp-freebsd-pkg____tigervnc-server-1.15.0
-pkgp-freebsd-pkg____xauth-1.1.1
+pkgp-freebsd-pkg____xauth-1.1.4
-pkgp-freebsd-pkg____xpdf-4.04,1
+pkgp-freebsd-pkg____xpdf-4.05_4,1
-pkgp-freebsd-pkg____xterm-375
+pkgp-freebsd-pkg____xterm-397_2

jails/config/calibre/pkg-list-details.txt

@@ -1,11 +1,11 @@
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____calibre-5.44.0_6
+pkgp-freebsd-pkg____calibre-8.3.0
-pkgp-freebsd-pkg____fluxbox-1.3.7_5
+pkgp-freebsd-pkg____fluxbox-1.3.7_10
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____sudo-1.9.12p1
+pkgp-freebsd-pkg____sudo-1.9.16p2_1
-pkgp-freebsd-pkg____tigervnc-server-1.12.0_5
+pkgp-freebsd-pkg____tigervnc-server-1.15.0
-pkgp-freebsd-pkg____xauth-1.1.1
+pkgp-freebsd-pkg____xauth-1.1.4
-pkgp-freebsd-pkg____xpdf-4.04,1
+pkgp-freebsd-pkg____xpdf-4.05_4,1
-pkgp-freebsd-pkg____xterm-377
+pkgp-freebsd-pkg____xterm-397_2

jails/config/cam/pkg-list-details-old.txt

@@ -1,7 +1,13 @@
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____curl-7.85.0
+pkgp-freebsd-pkg____curl-8.13.0
-pkgp-freebsd-pkg____motion-4.3.2_3
+pkgp-freebsd-pkg____dejavu-2.37_3
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____ffmpeg-6.1.2_10,1
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____git-lite-2.49.0
-pkgp-freebsd-pkg____py27-pip-20.2.3
+pkgp-freebsd-pkg____gmake-4.4.1
+pkgp-freebsd-pkg____libgd-2.3.3_13,1
+pkgp-freebsd-pkg____motion-4.7.0
+pkgp-freebsd-pkg____nano-8.4
+pkgp-freebsd-pkg____pkg-2.1.2
+pkgp-freebsd-pkg____rsync-3.4.1_2
+pkgp-freebsd-pkg____v4l-utils-1.23.0_5

jails/config/cam/pkg-list-details.txt

@@ -1,7 +1,13 @@
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____curl-7.85.0
+pkgp-freebsd-pkg____curl-8.13.0
-pkgp-freebsd-pkg____motion-4.3.2_3
+pkgp-freebsd-pkg____dejavu-2.37_3
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____ffmpeg-6.1.2_10,1
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____git-lite-2.49.0
-pkgp-freebsd-pkg____py27-pip-20.2.3
+pkgp-freebsd-pkg____gmake-4.4.1
+pkgp-freebsd-pkg____libgd-2.3.3_13,1
+pkgp-freebsd-pkg____motion-4.7.0
+pkgp-freebsd-pkg____nano-8.4
+pkgp-freebsd-pkg____pkg-2.1.2
+pkgp-freebsd-pkg____rsync-3.4.1_2
+pkgp-freebsd-pkg____v4l-utils-1.23.0_5

jails/config/cam/pkg-list-old.txt

@@ -1 +1 @@
-bash bash-completion curl motion nano pkg py27-pip
+bash bash-completion curl dejavu ffmpeg git-lite gmake libgd motion nano pkg rsync v4l-utils

jails/config/cam/pkg-list.txt

@@ -1 +1 @@
-bash bash-completion curl motion nano pkg py27-pip
+bash bash-completion curl dejavu ffmpeg git-lite gmake libgd motion nano pkg rsync v4l-utils

jails/config/cert/pkg-list-details-old.txt

@@ -1,8 +1,9 @@
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____curl-7.85.0
+pkgp-freebsd-pkg____curl-8.13.0
-pkgp-freebsd-pkg____git-lite-2.38.1_3
+pkgp-freebsd-pkg____git-lite-2.49.0
-pkgp-freebsd-pkg____go-1.19,2
+pkgp-freebsd-pkg____go-1.21_7,2
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____wget-1.21.3_1
+pkgp-freebsd-pkg____socat-1.8.0.3
+pkgp-freebsd-pkg____wget-1.25.0

jails/config/cert/pkg-list-details.txt

@@ -1,8 +1,9 @@
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____curl-7.85.0
+pkgp-freebsd-pkg____curl-8.13.0
-pkgp-freebsd-pkg____git-lite-2.38.1_4
+pkgp-freebsd-pkg____git-lite-2.49.0
-pkgp-freebsd-pkg____go-1.19,2
+pkgp-freebsd-pkg____go-1.21_7,2
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____wget-1.21.3_1
+pkgp-freebsd-pkg____socat-1.8.0.3
+pkgp-freebsd-pkg____wget-1.25.0

jails/config/cert/pkg-list-old.txt

@@ -1 +1 @@
-bash bash-completion curl git-lite go nano pkg wget
+bash bash-completion curl git-lite go nano pkg socat wget

jails/config/cert/pkg-list.txt

@@ -1 +1 @@
-bash bash-completion curl git-lite go nano pkg wget
+bash bash-completion curl git-lite go nano pkg socat wget

jails/config/ci/pkg-list-details-old.txt

@@ -1,5 +1,5 @@
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp123____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp123____nginx-1.26.3_3,3
-pkgp-freebsd-pkg____jenkins-2.377
+pkgp123____pkg-2.1.2
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____nano-8.4

jails/config/ci/pkg-list-details.txt

@@ -1,5 +1,5 @@
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp123____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp123____nginx-1.26.3_3,3
-pkgp-freebsd-pkg____jenkins-2.378
+pkgp123____pkg-2.1.2
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____nano-8.4

jails/config/ci/pkg-list-old.txt

@@ -1 +1 @@
-bash bash-completion jenkins nano pkg
+bash bash-completion nano nginx pkg

jails/config/ci/pkg-list.txt

@@ -1 +1 @@
-bash bash-completion jenkins nano pkg
+bash bash-completion nano nginx pkg

jails/config/cloud/config.php

@@ -12,7 +12,7 @@ $CONFIG = array (
   'datadirectory' => '/mnt/cloud',
   'overwrite.cli.url' => 'https://cloud.ahlawat.com/',
   'dbtype' => 'mysql',
-  'version' => '21.0.3.1',
+  'version' => '28.0.4.1',
   'dbname' => 'nextcloud',
   'dbhost' => 'db.ahlawat.com',
   'dbport' => '3306',
@@ -24,6 +24,7 @@ $CONFIG = array (
   'instanceid' => 'oc7suxvjiy9s',
   'htaccess.RewriteBase' => '/',
   'filelocking.enabled' => 'true',
+  'memcache.local' => '\OC\Memcache\APCu',
   'memcache.locking' => '\\OC\\Memcache\\Redis',
   'redis' => 
   array (
@@ -38,7 +39,7 @@ $CONFIG = array (
   'logrotate_size' => '104847600',
   'ldapIgnoreNamingRules' => false,
   'ldapProviderFactory' => '\\OCA\\User_LDAP\\LDAPProviderFactory',
-  'mail_smtpmode' => 'smtp',
+  'mail_smtpmode' => 'sendmail',
   'mail_from_address' => 'nobody',
   'mail_domain' => 'ahlawat.com',
   'mail_smtphost' => '192.168.0.100',
@@ -47,5 +48,6 @@ $CONFIG = array (
   'theme' => '',
   'encryption.legacy_format_support' => false,
   'encryption.key_storage_migrated' => false,
-  'updater.secret' => '$2y$10$jAnC4Ha3RI2CL.IlhYluSeeOuKMT4itq/ViSiH1Q9DciUXfB3YSYS',
+  'data-fingerprint' => 'a20b20d2fb1221ec403a5f7c65828557',
+  'mail_sendmailmode' => 'smtp',
 );

jails/config/cloud/config.php.20

@@ -1,51 +0,0 @@
-<?php
-$CONFIG = array (
-  'passwordsalt' => '5OBfApfc/+tJzU/4n+F8e+PzOfAStP',
-  'secret' => 'IFX9kjXwOk4L21503pLACwa2Dadv9JzHNSu8XsnTogmwb5Tr',
-  'trusted_domains' => 
-  array (
-    0 => 'localhost',
-    1 => 'cloud.ahlawat.com',
-    2 => '192.168.0.59',
-    3 => 'fd01::59',
-  ),
-  'datadirectory' => '/mnt/cloud',
-  'overwrite.cli.url' => 'https://cloud.ahlawat.com/',
-  'dbtype' => 'mysql',
-  'version' => '21.0.3.1',
-  'dbname' => 'nextcloud',
-  'dbhost' => 'db.ahlawat.com',
-  'dbport' => '3306',
-  'dbtableprefix' => 'oc_',
-  'mysql.utf8mb4' => true,
-  'dbuser' => 'nextcloud',
-  'dbpassword' => 'mysql__nextcloud',
-  'installed' => true,
-  'instanceid' => 'oc7suxvjiy9s',
-  'htaccess.RewriteBase' => '/',
-  'filelocking.enabled' => 'true',
-  'memcache.local' => '\\OC\\Memcache\\APCu',
-  'memcache.locking' => '\\OC\\Memcache\\Redis',
-  'redis' => 
-  array (
-    'host' => '/tmp/redis.sock',
-    'port' => 0,
-  ),
-  'logtimezone' => 'America/Los_Angeles',
-  'log_type' => 'file',
-  'logfile' => '/var/log/nextcloud.log',
-  'loglevel' => 0,
-  'logrotate_size' => '104847600',
-  'ldapIgnoreNamingRules' => false,
-  'ldapProviderFactory' => '\\OCA\\User_LDAP\\LDAPProviderFactory',
-  'mail_smtpmode' => 'smtp',
-  'mail_from_address' => 'nobody',
-  'mail_domain' => 'ahlawat.com',
-  'mail_smtphost' => '192.168.0.100',
-  'mail_smtpport' => '25',
-  'maintenance' => false,
-  'theme' => '',
-  'encryption.legacy_format_support' => false,
-  'encryption.key_storage_migrated' => false,
-  'updater.secret' => '$2y$10$jAnC4Ha3RI2CL.IlhYluSeeOuKMT4itq/ViSiH1Q9DciUXfB3YSYS',
-);

jails/config/cloud/httpd.conf

@@ -551,6 +551,14 @@ SSLRandomSeed connect builtin
 
 Include etc/apache24/Includes/*.conf
 
+# https://ssl-config.mozilla.org/#server=apache&version=2.4.60&config=intermediate&openssl=3.1.0&guideline=5.7
+
+<VirtualHost *:80>
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/
+    RewriteRule ^.*$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,QSA,L]
+</VirtualHost>
+
 <VirtualHost *:443>
     ServerName cloud.ahlawat.com
     ServerAlias *.ahlawat.com
@@ -559,16 +567,20 @@ Include etc/apache24/Includes/*.conf
 
     DocumentRoot "/usr/local/www/apache24/data/nextcloud/"
 
+    # HTTP Strict Transport Security (mod_headers is required) (63072000 seconds)
+    Header always set Strict-Transport-Security "max-age=63072000"
+
     SSLEngine on
     SSLCertificateFile "/mnt/certs/fullchain.pem"
     SSLCertificateKeyFile "/mnt/certs/privkey.pem"
-    #SSLCertificateChainFile "/mnt/certs/fullchain.pem"
+#    SSLCertificateChainFile "/mnt/certs/fullchain.pem"
-    SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
+    SSLCACertificateFile "/mnt/certs/cacert.pem"
-    SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
+
-    SSLHonorCipherOrder off
+    SSLProtocol             -all +TLSv1.2 +TLSv1.3
-    SSLSessionTickets off
+    SSLOpenSSLConfCmd       Curves X25519:prime256v1:secp384r1
-    SSLOptions +StrictRequire
+    SSLCipherSuite          ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305
-#    SSLCompression off
+    SSLHonorCipherOrder     off
+    SSLSessionTickets       off
 
     RewriteEngine On
     RewriteCond %{HTTP:Authorization} ^(.*)

jails/config/cloud/pkg-list-details-old.txt

@@ -1,43 +1,46 @@
-pkgp-freebsd-pkg____apache24-2.4.54
+pkgp-freebsd-pkg____apache24-2.4.63
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____ffmpeg-4.4.3_1,1
+pkgp-freebsd-pkg____ffmpeg-6.1.2_10,1
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____php80-8.0.25
+pkgp-freebsd-pkg____php83-8.3.20
-pkgp-freebsd-pkg____php80-bcmath-8.0.25
+pkgp-freebsd-pkg____php83-bcmath-8.3.20
-pkgp-freebsd-pkg____php80-bz2-8.0.25
+pkgp-freebsd-pkg____php83-bz2-8.3.20
-pkgp-freebsd-pkg____php80-ctype-8.0.25
+pkgp-freebsd-pkg____php83-ctype-8.3.20
-pkgp-freebsd-pkg____php80-curl-8.0.25
+pkgp-freebsd-pkg____php83-curl-8.3.20
-pkgp-freebsd-pkg____php80-dom-8.0.25
+pkgp-freebsd-pkg____php83-dom-8.3.20
-pkgp-freebsd-pkg____php80-exif-8.0.25
+pkgp-freebsd-pkg____php83-exif-8.3.20
-pkgp-freebsd-pkg____php80-fileinfo-8.0.25
+pkgp-freebsd-pkg____php83-fileinfo-8.3.20
-pkgp-freebsd-pkg____php80-filter-8.0.25
+pkgp-freebsd-pkg____php83-filter-8.3.20
-pkgp-freebsd-pkg____php80-ftp-8.0.25
+pkgp-freebsd-pkg____php83-ftp-8.3.20
-pkgp-freebsd-pkg____php80-gd-8.0.25
+pkgp-freebsd-pkg____php83-gd-8.3.20
-pkgp-freebsd-pkg____php80-gmp-8.0.25
+pkgp-freebsd-pkg____php83-gmp-8.3.20
-pkgp-freebsd-pkg____php80-iconv-8.0.25
+pkgp-freebsd-pkg____php83-iconv-8.3.20
-pkgp-freebsd-pkg____php80-imap-8.0.25
+pkgp-freebsd-pkg____php83-imap-8.3.20
-pkgp-freebsd-pkg____php80-intl-8.0.25_1
+pkgp-freebsd-pkg____php83-intl-8.3.20
-pkgp-freebsd-pkg____php80-ldap-8.0.25
+pkgp-freebsd-pkg____php83-ldap-8.3.20
-pkgp-freebsd-pkg____php80-mbstring-8.0.25
+pkgp-freebsd-pkg____php83-mbstring-8.3.20
-pkgp-freebsd-pkg____php80-mysqli-8.0.25
+pkgp-freebsd-pkg____php83-mysqli-8.3.20
-pkgp-freebsd-pkg____php80-opcache-8.0.25
+pkgp-freebsd-pkg____php83-opcache-8.3.20
-pkgp-freebsd-pkg____php80-pcntl-8.0.25
+pkgp-freebsd-pkg____php83-pcntl-8.3.20
-pkgp-freebsd-pkg____php80-pdo-8.0.25
+pkgp-freebsd-pkg____php83-pdo-8.3.20
-pkgp-freebsd-pkg____php80-pdo_mysql-8.0.25
+pkgp-freebsd-pkg____php83-pdo_mysql-8.3.20
-pkgp-freebsd-pkg____php80-pecl-APCu-5.1.22
+pkgp-freebsd-pkg____php83-pear-horde-Horde_HashTable-1.2.6
-pkgp-freebsd-pkg____php80-pecl-imagick-3.7.0
+pkgp-freebsd-pkg____php83-pecl-APCu-5.1.24
-pkgp-freebsd-pkg____php80-pecl-mcrypt-1.0.5
+pkgp-freebsd-pkg____php83-pecl-imagick-3.7.0_5
-pkgp-freebsd-pkg____php80-pecl-redis-5.3.5
+pkgp-freebsd-pkg____php83-pecl-mcrypt-1.0.7
-pkgp-freebsd-pkg____php80-posix-8.0.25
+pkgp-freebsd-pkg____php83-pecl-redis-6.2.0
-pkgp-freebsd-pkg____php80-session-8.0.25
+pkgp-freebsd-pkg____php83-posix-8.3.20
-pkgp-freebsd-pkg____php80-simplexml-8.0.25
+pkgp-freebsd-pkg____php83-session-8.3.20
-pkgp-freebsd-pkg____php80-xml-8.0.25
+pkgp-freebsd-pkg____php83-simplexml-8.3.20
-pkgp-freebsd-pkg____php80-xmlreader-8.0.25
+pkgp-freebsd-pkg____php83-sodium-8.3.20
-pkgp-freebsd-pkg____php80-xmlwriter-8.0.25
+pkgp-freebsd-pkg____php83-sysvsem-8.3.20
-pkgp-freebsd-pkg____php80-xsl-8.0.25
+pkgp-freebsd-pkg____php83-xml-8.3.20
-pkgp-freebsd-pkg____php80-zip-8.0.25
+pkgp-freebsd-pkg____php83-xmlreader-8.3.20
-pkgp-freebsd-pkg____php80-zlib-8.0.25
+pkgp-freebsd-pkg____php83-xmlwriter-8.3.20
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____php83-xsl-8.3.20
-pkgp-freebsd-pkg____redis-7.0.5
+pkgp-freebsd-pkg____php83-zip-8.3.20
-pkgp-freebsd-pkg____sudo-1.9.12p1
+pkgp-freebsd-pkg____php83-zlib-8.3.20
+pkgp-freebsd-pkg____pkg-2.1.2
+pkgp-freebsd-pkg____redis-7.4.2
+pkgp-freebsd-pkg____sudo-1.9.16p2_1

jails/config/cloud/pkg-list-details.txt

@@ -1,43 +1,46 @@
-pkgp-freebsd-pkg____apache24-2.4.54
+pkgp-freebsd-pkg____apache24-2.4.63
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____ffmpeg-4.4.3_1,1
+pkgp-freebsd-pkg____ffmpeg-6.1.2_10,1
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____php80-8.0.25
+pkgp-freebsd-pkg____php83-8.3.20
-pkgp-freebsd-pkg____php80-bcmath-8.0.25
+pkgp-freebsd-pkg____php83-bcmath-8.3.20
-pkgp-freebsd-pkg____php80-bz2-8.0.25
+pkgp-freebsd-pkg____php83-bz2-8.3.20
-pkgp-freebsd-pkg____php80-ctype-8.0.25
+pkgp-freebsd-pkg____php83-ctype-8.3.20
-pkgp-freebsd-pkg____php80-curl-8.0.25
+pkgp-freebsd-pkg____php83-curl-8.3.20
-pkgp-freebsd-pkg____php80-dom-8.0.25
+pkgp-freebsd-pkg____php83-dom-8.3.20
-pkgp-freebsd-pkg____php80-exif-8.0.25
+pkgp-freebsd-pkg____php83-exif-8.3.20
-pkgp-freebsd-pkg____php80-fileinfo-8.0.25
+pkgp-freebsd-pkg____php83-fileinfo-8.3.20
-pkgp-freebsd-pkg____php80-filter-8.0.25
+pkgp-freebsd-pkg____php83-filter-8.3.20
-pkgp-freebsd-pkg____php80-ftp-8.0.25
+pkgp-freebsd-pkg____php83-ftp-8.3.20
-pkgp-freebsd-pkg____php80-gd-8.0.25
+pkgp-freebsd-pkg____php83-gd-8.3.20
-pkgp-freebsd-pkg____php80-gmp-8.0.25
+pkgp-freebsd-pkg____php83-gmp-8.3.20
-pkgp-freebsd-pkg____php80-iconv-8.0.25
+pkgp-freebsd-pkg____php83-iconv-8.3.20
-pkgp-freebsd-pkg____php80-imap-8.0.25
+pkgp-freebsd-pkg____php83-imap-8.3.20
-pkgp-freebsd-pkg____php80-intl-8.0.25_1
+pkgp-freebsd-pkg____php83-intl-8.3.20
-pkgp-freebsd-pkg____php80-ldap-8.0.25
+pkgp-freebsd-pkg____php83-ldap-8.3.20
-pkgp-freebsd-pkg____php80-mbstring-8.0.25
+pkgp-freebsd-pkg____php83-mbstring-8.3.20
-pkgp-freebsd-pkg____php80-mysqli-8.0.25
+pkgp-freebsd-pkg____php83-mysqli-8.3.20
-pkgp-freebsd-pkg____php80-opcache-8.0.25
+pkgp-freebsd-pkg____php83-opcache-8.3.20
-pkgp-freebsd-pkg____php80-pcntl-8.0.25
+pkgp-freebsd-pkg____php83-pcntl-8.3.20
-pkgp-freebsd-pkg____php80-pdo-8.0.25
+pkgp-freebsd-pkg____php83-pdo-8.3.20
-pkgp-freebsd-pkg____php80-pdo_mysql-8.0.25
+pkgp-freebsd-pkg____php83-pdo_mysql-8.3.20
-pkgp-freebsd-pkg____php80-pecl-APCu-5.1.22
+pkgp-freebsd-pkg____php83-pear-horde-Horde_HashTable-1.2.6
-pkgp-freebsd-pkg____php80-pecl-imagick-3.7.0
+pkgp-freebsd-pkg____php83-pecl-APCu-5.1.24
-pkgp-freebsd-pkg____php80-pecl-mcrypt-1.0.5
+pkgp-freebsd-pkg____php83-pecl-imagick-3.7.0_5
-pkgp-freebsd-pkg____php80-pecl-redis-5.3.5
+pkgp-freebsd-pkg____php83-pecl-mcrypt-1.0.7
-pkgp-freebsd-pkg____php80-posix-8.0.25
+pkgp-freebsd-pkg____php83-pecl-redis-6.2.0
-pkgp-freebsd-pkg____php80-session-8.0.25
+pkgp-freebsd-pkg____php83-posix-8.3.20
-pkgp-freebsd-pkg____php80-simplexml-8.0.25
+pkgp-freebsd-pkg____php83-session-8.3.20
-pkgp-freebsd-pkg____php80-xml-8.0.25
+pkgp-freebsd-pkg____php83-simplexml-8.3.20
-pkgp-freebsd-pkg____php80-xmlreader-8.0.25
+pkgp-freebsd-pkg____php83-sodium-8.3.20
-pkgp-freebsd-pkg____php80-xmlwriter-8.0.25
+pkgp-freebsd-pkg____php83-sysvsem-8.3.20
-pkgp-freebsd-pkg____php80-xsl-8.0.25
+pkgp-freebsd-pkg____php83-xml-8.3.20
-pkgp-freebsd-pkg____php80-zip-8.0.25
+pkgp-freebsd-pkg____php83-xmlreader-8.3.20
-pkgp-freebsd-pkg____php80-zlib-8.0.25
+pkgp-freebsd-pkg____php83-xmlwriter-8.3.20
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____php83-xsl-8.3.20
-pkgp-freebsd-pkg____redis-7.0.5
+pkgp-freebsd-pkg____php83-zip-8.3.20
-pkgp-freebsd-pkg____sudo-1.9.12p1
+pkgp-freebsd-pkg____php83-zlib-8.3.20
+pkgp-freebsd-pkg____pkg-2.1.2
+pkgp-freebsd-pkg____redis-7.4.2
+pkgp-freebsd-pkg____sudo-1.9.16p2_1

jails/config/cloud/pkg-list-old.txt

@@ -1 +1 @@
-apache24 bash bash-completion ffmpeg nano php80 php80-bcmath php80-bz2 php80-ctype php80-curl php80-dom php80-exif php80-fileinfo php80-filter php80-ftp php80-gd php80-gmp php80-iconv php80-imap php80-intl php80-ldap php80-mbstring php80-mysqli php80-opcache php80-pcntl php80-pdo php80-pdo_mysql php80-pecl-APCu php80-pecl-imagick php80-pecl-mcrypt php80-pecl-redis php80-posix php80-session php80-simplexml php80-xml php80-xmlreader php80-xmlwriter php80-xsl php80-zip php80-zlib pkg redis sudo
+apache24 bash bash-completion ffmpeg nano php83 php83-bcmath php83-bz2 php83-ctype php83-curl php83-dom php83-exif php83-fileinfo php83-filter php83-ftp php83-gd php83-gmp php83-iconv php83-imap php83-intl php83-ldap php83-mbstring php83-mysqli php83-opcache php83-pcntl php83-pdo php83-pdo_mysql php83-pear-horde-Horde_HashTable php83-pecl-APCu php83-pecl-imagick php83-pecl-mcrypt php83-pecl-redis php83-posix php83-session php83-simplexml php83-sodium php83-sysvsem php83-xml php83-xmlreader php83-xmlwriter php83-xsl php83-zip php83-zlib pkg redis sudo

jails/config/cloud/pkg-list.txt

@@ -1 +1 @@
-apache24 bash bash-completion ffmpeg nano php80 php80-bcmath php80-bz2 php80-ctype php80-curl php80-dom php80-exif php80-fileinfo php80-filter php80-ftp php80-gd php80-gmp php80-iconv php80-imap php80-intl php80-ldap php80-mbstring php80-mysqli php80-opcache php80-pcntl php80-pdo php80-pdo_mysql php80-pecl-APCu php80-pecl-imagick php80-pecl-mcrypt php80-pecl-redis php80-posix php80-session php80-simplexml php80-xml php80-xmlreader php80-xmlwriter php80-xsl php80-zip php80-zlib pkg redis sudo
+apache24 bash bash-completion ffmpeg nano php83 php83-bcmath php83-bz2 php83-ctype php83-curl php83-dom php83-exif php83-fileinfo php83-filter php83-ftp php83-gd php83-gmp php83-iconv php83-imap php83-intl php83-ldap php83-mbstring php83-mysqli php83-opcache php83-pcntl php83-pdo php83-pdo_mysql php83-pear-horde-Horde_HashTable php83-pecl-APCu php83-pecl-imagick php83-pecl-mcrypt php83-pecl-redis php83-posix php83-session php83-simplexml php83-sodium php83-sysvsem php83-xml php83-xmlreader php83-xmlwriter php83-xsl php83-zip php83-zlib pkg redis sudo

jails/config/common/httpd.conf

@@ -552,6 +552,14 @@ SSLRandomSeed connect builtin
 
 Include etc/apache24/Includes/*.conf
 
+# https://ssl-config.mozilla.org/#server=apache&version=2.4.60&config=intermediate&openssl=3.1.0&guideline=5.7
+
+<VirtualHost *:80>
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/
+    RewriteRule ^.*$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,QSA,L]
+</VirtualHost>
+
 <VirtualHost *:443>
     ServerName www.ahlawat.com
     ServerAlias *.ahlawat.com
@@ -561,16 +569,20 @@ Include etc/apache24/Includes/*.conf
 
     DocumentRoot "/usr/local/www/apache24/data/"
 
+    # HTTP Strict Transport Security (mod_headers is required) (63072000 seconds)
+    Header always set Strict-Transport-Security "max-age=63072000"
+
     SSLEngine on
     SSLCertificateFile "/mnt/certs/fullchain.pem"
     SSLCertificateKeyFile "/mnt/certs/privkey.pem"
-    #SSLCertificateChainFile "/mnt/certs/fullchain.pem"
+#    SSLCertificateChainFile "/mnt/certs/fullchain.pem"
-    SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
+    SSLCACertificateFile "/mnt/certs/cacert.pem"
-    SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
+
-    SSLHonorCipherOrder off
+    SSLProtocol             -all +TLSv1.2 +TLSv1.3
-    SSLSessionTickets off
+    SSLOpenSSLConfCmd       Curves X25519:prime256v1:secp384r1
-    SSLOptions +StrictRequire
+    SSLCipherSuite          ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305
-#    SSLCompression off
+    SSLHonorCipherOrder     off
+    SSLSessionTickets       off
 
     RewriteEngine On
     RewriteCond %{HTTP:Authorization} ^(.*)

jails/config/common/pkgp.conf

@@ -5,14 +5,12 @@ FreeBSD: {
 
 pkgp-freebsd-pkg: {
     url: "http://pkgp-freebsd-pkg.ahlawat.com/${ABI}/latest",
-    mirror_type: "http",
     enabled: yes,
     priority: 10
 }
 
 pkgp123: {
     url: "http://pkgp.ahlawat.com/packages/pj123-default",
-    mirror_type: "http",
     signature_type: "pubkey",
     pubkey: "/mnt/certs/poudriere.cert",
     enabled: no,

jails/config/db/pkg-list-details-old.txt

@@ -1,6 +1,7 @@
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____mariadb105-server-10.5.17_1
+pkgp-freebsd-pkg____mariadb114-client-11.4.5_1
-pkgp-freebsd-pkg____mysqld_exporter-0.12.1_6
+pkgp-freebsd-pkg____mariadb114-server-11.4.5_1
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____mysqld_exporter-0.12.1_25
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____nano-8.4
+pkgp-freebsd-pkg____pkg-2.1.2

jails/config/db/pkg-list-details.txt

@@ -1,6 +1,7 @@
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____mariadb105-server-10.5.17_1
+pkgp-freebsd-pkg____mariadb114-client-11.4.5_1
-pkgp-freebsd-pkg____mysqld_exporter-0.12.1_6
+pkgp-freebsd-pkg____mariadb114-server-11.4.5_1
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____mysqld_exporter-0.12.1_25
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____nano-8.4
+pkgp-freebsd-pkg____pkg-2.1.2

jails/config/db/pkg-list-old.txt

@@ -1 +1 @@
-bash bash-completion mariadb105-server mysqld_exporter nano pkg
+bash bash-completion mariadb114-client mariadb114-server mysqld_exporter nano pkg

jails/config/db/pkg-list.txt

@@ -1 +1 @@
-bash bash-completion mariadb105-server mysqld_exporter nano pkg
+bash bash-completion mariadb114-client mariadb114-server mysqld_exporter nano pkg

jails/config/db/server.cnf

@@ -44,7 +44,7 @@ skip-external-locking
 key_buffer_size = 16K
 max_allowed_packet = 64M
 table_open_cache = 16
-sort_buffer_size = 64K
+sort_buffer_size = 4M
 read_buffer_size = 256K
 read_rnd_buffer_size = 256K
 net_buffer_length = 2K
@@ -58,7 +58,7 @@ innodb_io_capacity=4000
 transaction-isolation = READ-COMMITTED
 innodb_log_file_size = 250M
 innodb_flush_log_at_trx_commit = 2
-innodb_checksum_algorithm = none
+# innodb_checksum_algorithm = none
 
 slow_query_log_file = /var/db/mysql-log/slow.log
 

jails/config/dns/dns_update.sh

@@ -1,59 +1,10 @@
-#!/usr/local/bin/bash
+rndc reconfig
 
-# Copyright (c) 2018-2022, diyIT.org
+rndc dnssec -status ahlawat.com
-# All rights reserved.
+dig @127.0.0.1 ahlawat.com. A +dnssec +multiline
-#
-# BSD 2-Clause License ("Simplified BSD License" or "FreeBSD License")
-# https://diyit.org/license/
-#
-#
 
-#SIM="-s"
+rndc dnssec -status diyit.org
-#SIM=""
+dig @127.0.0.1 diyit.org. A +dnssec +multiline
 
-#rpl $SIM -v -R "2001:470:480a:a1::" "2001:470:480a:8001::" ./namedb
+rndc dnssec -status rockwoodestates.org
-#rpl $SIM -v -R "100.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.8" "100.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.8" ./namedb
+dig @127.0.0.1 rockwoodestates.org. A +dnssec +multiline
-#rpl $SIM -v -R "2021120700" "2022010100" ./namedb
-#service $SIM named $SIM restart
-
-
-service named stop
-
-cd /data/namedb/master
-
-rm /data/namedb/master/*signed*
-
-declare -A ZONE_PEM
-# ZONE_PEM=(["ahlawat.com"]="" ["beyondbell.com"]="bb" ["diyit.org"]="diy" ["xflow.org"]="xflow" ["datavpc.com"]="dvpc" ["mydatavpc.com"]="mdvpc" ["rockwoodestates.org"]="rwe" ["rockwoodranch.org"]="rwr" ["scvcc-rental.com"]="scvcc" ["inseego5g.net"]="i5g" )
-ZONE_PEM=(["ahlawat.com"]="" ["beyondbell.com"]="bb" ["diyit.org"]="diy" ["datavpc.com"]="dvpc" ["mydatavpc.com"]="mdvpc" ["rockwoodestates.org"]="rwe" ["rockwoodranch.org"]="rwr" ["scvcc-rental.com"]="scvcc" ["inseego5g.net"]="i5g" )
-
-for ZONE in "${!ZONE_PEM[@]}"
-do
-    PEM=${ZONE_PEM[$ZONE]}
-
-    /usr/local/bin/ldns-dane -c "/mnt/certs/${PEM}fullchain.pem" create mail.$ZONE 25 3 1 1 > /data/namedb/master/tlsa-$ZONE
-    /usr/local/bin/ldns-dane -c "/mnt/certs/${PEM}fullchain.pem" create mail-backup.$ZONE 25 3 1 1 >> /data/namedb/master/tlsa-$ZONE
-    /usr/local/bin/ldns-dane -c "/mnt/certs/${PEM}fullchain.pem" create $ZONE 443 3 1 1 >> /data/namedb/master/tlsa-$ZONE
-    /usr/local/bin/ldns-dane -c "/mnt/certs/${PEM}fullchain.pem" create www.$ZONE 443 3 1 1 >> /data/namedb/master/tlsa-$ZONE
-done
-
-NEW_SERIAL=`date -j +%Y%m%d%H`
-#NEW_SERIAL="2022022635"
-
-for DBFILE in `ls /data/namedb/master/*.db`
-do
-    ZONE=`echo $DBFILE | cut -d/ -f 5 | cut -d. -f -2`
-
-    /usr/local/sbin/named-checkzone $ZONE $DBFILE
-    SERIAL=`/usr/local/sbin/named-checkzone $ZONE $DBFILE | egrep -ho '[0-9]{10}'`
-    echo $SERIAL
-    echo $NEW_SERIAL
-    sed -i .orig 's/'$SERIAL'/'$(($NEW_SERIAL))'/' $DBFILE
-
-    #/usr/local/sbin/dnssec-signzone -S -K /data/namedb/master -t -o $ZONE $DBFILE
-    /usr/local/sbin/dnssec-signzone -3 $(head -c 1024 /dev/random | sha1sum | cut -b 1-16) -K /data/namedb/master -t -o $ZONE $DBFILE
-done
-
-chown bind:bind /data/namedb/master/*
-
-service named start

jails/config/dns/pkg-list-details-old.txt

@@ -1,7 +1,7 @@
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____bind916-9.16.34_1
+pkgp-freebsd-pkg____bind920-9.20.8
-pkgp-freebsd-pkg____ldns-1.8.3
+pkgp-freebsd-pkg____ldns-1.8.4
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____rpl-1.4.1
+pkgp-freebsd-pkg____rpl-1.4.1_1

jails/config/dns/pkg-list-details.txt

@@ -1,7 +1,7 @@
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____bind916-9.16.35
+pkgp-freebsd-pkg____bind920-9.20.8
-pkgp-freebsd-pkg____ldns-1.8.3
+pkgp-freebsd-pkg____ldns-1.8.4
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____rpl-1.4.1
+pkgp-freebsd-pkg____rpl-1.4.1_1

jails/config/dns/pkg-list-old.txt

@@ -1 +1 @@
-bash bash-completion bind916 ldns nano pkg rpl
+bash bash-completion bind920 ldns nano pkg rpl

jails/config/dns/pkg-list.txt

@@ -1 +1 @@
-bash bash-completion bind916 ldns nano pkg rpl
+bash bash-completion bind920 ldns nano pkg rpl

jails/config/elk/pkg-list-details-old.txt

@@ -1,10 +1,9 @@
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____bash-5.2.26_1
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.11_2,2
-pkgp-freebsd-pkg____beats7-7.17.7
+pkgp-freebsd-pkg____beats8-8.8.2_4
-pkgp-freebsd-pkg____curl-7.85.0
+pkgp-freebsd-pkg____curl-8.5.0_1
-pkgp-freebsd-pkg____elasticsearch7-7.17.7
+pkgp-freebsd-pkg____elasticsearch8-8.11.3
-pkgp-freebsd-pkg____kibana7-7.17.7
+pkgp-freebsd-pkg____kibana8-8.11.3
-pkgp-freebsd-pkg____logstash7-7.17.7
+pkgp-freebsd-pkg____logstash8-8.11.3
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-7.2
-pkgp-freebsd-pkg____openjdk11-11.0.17+8.1_1
+pkgp-freebsd-pkg____pkg-1.20.9_1
-pkgp-freebsd-pkg____pkg-1.18.4

jails/config/elk/pkg-list-details.txt

@@ -1,10 +1,9 @@
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.26_1
 pkgp-freebsd-pkg____bash-completion-2.11_2,2
-pkgp-freebsd-pkg____beats7-7.17.7
+pkgp-freebsd-pkg____beats8-8.8.2_4
-pkgp-freebsd-pkg____curl-7.85.0
+pkgp-freebsd-pkg____curl-8.6.0
-pkgp-freebsd-pkg____elasticsearch7-7.17.7
+pkgp-freebsd-pkg____elasticsearch8-8.11.3
-pkgp-freebsd-pkg____kibana7-7.17.7
+pkgp-freebsd-pkg____kibana8-8.11.3
-pkgp-freebsd-pkg____logstash7-7.17.7
+pkgp-freebsd-pkg____logstash8-8.11.3
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-7.2
-pkgp-freebsd-pkg____openjdk11-11.0.17+8.1_1
+pkgp-freebsd-pkg____pkg-1.20.9_1
-pkgp-freebsd-pkg____pkg-1.18.4

jails/config/elk/pkg-list-old.txt

@@ -1 +1 @@
-bash bash-completion beats7 curl elasticsearch7 kibana7 logstash7 nano openjdk11 pkg
+bash bash-completion beats8 curl elasticsearch8 kibana8 logstash8 nano pkg

jails/config/elk/pkg-list.txt

@@ -1 +1 @@
-bash bash-completion beats7 curl elasticsearch7 kibana7 logstash7 nano openjdk11 pkg
+bash bash-completion beats8 curl elasticsearch8 kibana8 logstash8 nano pkg

jails/config/git/gitea-restart.sh

@@ -14,7 +14,7 @@ Q=`netstat -LAan | grep "*.3000" | cut -f3 -d" " | cut -f1 -d/`
 # 1537 is max stuck recvQ qlen limit when logging start:
 # sonewconn: pcb 0xfffff804b9f73d58: Listen queue overflow: 1537 already in queue awaiting acceptance (30 occurrences)
 
-if [ ! "$Q" ] || [ $Q -ge 100 ]; then
+if [ ! $Q ] || [ $Q -ge 100 ]; then
     echo "restarting gitea stuck at $Q"
     tail /var/log/gitea/gitea.log
     kill -9 `pgrep gitea` ; sleep 2 ; service gitea start

jails/config/git/gitea/conf/app.ini

@@ -20,75 +20,72 @@
 APP_NAME = Ahlawat GIT
 RUN_USER = git
 RUN_MODE = prod
+WORK_PATH = /usr/local/share/gitea
 
 [database]
 DB_TYPE = mysql
-HOST    = 192.168.0.53:3306
+HOST = 192.168.0.53:3306
-NAME    = gitea
+NAME = gitea
-USER    = gitea
+USER = gitea
-PASSWD  = mysql__gitea
+PASSWD = mysql__gitea
 
 [indexer]
 ISSUE_INDEXER_PATH = /var/db/gitea/indexers/issues.bleve
 
 [log]
 ROOT_PATH = /var/log/gitea
-MODE      = file
+MODE = file
-LEVEL     = Info
+LEVEL = Warn
-ENABLE_ACCESS_LOG = true
-ACCESS    = file
 
 [picture]
-DISABLE_GRAVATAR        = true
+DISABLE_GRAVATAR = true
-AVATAR_UPLOAD_PATH      = /var/db/gitea/data/avatars
+AVATAR_UPLOAD_PATH = /var/db/gitea/data/avatars
 
 [repository]
 ROOT = /var/db/gitea/gitea-repositories
 
 # Gitea's default is 'bash', so if you have bash installed, you can comment
 # this out.
-#SCRIPT_TYPE = sh
+# SCRIPT_TYPE = sh
-
 [repository.upload]
 TEMP_PATH = /var/db/gitea/data/tmp/uploads
 
 [security]
-INSTALL_LOCK       = true
+INSTALL_LOCK = true
-INTERNAL_TOKEN     = 1FFhAklka01JhgJTRUrFujWYiv4ijqcTIfXJ9o4n1fWxz+XVQdXhrqDTlsnD7fvz7gugdhgkx0FY2Lx6IBdPQw==
+INTERNAL_TOKEN = 1FFhAklka01JhgJTRUrFujWYiv4ijqcTIfXJ9o4n1fWxz+XVQdXhrqDTlsnD7fvz7gugdhgkx0FY2Lx6IBdPQw==
-SECRET_KEY         = BeyondChangeMeBeforeRunningBell
+SECRET_KEY = BeyondChangeMeBeforeRunningBell
 IMPORT_LOCAL_PATHS = true
 
 [session]
-COOKIE_SECURE   = true
+COOKIE_SECURE = true
 
 [server]
-DOMAIN        = git.ahlawat.com
+DOMAIN = git.ahlawat.com
-PROTOCOL      = https
+PROTOCOL = https
-HTTP_ADDR     = ::
+HTTP_ADDR = ::
-HTTP_PORT     = 3000
+HTTP_PORT = 3000
-ROOT_URL      = https://git.ahlawat.com/
+ROOT_URL = https://git.ahlawat.com/
-DISABLE_SSH   = true
+DISABLE_SSH = true
-SSH_DOMAIN    = %(DOMAIN)s
+SSH_DOMAIN = %(DOMAIN)s
-SSH_PORT      = 22
+SSH_PORT = 22
-OFFLINE_MODE  = false
+OFFLINE_MODE = false
 APP_DATA_PATH = /var/db/gitea/data
-CERT_FILE     = /mnt/certs/fullchain.pem
+CERT_FILE = /mnt/certs/fullchain.pem
-KEY_FILE      = /mnt/certs/privkeyr.pem
+KEY_FILE = /mnt/certs/privkeyr.pem
-LANDING_PAGE  = explore
+LANDING_PAGE = explore
 
 [service]
-DISABLE_REGISTRATION   = true
+DISABLE_REGISTRATION = true
 
 [openid]
 ENABLE_OPENID_SIGNIN = false
 
 [other]
-SHOW_FOOTER_BRANDING           = false
+SHOW_FOOTER_BRANDING = false
-SHOW_FOOTER_VERSION            = false
+SHOW_FOOTER_VERSION = false
 SHOW_FOOTER_TEMPLATE_LOAD_TIME = false
 
 [oauth2]
 JWT_SECRET = 3giTtKAIflI_e9ixoU6ELHfxGaDkvFwHxDoPZQyZ0ak
 
 [ui]
-#DEFAULT_THEME = arc-green

jails/config/git/gitea/options/license

@@ -1,25 +0,0 @@
-BSD 2-Clause License ("Simplified BSD License" or "FreeBSD License")
-
-Copyright (c) 2018-2019, diyIT.org
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

jails/config/git/pkg-list-details-old.txt

@@ -1,6 +1,6 @@
-pkgp123____openldap26-client-2.6.3
+pkgp123____gitea-1.23.6_1
-pkgp123____pkg-1.18.4
+pkgp123____openldap26-client-2.6.9_1
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp123____pkg-2.1.2
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____gitea-1.17.3
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4

jails/config/git/pkg-list-details.txt

@@ -1,6 +1,6 @@
-pkgp123____openldap26-client-2.6.3
+pkgp123____gitea-1.23.6_1
-pkgp123____pkg-1.18.4
+pkgp123____openldap26-client-2.6.9_1
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp123____pkg-2.1.2
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____gitea-1.17.3
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4

jails/config/git/pkgp.conf

@@ -5,14 +5,12 @@ FreeBSD: {
 
 pkgp-freebsd-pkg: {
     url: "http://pkgp-freebsd-pkg.ahlawat.com/${ABI}/latest",
-    mirror_type: "http",
     enabled: yes,
     priority: 10
 }
 
 pkgp123: {
     url: "http://pkgp.ahlawat.com/packages/pj123-default",
-    mirror_type: "http",
     signature_type: "pubkey",
     pubkey: "/mnt/certs/poudriere.cert",
     enabled: yes,

jails/config/hass/.tmux.conf

@@ -1,12 +0,0 @@
-unbind C-b
-set -g prefix C-a
-bind C-a send-prefix
-
-setw -g mouse on
-
-# Set the default terminal mode to 256color mode
-set -g default-terminal "xterm-256color"
-
-# enable activity alerts
-setw -g monitor-activity on
-set -g visual-activity on

jails/config/hass/hass-upgrade.sh

@@ -1,4 +0,0 @@
-#!/usr/local/bin/bash
-source /data/homeassistant/bin/activate
-#pip install --upgrade git+git://github.com/home-assistant/home-assistant.git@dev
-pip install --upgrade homeassistant

jails/config/hass/hass.sh

@@ -1,15 +0,0 @@
-#!/usr/local/bin/bash
-
-# Copyright (c) 2018-2022, diyIT.org
-# All rights reserved.
-#
-# BSD 2-Clause License ("Simplified BSD License" or "FreeBSD License")
-# https://diyit.org/license/
-#
-#
-
-# ./hass.sh under tmux
-
-cd /data/homeassistant/
-source bin/activate
-hass --ignore-os-check

jails/config/hass/heyu.sh

@@ -1,15 +0,0 @@
-#!/usr/local/bin/bash
-
-# Copyright (c) 2018-2022, diyIT.org
-# All rights reserved.
-#
-# BSD 2-Clause License ("Simplified BSD License" or "FreeBSD License")
-# https://diyit.org/license/
-#
-#
-
-# ./hass.sh under tmux
-
-heyu start
-heyu info
-heyu monitor

jails/config/hass/pkg-list-details-old.txt

@@ -1,16 +0,0 @@
-pkgp-freebsd-pkg____bash-5.2.9
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
-pkgp-freebsd-pkg____cmake-3.24.3
-pkgp-freebsd-pkg____ffmpeg-4.4.3_1,1
-pkgp-freebsd-pkg____git-lite-2.38.1_3
-pkgp-freebsd-pkg____gmake-4.3_2
-pkgp-freebsd-pkg____heyu2-2.10_1
-pkgp-freebsd-pkg____libxslt-1.1.37
-pkgp-freebsd-pkg____nano-6.4
-pkgp-freebsd-pkg____openjpeg-2.5.0
-pkgp-freebsd-pkg____pkg-1.18.4
-pkgp-freebsd-pkg____py39-sqlite3-3.9.15_7
-pkgp-freebsd-pkg____python39-3.9.15_1
-pkgp-freebsd-pkg____rust-1.64.0
-pkgp-freebsd-pkg____tmux-3.3a
-pkgp-freebsd-pkg____wget-1.21.3_1

jails/config/hass/pkg-list-details.txt

@@ -1,16 +0,0 @@
-pkgp-freebsd-pkg____bash-5.2.12
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
-pkgp-freebsd-pkg____cmake-3.24.3
-pkgp-freebsd-pkg____ffmpeg-4.4.3_1,1
-pkgp-freebsd-pkg____git-lite-2.38.1_4
-pkgp-freebsd-pkg____gmake-4.3_2
-pkgp-freebsd-pkg____heyu2-2.10_1
-pkgp-freebsd-pkg____libxslt-1.1.37
-pkgp-freebsd-pkg____nano-7.0
-pkgp-freebsd-pkg____openjpeg-2.5.0
-pkgp-freebsd-pkg____pkg-1.18.4
-pkgp-freebsd-pkg____py39-sqlite3-3.9.15_7
-pkgp-freebsd-pkg____python39-3.9.15_1
-pkgp-freebsd-pkg____rust-1.65.0
-pkgp-freebsd-pkg____tmux-3.3a
-pkgp-freebsd-pkg____wget-1.21.3_1

jails/config/hass/pkg-list-old.txt

@@ -1 +0,0 @@
-bash bash-completion cmake ffmpeg git-lite gmake heyu2 libxslt nano openjpeg pkg py39-sqlite3 python39 rust tmux wget

jails/config/hass/pkg-list.txt

@@ -1 +0,0 @@
-bash bash-completion cmake ffmpeg git-lite gmake heyu2 libxslt nano openjpeg pkg py39-sqlite3 python39 rust tmux wget

jails/config/hass/setup_jail.sh

@@ -1,4 +0,0 @@
-# requrired to run other configured scripts
-/bin/sh /etc/rc
-# launch tmux with jails
-/mnt/config/startsessions.sh

jails/config/hass/startsessions.sh

@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2018-2022, diyIT.org
-# All rights reserved.
-#
-# BSD 2-Clause License ("Simplified BSD License" or "FreeBSD License")
-# https://diyit.org/license/
-#
-#
-
-session="sess_tmux"
-
-# set up tmux
-tmux start-server
-
-# create a new tmux session, naming the window freepbx
-tmux new-session -d -s $session -n hass
-tmux selectp -t 1
-tmux send-keys "cd /mnt/config;./hass.sh" C-m
-
-# create a new window windows
-tmux new-window -t $session:1 -n heyu
-tmux selectp -t 1
-tmux send-keys "cd /mnt/config;./heyu.sh" C-m
-
-# return to main window
-tmux select-window -t $session:0
-tmux selectp -t 1
-
-# Finished setup, attach to the tmux session!
-#tmux attach-session -t $session

jails/config/hass/x10.conf

@@ -1,264 +0,0 @@
-# Example Heyu configuration file.  Copy this to file 'x10config' in
-# directory $HOME/.heyu/ and modify as required. This example uses
-# features which are new to heyu version 2
-# and which will not be recognized by heyu version 1.xx.
-
-# Note: This example file describes only a few of the most commom
-# configuration directives.  For the complete list see man page
-# x10config(5).
-
-# Anything on a line between a '#' character and the end of the line is
-# treated as a comment and ignored by Heyu, as are blank lines.
-# The various configuration directives in this file can be in any order
-# except that ALIAS directives must appear before any other directive
-# which references the alias label in place of a housecode|unit address.
-# See 'man x10config' for additional information and directives.
-
-# Serial port to which the CM11a is connected. Default is /dev/ttyS0.
-
-tty /dev/ttyU0
-check_ri_line NO
-
-# If you have an X10 compatible RF receiver connected to a second
-# serial port, use the TTY_AUX directive to specify the serial port
-# and model of receiver.  Supported receivers are W800RF32, MR26A,
-# and RFXCOM.  There are no defaults.
-
-tty_aux /dev/ttyU1 MR26A
-
-# The CM19A is both a receiver and transmitter for X10 RF signals.
-# The MR26A is a receiver only.
-# The CM19A is USB and the MR26A is serial port
-
-# Base housecode.  The default is A.
-
-#housecode A
-
-# Aliases:
-# Format:  ALIAS  Label  Housecode|Unitcode_string  [Module_Type]
-
-# The label is limited to 32 characters in length and is case-sensitive,
-# e.g., Front_Porch and front_porch are treated as different labels.
-# Each alias may reference a single unitcode or a multiple unitcode
-# string (no embedded blanks), but is limited to one housecode.
-
-# The optional Module_Type is the general type or specific model number
-# of a module currently supported by Heyu. (Knowing the characteristics
-# of a module allows Heyu to track changes in its On/Off/Dim state
-# as X10 signals are sent or received.)  The most commonly used modules
-# are the standard X10 lamp module (StdLM) and standard X10 appliance
-# module (StdAM).  Other modules currently supported by Heyu are listed
-# in x10config(5).  A standard X10 lamp module (StdLM) is the
-# default (changeable with the DEFAULT_MODULE directive)
-# for housecode|units which are not defined in an alias directive.
-# A module_type should normally not be defined for mutiple-unit
-# aliases, just for the single-unit aliases.  (The module characteristics
-# are associated with the housecode|unit, however referenced.)
-
-# Some examples:
-
-
-
-
-# Note: Prior versions of Heyu used a different format for
-# aliases - no ALIAS directive and the Housecode and Unitcode_string
-# were separated by a space, e.g., simply:
-#  front_porch  A  1
-# Heyu will continue to accept this older format for compatibility,
-# but its use is discouraged as modules cannot be specified.
-
-# Scenes and Usersyns (User-defined synonyms):
-# Format:  SCENE   Label Command1 <args> [; Command2 <args> [; ...
-# Format:  USERSYN Label Command1 <args> [; Command2 <args> [; ...
-# The label is limited to 32 characters and is case-sensitive.
-# Scenes and Usersyns are both semicolon-separated lists of
-# commands with their arguments which can be executed or used
-# in macros as if their labels were ordinary Heyu commands.
-# See 'man x10config' for the features and limitations of Scenes
-# and Usersyns.
-# (In the current version of heyu, the ONLY distinction between
-# scenes and usersyns is the 'show' menus in which they appear.)
-# Some examples:
-
-SCENE blinker on D5; off D5; on D5; off D5
-#USERSYN normal_lights on front_porch; on back_porch
-#SCENE tv_on on tv_set; dimb living_room 10
-
-# parameters, e.g., $1, $2, which are replaced by actual
-# parameters supplied when the scene/usersyn is run.
-
-#USERSYN night_lights dimb front_porch $1; dimb back_porch $1
-
-# Define the (writeable) directory where the Heyu state engine daemon
-# (started with 'heyu engine') is to write its log file 'heyu.log.<tty>'.
-# The default is 'NONE', indicating no log file is to be written.
-
-log_dir /usr/local/etc/heyu/log
-
-# The entries in the log file are similar to those which appear in
-# the heyu monitor, but in addition will include an entry when
-# a script is launched, and unless redirected elsewhere, any
-# text output from that script.
-
-# Note that the log file will continue to grow.  Manually delete
-# or trim it from time to time, or configure a Unix utility like
-# 'logrotate' to manage this task automatically.
-
-# If the Heyu state engine is running, Heyu can launch scripts
-# (or any Unix commands) when it sees specified X10 signals.
-# The format is:
-
-#SCRIPT [ -l label ] <launch conditions> :: [options] <command line>
-
-# where label is an optional label, <launch conditions> tell
-# Heyu under what conditions to launch the script, and
-# <command line> is the script command to be executed.
-# The '::' (two colons) separator is mandatory since the launch
-# conditions can be quite complex.
-# See x10scripts(5) for details, but here's a simple example
-# (with no label):
-
-#SCRIPT doorbell on :: play $HOME/sounds/barking_dog.wav
-
-# Users have the option of running either 'heyuhelper' in a manner
-# similar to heyu 1.35 or general scripts as above with the
-# following directive.  The default is SCRIPTS, to run general scripts.
-
-#script_mode SCRIPTS
-
-# (With the choice 'HEYUHELPER', a script named 'heyuhelper' on
-# the user's path is run every time any X10 signal is received
-# by heyu over the power line, assuming the heyu state engine
-# daemon is running.)
-
-###  The following directives apply when a schedule is ###
-###  is uploaded to the CM11A interface.               ###
-
-# The file name of the user's X10 schedule file in the Heyu base
-# directory. The default is 'x10.sched'.  If you regularly use
-# more than one, list them here and just comment/uncomment as
-# appropriate, e.g.,
-
-#schedule_file x10.sched
-#schedule_file normal.sched
-#schedule_file vacation.sched
-
-# The MODE directive - Heyu's two modes of operation:
-# In the default COMPATIBLE mode, the schedule uploaded to the
-# interface is configured to begin on Jan 1st of the current
-# year and # is valid for 366 days - through Dec 31st of the
-# current # year or Jan 1st of the following year, depending
-# whether # the current year is a leap or common year.
-# COMPATIBLE mode is the default.
-
-# In HEYU mode the schedule uploaded to the interface is
-# configured to begin on today's date and is valid for
-# the number days of provided by the PROGRAM_DAYS directive.
-# WARNING: The mere execution of X10's ActiveHome(tm) program
-# under MS-Windows, or having its resident driver running, when
-# the interface has been programmed by Heyu in HEYU mode can
-# cause problems.  See 'man x10config' for details.
-
-#mode COMPATIBLE
-
-# Number of days for which the interface is to be programmed
-# when running in HEYU mode.  It is ignored in COMPATIBLE mode.
-# (A shorter period can yield more accurate values for dawn
-# and dusk.)  The default is 366 days.
-
-#program_days 366
-
-# Should Heyu combine events having the same date range, time, etc.,
-# by concatenating the macros for similar events?   The default is YES.
-
-#combine_events YES
-
-# Should Heyu compress uploaded macros by combining unit codes for the same
-#housecode and command and eliminating duplicates? E.g.,
-#  (on A1; on B2; on A3, on B2) ==> (on A1,3; on B2)
-# The default is NO
-
-#compress_macros NO
-
-# The user's Longitude and Latitude, needed for dawn/dusk calculations.
-# There are no defaults.  Don't use these examples - put in values
-# for your own location.
-
-longitude W121:46
-latitude N37:16
-
-# For dawn/dusk related times, Heyu breaks up the schedule date intervals
-# into subintervals, each with a constant value of dawn or dusk time.
-# These directives instruct Heyu what value of dawn/dusk time to use.
-# The default value is FIRST, i.e., that on the first day of the subinterval,
-# which is most convenient for comparing Heyu's computations with actual.
-
-#dawn_option FIRST
-#dusk_option FIRST
-
-# The following times allow bounds to be placed on the times of Dawn
-# and Dusk computed by Heyu. For example, setting the value for
-#min_dawn to 06:30 will ensure that an event scheduled to be
-# executed at Dawn will occur at 06:30 during summer hours whenever
-# the actual computed value of Dawn is earlier than that time.
-# The value for these directives are specified as hh:mm Legal
-# (i.e., wall-clock) time, or the directives may be disabled with
-# the word OFF, which is the default.
-
-# Timer options DAWNLT, DAWNGT, DUSKLT, DUSKGT used in the Heyu
-# schedule file will usually eliminate the need for these directives.
-# See man page x10sched(5) for details.
-
-#min_dawn OFF
-#max_dawn OFF
-#min_dusk OFF
-#max_dusk OFF
-
-# Directory to write reports and files other than the critical files
-# The default is to write them in the Heyu base directory.
-
-#report_path ./
-
-# Replace events having delayed macros with new events and new
-# undelayed macros when possible. (The purpose is to avoid pending
-# delayed macros, which are purged when a new schedule is uploaded.)
-# The default is YES.
-
-#repl_delayed_macros YES
-
-# For test purposes, Heyu can write some additional files when
-# the command 'heyu upload check' is executed.  This directive
-# instructs Heyu to write these files.  The default is NO.
-
-#write_check_files NO
-
-START_ENGINE AUTO
-
-alias Kitchen D1 StdLM
-alias Family_Room D2 StdLM
-alias Hallway D3 StdLM
-alias Kitchen_Table D4 StdLM
-alias Stairway D5 StdLM
-alias Study D6 StdLM
-alias Dining D7 StdLM
-alias Bonus_Room D8 StdLM
-alias Living_Room_L0 D9 StdLM
-alias Front_Door D10 StdLM
-alias Living_Room_L1 D11 StdLM
-alias Living_Room_L2 D12 StdLM
-alias Piano_Room_L1 D13 StdLM
-alias Piano_Room_L2 D14 StdLM
-alias Family_Room_L0 D15 StdLM
-alias Chime G1 StdAM
-alias Main_Garage G2 StdAM
-alias Side_Garage G3 StdAM
-alias Front_Yard G13 StdLM
-alias Back_Yard G14 StdLM
-alias Plants_front_house I1 RAIN8II
-alias Plants_front_road I2 RAIN8II
-alias Lawn_front_road I3 RAIN8II
-alias Lawn_front_garage I4 RAIN8II
-alias Lawn_back_pool I5 RAIN8II
-alias Lawn_back_house I6 RAIN8II
-alias Plants_back_garage I7 RAIN8II
-alias Plants_back_road I8 RAIN8II

jails/config/hub/httpd.conf

@@ -553,6 +553,14 @@ SSLRandomSeed connect builtin
 
 Include etc/apache24/Includes/*.conf
 
+# https://ssl-config.mozilla.org/#server=apache&version=2.4.60&config=intermediate&openssl=3.1.0&guideline=5.7
+
+<VirtualHost *:80>
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/
+    RewriteRule ^.*$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,QSA,L]
+</VirtualHost>
+
 <VirtualHost *:443>
     ServerName hub.ahlawat.com
     ServerAlias *.ahlawat.com
@@ -562,16 +570,20 @@ Include etc/apache24/Includes/*.conf
 
     DocumentRoot "/usr/local/www/apache24/data/"
 
+    # HTTP Strict Transport Security (mod_headers is required) (63072000 seconds)
+    Header always set Strict-Transport-Security "max-age=63072000"
+
     SSLEngine on
     SSLCertificateFile "/mnt/certs/fullchain.pem"
     SSLCertificateKeyFile "/mnt/certs/privkey.pem"
-    #SSLCertificateChainFile "/mnt/certs/fullchain.pem"
+#    SSLCertificateChainFile "/mnt/certs/fullchain.pem"
-    SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
+    SSLCACertificateFile "/mnt/certs/cacert.pem"
-    SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
+
-    SSLHonorCipherOrder off
+    SSLProtocol             -all +TLSv1.2 +TLSv1.3
-    SSLSessionTickets off
+    SSLOpenSSLConfCmd       Curves X25519:prime256v1:secp384r1
-    SSLOptions +StrictRequire
+    SSLCipherSuite          ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305
-#    SSLCompression off
+    SSLHonorCipherOrder     off
+    SSLSessionTickets       off
 
     RewriteEngine On
     RewriteCond %{HTTP:Authorization} ^(.*)

jails/config/hub/periodic.conf

@@ -1,4 +1,4 @@
-daily_rkhunter_update_enable="YES"
+security_rkhunter_update_enable="YES"
-daily_rkhunter_update_flags="--update --nocolors"
+security_rkhunter_update_flags="--update --nocolors"
-daily_rkhunter_check_enable="YES"
+security_rkhunter_check_enable="YES"
-daily_rkhunter_check_flags="--checkall --nocolors --skip-keypress"
+security_rkhunter_check_flags="--checkall --nocolors --skip-keypress"

jails/config/hub/pkg-list-details-old.txt

@@ -1,28 +1,34 @@
-pkgp123____apache24-2.4.54
+pkgp123____apache24-2.4.63
-pkgp123____apr-1.7.0.1.6.1_2
+pkgp123____apr-1.7.5.1.6.3_4
-pkgp123____pkg-1.18.4
+pkgp123____ca_root_nss-3.108
-pkgp123____samba413-4.13.17_4
+pkgp123____pkg-2.1.2
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp123____samba416-4.16.11_6
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____firefox-esr-102.5.0,1
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____fluxbox-1.3.7_5
+pkgp-freebsd-pkg____fluxbox-1.3.7_10
-pkgp-freebsd-pkg____iperf3-3.12
+pkgp-freebsd-pkg____iperf3-3.18
-pkgp-freebsd-pkg____mc-4.8.28
+pkgp-freebsd-pkg____mc-4.8.32
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4
 pkgp-freebsd-pkg____p7zip-16.02_3
-pkgp-freebsd-pkg____php81-ldap-8.1.12
+pkgp-freebsd-pkg____php84-8.4.6
-pkgp-freebsd-pkg____php81-mysqli-8.1.12
+pkgp-freebsd-pkg____php84-filter-8.4.6
-pkgp-freebsd-pkg____php81-pgsql-8.1.12
+pkgp-freebsd-pkg____php84-gd-8.4.6
-pkgp-freebsd-pkg____php81-session-8.1.12
+pkgp-freebsd-pkg____php84-iconv-8.4.6
-pkgp-freebsd-pkg____rename-1.99.2
+pkgp-freebsd-pkg____php84-ldap-8.4.6
-pkgp-freebsd-pkg____rkhunter-1.4.6_1
+pkgp-freebsd-pkg____php84-mbstring-8.4.6
-pkgp-freebsd-pkg____rsync-3.2.6
+pkgp-freebsd-pkg____php84-mysqli-8.4.6
-pkgp-freebsd-pkg____sshguard-2.4.2_2,1
+pkgp-freebsd-pkg____php84-pgsql-8.4.6
-pkgp-freebsd-pkg____sudo-1.9.12p1
+pkgp-freebsd-pkg____php84-session-8.4.6
-pkgp-freebsd-pkg____tigervnc-server-1.12.0_5
+pkgp-freebsd-pkg____rename-1.99.2_1
-pkgp-freebsd-pkg____unrar-6.12,6
+pkgp-freebsd-pkg____rkhunter-1.4.6_3
-pkgp-freebsd-pkg____wget-1.21.3_1
+pkgp-freebsd-pkg____rsync-3.4.1_2
-pkgp-freebsd-pkg____xauth-1.1.1
+pkgp-freebsd-pkg____sshguard-2.4.3_3,1
+pkgp-freebsd-pkg____sudo-1.9.16p2_1
+pkgp-freebsd-pkg____tigervnc-server-1.15.0
+pkgp-freebsd-pkg____tmux-3.5a_1
+pkgp-freebsd-pkg____unrar-7.11,6
+pkgp-freebsd-pkg____wget-1.25.0
+pkgp-freebsd-pkg____xauth-1.1.4
 pkgp-freebsd-pkg____xorg-fonts-truetype-7.7_1
-pkgp-freebsd-pkg____xorriso-1.5.4
+pkgp-freebsd-pkg____xorriso-1.5.6_2
-pkgp-freebsd-pkg____xterm-375
+pkgp-freebsd-pkg____xterm-397_2

jails/config/hub/pkg-list-details.txt

@@ -1,28 +1,34 @@
-pkgp123____apache24-2.4.54
+pkgp123____apache24-2.4.63
-pkgp123____apr-1.7.0.1.6.1_2
+pkgp123____apr-1.7.5.1.6.3_4
-pkgp123____pkg-1.18.4
+pkgp123____ca_root_nss-3.108
-pkgp123____samba413-4.13.17_4
+pkgp123____pkg-2.1.2
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp123____samba416-4.16.11_6
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____firefox-esr-102.5.0_1,1
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____fluxbox-1.3.7_5
+pkgp-freebsd-pkg____fluxbox-1.3.7_10
-pkgp-freebsd-pkg____iperf3-3.12
+pkgp-freebsd-pkg____iperf3-3.18
-pkgp-freebsd-pkg____mc-4.8.28
+pkgp-freebsd-pkg____mc-4.8.32
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4
 pkgp-freebsd-pkg____p7zip-16.02_3
-pkgp-freebsd-pkg____php81-ldap-8.1.13
+pkgp-freebsd-pkg____php84-8.4.6
-pkgp-freebsd-pkg____php81-mysqli-8.1.13
+pkgp-freebsd-pkg____php84-filter-8.4.6
-pkgp-freebsd-pkg____php81-pgsql-8.1.13
+pkgp-freebsd-pkg____php84-gd-8.4.6
-pkgp-freebsd-pkg____php81-session-8.1.13
+pkgp-freebsd-pkg____php84-iconv-8.4.6
-pkgp-freebsd-pkg____rename-1.99.2
+pkgp-freebsd-pkg____php84-ldap-8.4.6
-pkgp-freebsd-pkg____rkhunter-1.4.6_1
+pkgp-freebsd-pkg____php84-mbstring-8.4.6
-pkgp-freebsd-pkg____rsync-3.2.6
+pkgp-freebsd-pkg____php84-mysqli-8.4.6
-pkgp-freebsd-pkg____sshguard-2.4.2_2,1
+pkgp-freebsd-pkg____php84-pgsql-8.4.6
-pkgp-freebsd-pkg____sudo-1.9.12p1
+pkgp-freebsd-pkg____php84-session-8.4.6
-pkgp-freebsd-pkg____tigervnc-server-1.12.0_5
+pkgp-freebsd-pkg____rename-1.99.2_1
-pkgp-freebsd-pkg____unrar-6.12,6
+pkgp-freebsd-pkg____rkhunter-1.4.6_3
-pkgp-freebsd-pkg____wget-1.21.3_1
+pkgp-freebsd-pkg____rsync-3.4.1_2
-pkgp-freebsd-pkg____xauth-1.1.1
+pkgp-freebsd-pkg____sshguard-2.4.3_3,1
+pkgp-freebsd-pkg____sudo-1.9.16p2_1
+pkgp-freebsd-pkg____tigervnc-server-1.15.0
+pkgp-freebsd-pkg____tmux-3.5a_1
+pkgp-freebsd-pkg____unrar-7.11,6
+pkgp-freebsd-pkg____wget-1.25.0
+pkgp-freebsd-pkg____xauth-1.1.4
 pkgp-freebsd-pkg____xorg-fonts-truetype-7.7_1
-pkgp-freebsd-pkg____xorriso-1.5.4
+pkgp-freebsd-pkg____xorriso-1.5.6_2
-pkgp-freebsd-pkg____xterm-377
+pkgp-freebsd-pkg____xterm-397_2

jails/config/hub/pkg-list-old.txt

@@ -1 +1 @@
-apache24 apr bash bash-completion firefox-esr fluxbox iperf3 mc nano p7zip php81-ldap php81-mysqli php81-pgsql php81-session pkg rename rkhunter rsync samba413 sshguard sudo tigervnc-server unrar wget xauth xorg-fonts-truetype xorriso xterm
+apache24 apr bash bash-completion ca_root_nss fluxbox iperf3 mc nano p7zip php84 php84-filter php84-gd php84-iconv php84-ldap php84-mbstring php84-mysqli php84-pgsql php84-session pkg rename rkhunter rsync samba416 sshguard sudo tigervnc-server tmux unrar wget xauth xorg-fonts-truetype xorriso xterm

jails/config/hub/pkg-list.txt

@@ -1 +1 @@
-apache24 apr bash bash-completion firefox-esr fluxbox iperf3 mc nano p7zip php81-ldap php81-mysqli php81-pgsql php81-session pkg rename rkhunter rsync samba413 sshguard sudo tigervnc-server unrar wget xauth xorg-fonts-truetype xorriso xterm
+apache24 apr bash bash-completion ca_root_nss fluxbox iperf3 mc nano p7zip php84 php84-filter php84-gd php84-iconv php84-ldap php84-mbstring php84-mysqli php84-pgsql php84-session pkg rename rkhunter rsync samba416 sshguard sudo tigervnc-server tmux unrar wget xauth xorg-fonts-truetype xorriso xterm

jails/config/hub/pkgp.conf

@@ -5,14 +5,12 @@ FreeBSD: {
 
 pkgp-freebsd-pkg: {
     url: "http://pkgp-freebsd-pkg.ahlawat.com/${ABI}/latest",
-    mirror_type: "http",
     enabled: yes,
     priority: 10
 }
 
 pkgp123: {
     url: "http://pkgp.ahlawat.com/packages/pj123-default",
-    mirror_type: "http",
     signature_type: "pubkey",
     pubkey: "/mnt/certs/poudriere.cert",
     enabled: yes,

jails/config/hub/smb4.conf

@@ -57,30 +57,18 @@
     valid users = p
     browseable = yes
 
-[imax-4k]
-    path = /mnt/imax-4k
-    read only = yes
-    valid users = p
-    browseable = yes
-
-[movies-4k]
-    path = /mnt/movies-4k
-    read only = yes
-    valid users = p
-    browseable = yes
-
-[movies-hd]
-    path = /mnt/movies-hd
-    read only = yes
-    valid users = p
-    browseable = yes
-
 [movies]
     path = /mnt/movies
     read only = yes
     valid users = p
     browseable = yes
 
+[tv]
+    path = /mnt/tv
+    read only = yes
+    valid users = p
+    browseable = yes
+
 [tuts]
     path = /mnt/tuts
     read only = yes
@@ -104,3 +92,15 @@
     read only = yes
     valid users = p
     browseable = yes
+
+[cam]
+    path = /mnt/cam
+    read only = yes
+    valid users = p
+    browseable = yes
+
+[media]
+    path = /mnt/cam/media
+    read only = yes
+    valid users = p
+    browseable = yes

jails/config/hub/sshd_config

@@ -1,5 +1,5 @@
-#	$OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $
+#	$OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
-#	$FreeBSD: releng/12.1/crypto/openssh/sshd_config 338561 2018-09-10 16:20:12Z des $
+#	$FreeBSD$
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -62,7 +62,7 @@ PasswordAuthentication no
 PermitEmptyPasswords no
 
 # Change to no to disable PAM authentication
-ChallengeResponseAuthentication no
+#KbdInteractiveAuthentication yes
 
 # Kerberos options
 #KerberosAuthentication no
@@ -76,13 +76,13 @@ ChallengeResponseAuthentication no
 
 # Set this to 'no' to disable PAM authentication, account processing,
 # and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
+# be allowed through the KbdInteractiveAuthentication and
 # PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
+# PAM authentication via KbdInteractiveAuthentication may bypass
 # the setting of "PermitRootLogin without-password".
 # If you just want the PAM account and session checks to run without
 # PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
+# and KbdInteractiveAuthentication to 'no'.
 #UsePAM yes
 
 #AllowAgentForwarding yes
@@ -105,7 +105,7 @@ ClientAliveCountMax 1
 #PermitTunnel no
 #ChrootDirectory none
 #UseBlacklist no
-#VersionAddendum FreeBSD-20180909
+#VersionAddendum FreeBSD-20211221
 
 # no default banner path
 #Banner none

jails/config/ibm/pkg-list-details-old.txt

@@ -1,9 +1,9 @@
-pkgp-freebsd-pkg____automake-1.16.5
+pkgp-freebsd-pkg____automake-1.17
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____cmake-3.24.3
+pkgp-freebsd-pkg____cmake-3.31.6
-pkgp-freebsd-pkg____git-lite-2.38.1_3
+pkgp-freebsd-pkg____git-lite-2.49.0
-pkgp-freebsd-pkg____hercules-3.13
+pkgp-freebsd-pkg____hercules-3.13_1
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____tmux-3.3a
+pkgp-freebsd-pkg____tmux-3.5a_1

jails/config/ibm/pkg-list-details.txt

@@ -1,9 +1,9 @@
-pkgp-freebsd-pkg____automake-1.16.5
+pkgp-freebsd-pkg____automake-1.17
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____cmake-3.24.3
+pkgp-freebsd-pkg____cmake-3.31.6
-pkgp-freebsd-pkg____git-lite-2.38.1_4
+pkgp-freebsd-pkg____git-lite-2.49.0
-pkgp-freebsd-pkg____hercules-3.13
+pkgp-freebsd-pkg____hercules-3.13_1
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____tmux-3.3a
+pkgp-freebsd-pkg____tmux-3.5a_1

jails/config/jump/pkg-list-details-old.txt

@@ -1,10 +1,10 @@
-pkgp-freebsd-pkg____bash-5.2.9
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_1,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____guacamole-client-1.4.0
+pkgp-freebsd-pkg____guacamole-client-1.5.5
-pkgp-freebsd-pkg____guacamole-server-1.4.0
+pkgp-freebsd-pkg____guacamole-server-1.5.5
 pkgp-freebsd-pkg____libqrencode-4.1.1
-pkgp-freebsd-pkg____nano-6.4
+pkgp-freebsd-pkg____nano-8.4
 pkgp-freebsd-pkg____openldap-sasl-client-2.4.59
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____wireguard-2,1
+pkgp-freebsd-pkg____wireguard-tools-1.0.20210914_3
-pkgp-freebsd-pkg____zip-3.0_1
+pkgp-freebsd-pkg____zip-3.0_4

jails/config/jump/pkg-list-details.txt

@@ -1,10 +1,10 @@
-pkgp-freebsd-pkg____bash-5.2.12
+pkgp-freebsd-pkg____bash-5.2.37
-pkgp-freebsd-pkg____bash-completion-2.11_2,2
+pkgp-freebsd-pkg____bash-completion-2.14.0,2
-pkgp-freebsd-pkg____guacamole-client-1.4.0
+pkgp-freebsd-pkg____guacamole-client-1.5.5
-pkgp-freebsd-pkg____guacamole-server-1.4.0
+pkgp-freebsd-pkg____guacamole-server-1.5.5
 pkgp-freebsd-pkg____libqrencode-4.1.1
-pkgp-freebsd-pkg____nano-7.0
+pkgp-freebsd-pkg____nano-8.4
 pkgp-freebsd-pkg____openldap-sasl-client-2.4.59
-pkgp-freebsd-pkg____pkg-1.18.4
+pkgp-freebsd-pkg____pkg-2.1.2
-pkgp-freebsd-pkg____wireguard-2,1
+pkgp-freebsd-pkg____wireguard-tools-1.0.20210914_3
-pkgp-freebsd-pkg____zip-3.0_1
+pkgp-freebsd-pkg____zip-3.0_4

jails/config/jump/pkg-list-old.txt

@@ -1 +1 @@
-bash bash-completion guacamole-client guacamole-server libqrencode nano openldap-sasl-client pkg wireguard zip
+bash bash-completion guacamole-client guacamole-server libqrencode nano openldap-sasl-client pkg wireguard-tools zip

jails/config/jump/pkg-list.txt

@@ -1 +1 @@
-bash bash-completion guacamole-client guacamole-server libqrencode nano openldap-sasl-client pkg wireguard zip
+bash bash-completion guacamole-client guacamole-server libqrencode nano openldap-sasl-client pkg wireguard-tools zip