diff --git a/ansible/environments/colo/host_vars/mrmanager b/ansible/environments/colo/host_vars/mrmanager index 12ffc6d..36545a3 100644 --- a/ansible/environments/colo/host_vars/mrmanager +++ b/ansible/environments/colo/host_vars/mrmanager @@ -38,6 +38,10 @@ jail_list: enabled: true conf: src: public_dns + - name: rg + enabled: true + conf: + src: rg bhyve_dataset: zdata/vm bhyve_canmount: "on" # efi_dev: /dev/gpt/EFI diff --git a/ansible/roles/jail/files/jails/rg.conf b/ansible/roles/jail/files/jails/rg.conf new file mode 100644 index 0000000..324697c --- /dev/null +++ b/ansible/roles/jail/files/jails/rg.conf @@ -0,0 +1,15 @@ +rg { + path = "/jail/${name}"; + vnet; + exec.prestart += "/usr/local/bin/jail_netgraph_bridge start jail_nat jail${name} 10.215.1.1/24"; + exec.poststop += "sleep 10; /usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}"; + vnet.interface += "jail${name}"; + + devfs_ruleset = 14; + mount.devfs; + mount.fstab = "/etc/fstab.${name}"; + + exec.start += "/bin/sh /etc/rc"; + exec.stop = "/bin/sh /etc/rc.shutdown jail"; + exec.consolelog = "/var/log/jail_${name}_console.log"; +} diff --git a/ansible/roles/jail/templates/new_jail.bash.j2 b/ansible/roles/jail/templates/new_jail.bash.j2 index 16a60d4..bee6bfc 100644 --- a/ansible/roles/jail/templates/new_jail.bash.j2 +++ b/ansible/roles/jail/templates/new_jail.bash.j2 @@ -26,7 +26,7 @@ function by_src { } function by_bin { - DESTRELEASE=14.1-RELEASE + DESTRELEASE=14.3-RELEASE DESTARCH=`uname -m` SOURCEURL=http://ftp.freebsd.org/pub/FreeBSD/releases/$DESTARCH/$DESTRELEASE/ for component in base ports; do fetch $SOURCEURL/$component.txz -o - | tar -xf - -C "$DESTDIR" ; done