Rework

9 files changed, 0 insertions, 78 deletions

diff --git a/templates/jail_confs/_default.j2 b/templates/jail_confs/_default.j2
deleted file mode 100644
index 3a4e492..0000000
--- a/templates/jail_confs/_default.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-devfs_ruleset = 4;
-
-{% include 'jail_confs/_epl_network.j2' %}
-
-exec.poststart   += "jexec ${name} route add default {{ ingress_ip }} || echo 'Failed to add default route'";
diff --git a/templates/jail_confs/_epl_network.j2 b/templates/jail_confs/_epl_network.j2
deleted file mode 100644
index fa3744a..0000000
--- a/templates/jail_confs/_epl_network.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-## _epl_network begin
-exec.prestart    += "ifconfig epair{{ jail.num }}000 create || echo 'Failed to create epair{{ jail.num }}000'";
-exec.prestart    += "ifconfig epair{{ jail.num }}000a name epl{{ jail.num }}a";
-exec.prestart    += "ifconfig epair{{ jail.num }}000b name epl{{ jail.num }}b";
-exec.prestart    += "ifconfig epl{{ jail.num }}b ether random";
-exec.prestart    += "ifconfig brlan0 addm epl{{ jail.num }}a";
-
-exec.poststart   += "ifconfig epl{{ jail.num }}b vnet ${name}";
-exec.poststart   += "jexec ${name} ifconfig epl{{ jail.num }}b up";
-exec.poststart   += "ifconfig epl{{ jail.num }}a up";
-exec.poststart   += "jexec ${name} ifconfig epl{{ jail.num }}b {{ jail_lan_prefix }}.{{ jail.num + jail_ip_offset }}/{{ jail_lan_prefixlen }}";
-exec.poststart   += "jexec ${name} route delete default || echo 'No default route to delete'";
-
-{% if not is_test_vm %}
-exec.poststart   += "jexec ${name} route add 10.6.210.0/24 {{ lan_ipv4_gateway }} || echo 'Failed to add Wireguard return route'";
-{% endif %}
-exec.poststop    += "ifconfig epl{{ jail.num }}a destroy";
-## _epl_network end
diff --git a/templates/jail_confs/dl.j2 b/templates/jail_confs/dl.j2
deleted file mode 100644
index 8d98ef4..0000000
--- a/templates/jail_confs/dl.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-{% include 'jail_confs/_epl_network.j2' %}
-devfs_ruleset = 4;
-allow.mlock;
-
-exec.prestart    += "mount -t nullfs /usr/local/jails/volumes/storage /usr/local/jails/containers/dl/mnt/storage || echo 'Failed to mount'";
-exec.poststop    += "umount /usr/local/jails/containers/dl/mnt/storage || echo 'Failed to umount'";
diff --git a/templates/jail_confs/ingress.j2 b/templates/jail_confs/ingress.j2
deleted file mode 100644
index 5964d06..0000000
--- a/templates/jail_confs/ingress.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-devfs_ruleset = 6;
-
-{% include 'jail_confs/_epl_network.j2' %}
-
-exec.prestart    += "ifconfig epair{{ jail.num }}001 create || echo 'Failed to create epair{{ jail.num }}001'";
-exec.prestart    += "ifconfig epair{{ jail.num }}001a name epw1a";
-exec.prestart    += "ifconfig epair{{ jail.num }}001b name epw1b";
-exec.prestart    += "ifconfig brwan0 addm epw{{ jail.num }}a";
-
-exec.poststart   += "ifconfig epw{{ jail.num }}b vnet ${name}";
-exec.poststart   += "jexec ${name} ifconfig epw{{ jail.num }}b up";
-exec.poststart   += "ifconfig epw{{ jail.num }}a up";
-{% if is_test_vm %}
-exec.poststart   += "jexec ${name} ifconfig epw{{ jail.num }}b inet 10.0.20.3/24";
-exec.poststart   += "jexec ${name} route add default 10.0.20.1";
-{% else %}
-exec.poststart   += "jexec ${name} service dhclient restart epw{{ jail.num }}b";
-{% endif %}
-
-exec.prestart    += "mount -t nullfs /usr/local/jails/containers/goaccess/var/www/goaccess /usr/local/jails/containers/ingress/mnt/www_goaccess || echo 'Failed to mount'";
-exec.poststop    += "umount /usr/local/jails/containers/ingress/mnt/www_goaccess || echo 'Failed to umount'";
-exec.poststop    += "ifconfig epw{{ jail.num }}a destroy";
diff --git a/templates/jail_confs/komga.j2 b/templates/jail_confs/komga.j2
deleted file mode 100644
index 2567fa2..0000000
--- a/templates/jail_confs/komga.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-{% include 'jail_confs/_default.j2' %}
-
-exec.prestart    += "mount -t nullfs /usr/local/jails/volumes/storage/media/manga /usr/local/jails/containers/komga/mnt/manga || echo 'Failed to mount'";
-exec.poststop    += "umount /usr/local/jails/containers/komga/mnt/manga || echo 'Failed to umount'";
diff --git a/templates/jail_confs/plex.j2 b/templates/jail_confs/plex.j2
deleted file mode 100644
index 2446a14..0000000
--- a/templates/jail_confs/plex.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-{% include 'jail_confs/_default.j2' %}
-
-exec.prestart    += "mount -t nullfs /usr/local/jails/volumes/storage/media /usr/local/jails/containers/plex/mnt/media || echo 'Failed to mount'";
-exec.poststop    += "umount /usr/local/jails/containers/plex/mnt/media || echo 'Failed to umount'";
diff --git a/templates/jail_confs/postgres.j2 b/templates/jail_confs/postgres.j2
deleted file mode 100644
index bb3d1f1..0000000
--- a/templates/jail_confs/postgres.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-{% include 'jail_confs/_epl_network.j2' %}
-devfs_ruleset = 5;
-
-allow.sysvipc;
diff --git a/templates/jail_confs/samba.j2 b/templates/jail_confs/samba.j2
deleted file mode 100644
index 24835fa..0000000
--- a/templates/jail_confs/samba.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-{% include 'jail_confs/_default.j2' %}
-
-exec.prestart    += "mount -t nullfs /usr/local/jails/volumes/storage /usr/local/jails/containers/samba/mnt/storage || echo 'Failed to mount'";
-exec.poststop    += "umount /usr/local/jails/containers/samba/mnt/storage || echo 'Failed to umount'";
diff --git a/templates/jail_confs/syncthing.j2 b/templates/jail_confs/syncthing.j2
deleted file mode 100644
index 980d47c..0000000
--- a/templates/jail_confs/syncthing.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{% include 'jail_confs/_default.j2' %}
-
-exec.prestart    += "mount -t nullfs /usr/local/jails/volumes/storage/docs /usr/local/jails/containers/syncthing/mnt/docs || echo 'Failed to mount'";
-exec.prestart    += "mount -t nullfs /usr/local/jails/volumes/storage/vault /usr/local/jails/containers/syncthing/mnt/vault || echo 'Failed to mount'";
-exec.prestart    += "mount -t nullfs /usr/local/jails/volumes/storage/jan-systems-2025-content /usr/local/jails/containers/syncthing/mnt/jan-systems-2025-content || echo 'Failed to mount'";
-exec.prestart    += "mount -t nullfs /usr/local/jails/volumes/storage/projects-ableton /usr/local/jails/containers/syncthing/mnt/projects-ableton || echo 'Failed to mount'";
-
-exec.poststop    += "umount /usr/local/jails/containers/syncthing/mnt/projects-ableton || echo 'Failed to umount'";
-exec.poststop    += "umount /usr/local/jails/containers/syncthing/mnt/jan-systems-2025-content || echo 'Failed to umount'";
-exec.poststop    += "umount /usr/local/jails/containers/syncthing/mnt/vault || echo 'Failed to umount'";
-exec.poststop    += "umount /usr/local/jails/containers/syncthing/mnt/docs || echo 'Failed to umount'";