diff --git a/ansible/environments/colo/host_vars/mrmanager b/ansible/environments/colo/host_vars/mrmanager index dd539c99..926bec66 100644 --- a/ansible/environments/colo/host_vars/mrmanager +++ b/ansible/environments/colo/host_vars/mrmanager @@ -37,10 +37,6 @@ 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/base/files/login.conf b/ansible/roles/base/files/login.conf index 3be52ee8..18ce37dd 100644 --- a/ansible/roles/base/files/login.conf +++ b/ansible/roles/base/files/login.conf @@ -23,7 +23,6 @@ default:\ :passwd_format=blf:\ - :copyright=/etc/COPYRIGHT:\ :welcome=/var/run/motd:\ :setenv=BLOCKSIZE=K:\ :mail=/var/mail/$:\ @@ -127,7 +126,6 @@ russian|Russian Users Accounts:\ ## standard - standard user defaults ## #standard:\ -# :copyright=/etc/COPYRIGHT:\ # :welcome=/var/run/motd:\ # :setenv=BLOCKSIZE=K:\ # :mail=/var/mail/$:\ diff --git a/ansible/roles/jail/files/jails/rg.conf b/ansible/roles/jail/files/jails/rg.conf deleted file mode 100644 index 324697cf..00000000 --- a/ansible/roles/jail/files/jails/rg.conf +++ /dev/null @@ -1,15 +0,0 @@ -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/wireguard/files/wireguard_configs/homeserver/wgh.conf b/ansible/roles/wireguard/files/wireguard_configs/homeserver/wgh.conf index eb6ed165..e8559bee 100644 Binary files a/ansible/roles/wireguard/files/wireguard_configs/homeserver/wgh.conf and b/ansible/roles/wireguard/files/wireguard_configs/homeserver/wgh.conf differ diff --git a/ansible/roles/wireguard/files/wireguard_configs/mrmanager/colo.conf b/ansible/roles/wireguard/files/wireguard_configs/mrmanager/colo.conf index 8ada5a68..a2cb5f75 100644 Binary files a/ansible/roles/wireguard/files/wireguard_configs/mrmanager/colo.conf and b/ansible/roles/wireguard/files/wireguard_configs/mrmanager/colo.conf differ