diff --git a/ansible/roles/emacs/files/early-init.el b/ansible/roles/emacs/files/early-init.el index 08e8e63..9e5dc46 100644 --- a/ansible/roles/emacs/files/early-init.el +++ b/ansible/roles/emacs/files/early-init.el @@ -1,7 +1,7 @@ -(setq gc-cons-threshold (* 128 1024 1024)) ;; Increase garbage collection threshold for performance (default 800000) +(setq gc-cons-threshold (* 128 1024 1024)) ;; 128MiB Increase garbage collection threshold for performance (default 800000) ;; Increase amount of data read from processes, default 4k (when (version<= "27.0" emacs-version) - (setq read-process-output-max (* 1024 1024)) ;; 1mb + (setq read-process-output-max (* 10 1024 1024)) ;; 10MiB ) ;; Suppress warnings diff --git a/ansible/roles/jail/files/jails/admin_git.conf b/ansible/roles/jail/files/jails/admin_git.conf index 1ac6c7a..9b6e33d 100644 --- a/ansible/roles/jail/files/jails/admin_git.conf +++ b/ansible/roles/jail/files/jails/admin_git.conf @@ -2,7 +2,7 @@ admin_git { path = "/jail/${name}"; vnet; exec.prestart += "/usr/local/bin/jail_netgraph_bridge start jail_nat jail${name} 10.215.1.1/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; vnet.interface += "jail${name}"; devfs_ruleset = 14; diff --git a/ansible/roles/jail/files/jails/bastion.conf b/ansible/roles/jail/files/jails/bastion.conf index f7b2868..d011776 100644 --- a/ansible/roles/jail/files/jails/bastion.conf +++ b/ansible/roles/jail/files/jails/bastion.conf @@ -2,7 +2,7 @@ bastion { path = "/jail/${name}"; vnet; exec.prestart += "/usr/local/bin/jail_netgraph_bridge start jail_nat jail${name} 10.215.1.1/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; vnet.interface += "jail${name}"; devfs_ruleset = 14; diff --git a/ansible/roles/jail/files/jails/certificate.conf b/ansible/roles/jail/files/jails/certificate.conf index 610a4c4..28cbfa5 100644 --- a/ansible/roles/jail/files/jails/certificate.conf +++ b/ansible/roles/jail/files/jails/certificate.conf @@ -2,7 +2,7 @@ certificate { path = "/jail/${name}"; vnet; exec.prestart += "/usr/local/bin/jail_netgraph_bridge start jail_nat jail${name} 10.215.1.1/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; vnet.interface += "jail${name}"; devfs_ruleset = 14; diff --git a/ansible/roles/jail/files/jails/cloak.conf b/ansible/roles/jail/files/jails/cloak.conf index 4722955..832ad44 100644 --- a/ansible/roles/jail/files/jails/cloak.conf +++ b/ansible/roles/jail/files/jails/cloak.conf @@ -4,8 +4,8 @@ cloak { exec.prestart += "/usr/local/bin/jail_netgraph_bridge start restricted_nat jail${name} 10.215.2.1/24"; # Create a dummy interface that is never used, just to create the cloak bridge that is used by children. exec.prestart += "/usr/local/bin/jail_netgraph_bridge start cloak dummy${name} 192.168.1.0/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop cloak dummy{name}"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop restricted_nat jail${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop cloak dummy{name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop restricted_nat jail${name}"; vnet.interface += "jail${name}"; vnet.interface += "cloak"; diff --git a/ansible/roles/jail/files/jails/dagger.conf b/ansible/roles/jail/files/jails/dagger.conf index efbdd04..f7b6fb9 100644 --- a/ansible/roles/jail/files/jails/dagger.conf +++ b/ansible/roles/jail/files/jails/dagger.conf @@ -4,7 +4,7 @@ dagger { vnet.interface += "dagger"; exec.prestart += "/usr/local/bin/jail_netgraph_bridge start cloak ${name} 192.168.1.0/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop cloak ${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop cloak ${name}"; mount.fstab = "/etc/fstab.${name}"; diff --git a/ansible/roles/jail/files/jails/nat_dhcp.conf b/ansible/roles/jail/files/jails/nat_dhcp.conf index c3da613..43f7678 100644 --- a/ansible/roles/jail/files/jails/nat_dhcp.conf +++ b/ansible/roles/jail/files/jails/nat_dhcp.conf @@ -2,7 +2,7 @@ nat_dhcp { path = "/jail/${name}"; vnet; exec.prestart += "/usr/local/bin/jail_netgraph_bridge start jail_nat jail${name} 10.215.1.1/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; vnet.interface += "jail${name}"; devfs_ruleset = 14; diff --git a/ansible/roles/jail/files/jails/olddagger.conf b/ansible/roles/jail/files/jails/olddagger.conf index 79fc3d4..8828919 100644 --- a/ansible/roles/jail/files/jails/olddagger.conf +++ b/ansible/roles/jail/files/jails/olddagger.conf @@ -4,7 +4,7 @@ olddagger { vnet.interface += "olddagger"; exec.prestart += "/usr/local/bin/jail_netgraph_bridge start cloak ${name} 192.168.1.0/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop cloak ${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop cloak ${name}"; mount.fstab = "/etc/fstab.${name}"; diff --git a/ansible/roles/jail/files/jails/public_dns.conf b/ansible/roles/jail/files/jails/public_dns.conf index 358c5d7..19b89b0 100644 --- a/ansible/roles/jail/files/jails/public_dns.conf +++ b/ansible/roles/jail/files/jails/public_dns.conf @@ -2,7 +2,7 @@ public_dns { path = "/jail/${name}"; vnet; exec.prestart += "/usr/local/bin/jail_netgraph_bridge start jail_nat jail${name} 10.215.1.1/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; vnet.interface += "jail${name}"; devfs_ruleset = 14; diff --git a/ansible/roles/jail/files/jails/sample.conf b/ansible/roles/jail/files/jails/sample.conf index 8c61ca4..59ea923 100644 --- a/ansible/roles/jail/files/jails/sample.conf +++ b/ansible/roles/jail/files/jails/sample.conf @@ -2,7 +2,7 @@ sample { path = "/jail/${name}"; vnet; exec.prestart += "/usr/local/bin/jail_netgraph_bridge start jail_nat jail${name} 10.215.1.1/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; vnet.interface += "jail${name}"; devfs_ruleset = 14; diff --git a/ansible/roles/jail/files/jails/sftp.conf b/ansible/roles/jail/files/jails/sftp.conf index 88d2d62..f235eee 100644 --- a/ansible/roles/jail/files/jails/sftp.conf +++ b/ansible/roles/jail/files/jails/sftp.conf @@ -2,7 +2,7 @@ sftp { path = "/jail/${name}"; vnet; exec.prestart += "/usr/local/bin/jail_netgraph_bridge start jail_nat jail${name} 10.215.1.1/24"; - exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; vnet.interface += "jail${name}"; devfs_ruleset = 14; diff --git a/router/mediamtx_rc.bash b/router/mediamtx_rc.bash index b740767..0cd745e 100644 --- a/router/mediamtx_rc.bash +++ b/router/mediamtx_rc.bash @@ -1,10 +1,11 @@ #!/bin/sh # -# REQUIRE: FILESYSTEMS kld # PROVIDE: mediamtx -# BEFORE: netif +# REQUIRE: LOGIN opnsense +# KEYWORD: shutdown . /etc/rc.subr + name=mediamtx rcvar=${name}_enable start_cmd="${name}_start" diff --git a/router/opnsense_rc.bash b/router/opnsense_rc.bash index 3e79aa4..3fa2b51 100644 --- a/router/opnsense_rc.bash +++ b/router/opnsense_rc.bash @@ -1,10 +1,11 @@ #!/bin/sh # -# REQUIRE: FILESYSTEMS kld # PROVIDE: opnsense -# BEFORE: netif +# REQUIRE: LOGIN +# KEYWORD: shutdown . /etc/rc.subr + name=opnsense rcvar=${name}_enable start_cmd="${name}_start" diff --git a/router/unifi_rc.bash b/router/unifi_rc.bash index 9e94151..128ce78 100644 --- a/router/unifi_rc.bash +++ b/router/unifi_rc.bash @@ -1,10 +1,11 @@ #!/bin/sh # -# REQUIRE: FILESYSTEMS kld # PROVIDE: unifi -# BEFORE: netif +# REQUIRE: LOGIN opnsense +# KEYWORD: shutdown . /etc/rc.subr + name=unifi rcvar=${name}_enable start_cmd="${name}_start"