From 88dfc73f3d61bf114e98cd0c0a5362ae7848aed4 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 4 Apr 2026 21:17:52 -0400
Subject: [PATCH] Remove rg jail and add ipv6 to wireguard.

---
 ansible/environments/colo/host_vars/mrmanager   |   4 ----
 ansible/roles/base/files/login.conf             |   2 --
 ansible/roles/jail/files/jails/rg.conf          |  15 ---------------
 .../files/wireguard_configs/homeserver/wgh.conf | Bin 265 -> 415 bytes
 .../files/wireguard_configs/mrmanager/colo.conf | Bin 330 -> 378 bytes
 5 files changed, 21 deletions(-)
 delete mode 100644 ansible/roles/jail/files/jails/rg.conf

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 eb6ed1651468fa7143c7fef7212b561bdfca7802..e8559bee75911822550700080430dc808b4d4349 100644
GIT binary patch
literal 415
zcmV;Q0bu?BM@dveQdv+`0M?q*g8$@qi>%oPx6rT#-&>c??S6v?-NhRMDIAB$=#d-q
zr`znIc*YHaHzdHL+e8U-_oq{xOJG(M$}_!#)sp4EJBlnj|9dL_+}(PkXj~_)hX?rr
zn#6!8E~`-Gt34yfwpk7D`3pB?dQ{mZrA+(uJUZEnLdZ(CZx7d|A7O3ipnZ$U?*klz
zxLLp#LEi+0#vD+RupS!@ZiTDfT??t`kOE$mHi%2m5Y@i}cUz>En)s&hXDhNp`%pd)
z#>niG><ReLL}W}kNf)T*ly?S0jXFMyeQY_Z!LV^buk{kxG62%ia2>xKbD@lbUcKU}
zt9>4uBSDl{wiTG?<<Br^jueqi&#x2#&B&tDwX(ltqPu$nDjm?cOzEXmrNIaXv>xDm
zY)`}b2LT!X1i@!5%2s0fYUrATb3AjUlqUFR<S&koOPlzbvP!Tb*gecmUJEwFc{-UD
zBEIMr{W1yYOB~HC4r1_oz57K3U^pw?H2mRVVsbdV4_swoj;<m4Y8G}F;o-Sai{q6h
JBdG;}{Oe9e%y|F+

literal 265
zcmV+k0rvg?M@dveQdv+`0H)tK4}ryru!M&(j~@46Kx-?$o+s2~E}{LX<;eu?UF^<L
z_hFOY^Xk$oHl&aQ5>vqo?eJc)3@EZF?#Y^LUNP!APWIzZJ$TFwirKeKRt#3bVo7Ds
z&KB7WFixB6Lead<X+~-1ESgF90`({!QE!Y#?^QK(0N!zS#Ui~GgTbj09Q<VRFOBPd
zua=QGbuBa<s!FVnnnooPxh2aWMAJoK%QZ{*4>XF4D-|mI^?0j@Qe$hzHLv-Q!No%M
zZ^?vP@z1y~%m48+%DxtB`j^=}%$g#qF^i=>2t{*dZbCH4)97O67tJ#oKBPi}+#Qkz
P+x6;;;-$DFT0fin+ctxF

diff --git a/ansible/roles/wireguard/files/wireguard_configs/mrmanager/colo.conf b/ansible/roles/wireguard/files/wireguard_configs/mrmanager/colo.conf
index 8ada5a688443a3f6ea788698fb5c44b77fcf0d49..a2cb5f75ee26abe72df808484d79bd33e562f6f4 100644
GIT binary patch
literal 378
zcmV-=0fqhmM@dveQdv+`0G%X#=xj~I2`ZKkNnfGap6(lWC9^#F^Ya)?UMfUePs6{k
zDJ^4-Uvr;h9`9YJ2?y-K7<A`Zc;c%Rt=3IiFv0IA9;Ud1noL^7>+d~ueMqGMdQh=h
zqV6jHeA6oYNhVSwcM=F&6U_T%#D>UtXAJ4%@W&iH-$bt*J_oe>|MAL!`dLO!s*yiU
z>DmS}dC)4&;mRB)Bpq9do5jWtO90>bRhqg`jy7Q%?nTDJtO}1cfN>%cbtUKm<ei1a
z!gxHZ2+-#~5(6UnvXQSoI4*h#FXJ2|DpWCKQrrnud^C}k+x*Ignc~s1hzLO(l8WVM
zLIn)V?69ZVK4NaZBWj0y|59E8<p;>)k>D@YC4t`axpH@H+yLJ^KX*$j&$;nd`RNFf
z`|I5m?ACPbFu8UO7%LuPKy|xUS=9%L3QssB{jYo-TZ}(X{S;Fu>v5t!H&?$TB}(0C
Y+l5ax)|iC(pmv1|W$%ukJM{gn#N+d|^#A|>

literal 330
zcmV-Q0k!@BM@dveQdv+`0QsuIY7g96n7{QWt%sa8u8Z}41Ior(Te?j;c<RHF{fiYR
z+^pZjMkWN>OkM={;wr+#X6a4y(tWK<=3IS>qLAGumpPLjo^7)oC;8<N`a1xMc$RGt
zjvDg;OeWERbH7deBjSU+Bmybb?t#ro&@X-@q>-^<)^#sU+e#Sm(xiWGR-y;VFl#hz
zxWd(*z9GR<>&uq=#<Ojl*ir$_EDt@cHsZVUQp=rX25#!9WN5ES7mPp*BLBTihT#~P
z-}i@sqKylo5+%bg(~)Cv-P8+Z;JoMKlFi!<GD>;Koy|}AHYkRvpjyggptb4ZgL>5W
zq>p&dMt!8Ee0P)L-?gMOVtgK(mE#!uq8n+NwIE_xGM4<Y!|&>`&5+0abuNQqEYkR4
czfZ@fsO*%PDwvcv-JgT~3osTB3HFCS=PhxqaR2}S