talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Migrate to abbreviated jail folder structure.

Browse Source
This commit is contained in:
Tom Alexander
2024-06-29 15:21:27 -04:00
parent bc29fd5428
commit 62e70554be
13 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/jail/files/jails/admin_git.conf
View File

@@ -1,5 +1,5 @@
admin_git {
path = "/jail/main/jails/${name}";
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}";

2
ansible/roles/jail/files/jails/cloak.conf
View File

@@ -1,5 +1,5 @@
cloak {
path = "/jail/main/jails/${name}";
path = "/jail/${name}";
vnet;
exec.prestart += "/usr/local/bin/jail_netgraph_bridge start restricted_nat jail${name} 10.215.2.1/24";
exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop restricted_nat jail${name}";

2
ansible/roles/jail/files/jails/dagger.conf
View File

@@ -1,5 +1,5 @@
dagger {
path = "/jail/main/jails/${name}";
path = "/jail/${name}";
vnet;
vnet.interface += "dagger";

2
ansible/roles/jail/files/jails/mumble.conf
View File

@@ -1,5 +1,5 @@
cloak {
path = "/jail/main/jails/mumble";
path = "/jail/mumble";
vnet;
vnet.interface += "host_link3";

2
ansible/roles/jail/files/jails/nat_dhcp.conf
View File

@@ -1,5 +1,5 @@
nat_dhcp {
path = "/jail/main/jails/${name}";
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}";

2
ansible/roles/jail/files/jails/public_dns.conf
View File

@@ -1,5 +1,5 @@
public_dns {
path = "/jail/main/jails/${name}";
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}";

2
ansible/roles/jail/files/jails/sample.conf
View File

@@ -1,5 +1,5 @@
sample {
path = "/jail/main/jails/${name}";
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}";

4
ansible/roles/jail/tasks/freebsd.yaml
View File

@@ -10,7 +10,7 @@
zfs:
name: "{{ item.dataset|default(jail_zfs_dataset) }}/jails/{{ item.name }}"
state: present
extra_zfs_properties: '{{ {''mountpoint'': item.dataset_mountpoint|default(jail_zfs_dataset_mountpoint) + "/jails/" + item.name}|combine({''canmount'': jail_canmount|default(''noauto''), ''ta:bemount'': jail_bemount|default(''on'')})|combine(item.properties|default({})) }}'
extra_zfs_properties: '{{ {''mountpoint'': item.dataset_mountpoint|default(jail_zfs_dataset_mountpoint) + "/" + item.name}|combine({''canmount'': jail_canmount|default(''noauto'')})|combine(item.properties|default({})) }}'
loop: "{{ jail_list }}"
@@ -27,7 +27,7 @@
zfs:
name: "{{ item.0.dataset|default(jail_zfs_dataset) }}/persistent/{{ item.0.name }}/{{ item.1.name }}"
state: present
extra_zfs_properties: '{{ {''mountpoint'': item.0.dataset_mountpoint|default(jail_zfs_dataset_mountpoint) + "/jails/" + item.0.name + item.1.mount }|combine({''canmount'': jail_canmount|default(''noauto''), ''ta:bemount'': jail_bemount|default(''on'')})|combine(item.1.properties|default({})) }}'
extra_zfs_properties: '{{ {''mountpoint'': item.0.dataset_mountpoint|default(jail_zfs_dataset_mountpoint) + "/" + item.0.name + item.1.mount }|combine({''canmount'': jail_canmount|default(''noauto'')})|combine(item.1.properties|default({})) }}'
loop: "{{ jail_list|subelements('persist', skip_missing=True) }}"
- name: Install scripts

2
ansible/roles/jail/templates/new_jail.bash.j2
View File

@@ -5,7 +5,7 @@ set -euo pipefail
IFS=$'\n\t'
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
: ${JAIL_MOUNTPOINT:="{{ jail_zfs_dataset_mountpoint }}/jails"}
: ${JAIL_MOUNTPOINT:="{{ jail_zfs_dataset_mountpoint }}"}
function die {
echo >&2 "$@"