diff --git a/ansible/group_vars/cluster/mount b/ansible/group_vars/cluster/mount index 0d28085..277b29d 100644 --- a/ansible/group_vars/cluster/mount +++ b/ansible/group_vars/cluster/mount @@ -24,7 +24,7 @@ systemd_mounts: automount: "{{ env_automount }}" enabled: true diskstation_media: - share: "{{ nas_ip }}:{{ env_default_nfs_path }}/media" + share: "{{ nas_ip }}:{{ env_media_nfs_path }}/media" mount: /mnt/diskstation/media type: nfs options: diff --git a/ansible/host_vars/nas b/ansible/host_vars/nas deleted file mode 100644 index 56a1898..0000000 --- a/ansible/host_vars/nas +++ /dev/null @@ -1,16 +0,0 @@ ---- -wireguard_address: "10.0.1.8/24" -perrsistent_keepalive: "30" -wireguard_endpoint: "" -wireguard_byhost_allowed_ips: - merlin: 10.0.0.8,192.168.1.10 - corwin: 10.0.0.8,192.168.1.10 -wireguard_postup: - - iptables -A FORWARD -i wg0 -j ACCEPT - - iptables -A FORWARD -o wg0 -j ACCEPT - - iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE - -wireguard_postdown: - - iptables -D FORWARD -i wg0 -j ACCEPT - - iptables -D FORWARD -o wg0 -j ACCEPT - - iptables -t nat -D POSTROUTING -o eth0 -j MASQUERADE diff --git a/ansible/host_vars/oberon b/ansible/host_vars/oberon new file mode 100644 index 0000000..8a21eed --- /dev/null +++ b/ansible/host_vars/oberon @@ -0,0 +1,19 @@ +--- +wireguard_address: "10.0.0.8/24" +default_interface: "enp2s0" +consul_iface: "{{ default_interface}}" +vault_iface: "{{ default_interface}}" +perrsistent_keepalive: "30" +wireguard_endpoint: "" +wireguard_byhost_allowed_ips: + merlin: 10.0.0.8,192.168.1.43 + corwin: 10.0.0.8,192.168.1.43 +wireguard_postup: + - iptables -A FORWARD -i wg0 -j ACCEPT + - iptables -A FORWARD -o wg0 -j ACCEPT + - iptables -t nat -A POSTROUTING -o {{ default_interface }} -j MASQUERADE + +wireguard_postdown: + - iptables -D FORWARD -i wg0 -j ACCEPT + - iptables -D FORWARD -o wg0 -j ACCEPT + - iptables -t nat -D POSTROUTING -o {{ default_interface }} -j MASQUERADE diff --git a/ansible/production b/ansible/production index dbb0218..06b04bd 100644 --- a/ansible/production +++ b/ansible/production @@ -1,8 +1,10 @@ [DNS] gerard +oberon [dhcp] gerard +oberon [database_active] bleys @@ -22,7 +24,7 @@ bleys production [NAS] -#nas +oberon [cluster] oscar diff --git a/terraform/dns/records.tf b/terraform/dns/records.tf index 458c15e..f2566d1 100644 --- a/terraform/dns/records.tf +++ b/terraform/dns/records.tf @@ -106,6 +106,14 @@ resource "powerdns_record" "gerard" { records = ["192.168.1.41"] } +resource "powerdns_record" "oberon" { + zone= powerdns_zone.landucampseu.name + type= "A" + name= "oberon.lan.${powerdns_zone.ducampseu.name}" + ttl= 1700 + records = ["192.168.1.43"] +} + resource "powerdns_record" "diskstation" { zone= powerdns_zone.landucampseu.name type= "A"