diff --git a/examples/msn0.pkt b/examples/msn0.pkt new file mode 100755 index 0000000..4fdbfb4 Binary files /dev/null and b/examples/msn0.pkt differ diff --git a/examples/msn0.yml b/examples/msn0.yml index 7fcebb6..e1f32ab 100644 --- a/examples/msn0.yml +++ b/examples/msn0.yml @@ -45,7 +45,8 @@ all: - DedSec.msn0.aninix.net operational_countries: - 'US' - + # https://github.com/ansible/ansible/issues/86122 + ansible_ssh_common_args: '-o "SetEnv TERM=dumb"' children: managed: children: @@ -179,6 +180,17 @@ all: bridge: br0 vnc: 1 vscan_enabled: true + discord_mapping: + therafters: therafters + sharingan: sharingan + tech: tech + foundation: foundation + 3nclave: 3NCLAVE + martialarts: martialarts + signups: masignups + workouts: maworkouts + town-hall: citizens + 121st-signups: 121st-signups disks: - '-device virtio-scsi-pci,id=scsi0 -drive file=/dev/sda,if=none,format=raw,discard=unmap,aio=native,cache=none,id=sda -device scsi-hd,drive=sda,bus=scsi0.0' - '-device virtio-scsi-pci,id=scsi1 -drive file=/dev/sdb,if=none,format=raw,discard=unmap,aio=native,cache=none,id=sdb -device scsi-hd,drive=sdb,bus=scsi1.0' @@ -239,7 +251,7 @@ all: bridge: br0 disks: - '-drive format=qcow2,l2-cache-size=8M,file=/mnt/cage2/vm/DedNet.qcow2' - - '-cdrom /srv/maat/iso/kali-linux.iso -boot order=d' + - '-cdrom /srv/node/iso/kali-linux.iso -boot order=d' Aether: ip: 10.0.1.51 mac: 00:15:5d:01:02:11 @@ -249,7 +261,7 @@ all: bridge: br0 disks: - '-drive if=none,id=disk0,cache=none,format=raw,aio=native,file=/dev/sdc' - - '-cdrom /srv/maat/iso/archlinux.iso -boot order=d' + - '-cdrom /srv/node/iso/archlinux.iso -boot order=d' test1: ip: 10.0.1.52 ipinterface: ens3 diff --git a/roles/ShadowArch/templates/netctl-bond.j2 b/roles/ShadowArch/templates/netctl-bond.j2 index e5e27dc..5bcb318 100644 --- a/roles/ShadowArch/templates/netctl-bond.j2 +++ b/roles/ShadowArch/templates/netctl-bond.j2 @@ -1,4 +1,4 @@ -Description="Bridge connection" +Description="Bridged Network Interface for VMs" Interface=br0 Connection=bridge BindsToInterfaces=({{ ipinterface }} tun0) diff --git a/roles/hardware/tasks/main.yml b/roles/hardware/tasks/main.yml index 3df84c4..f87f80b 100644 --- a/roles/hardware/tasks/main.yml +++ b/roles/hardware/tasks/main.yml @@ -39,5 +39,5 @@ - include_tasks: cyberpower.yml when: "ups == 'cyberpower'" - - include_tasks: aps.yml - when: "ups == 'aps'" + - include_tasks: apc.yml + when: "ups == 'apc'"