diff options
| -rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 42 | ||||
| -rw-r--r-- | inventory/host_vars/ch-apps.yml | 10 |
2 files changed, 36 insertions, 16 deletions
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 769c6291..bb7b94e1 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -5,17 +5,18 @@ network_zones: prefix: 192.168.28.0/24 gateway: 192.168.28.254 dns: -# - 192.168.28.254 - - 9.9.9.9 +# - 192.168.28.254 + - 9.9.9.9 dhcp: start: 100 limit: 199 offsets: ch-equinox-ws: 1 - ch-oulu: 2 - ch-oulu-vm1: 3 + ch-oulu: 2 ## testing + ch-oulu-vm1: 3 ## testing ch-mc: 10 - ch-auth: 88 + ch-auth-legacy: 88 ## legacy + ch-prometheus-legacy: 99 ## legacy ch-prometheus: 200 ch-prometheus-old: 250 ch-gw-lan: 254 @@ -40,16 +41,18 @@ network_zones: prefix: 192.168.32.0/24 gateway: 192.168.32.254 dns: -# - 192.168.32.254 - - 9.9.9.9 +# - 192.168.32.254 + - 9.9.9.9 offsets: - ch-stats: 10 + ch-apps: 1 + ch-stats-legacy: 10 ## legacy ch-jump: 22 ch-gw-lan: 28 - ch-apps: 32 ch-nic: 53 - ch-web: 80 - ch-mail: 143 + ch-web-legacy: 80 ## legacy + __svc_web__: 80 + ch-mail-legacy: 143 ## legacy + __svc_imap__: 80 ch-router-obsd: 253 ch-router: 254 @@ -72,7 +75,20 @@ network_zones: prefix: 62.99.185.128/30 gateway: 62.99.185.129 dns: - - 195.58.160.194 - - 195.58.161.122 + - 195.58.160.194 + - 195.58.161.122 offsets: ch-router: 2 + + +network_services: + web: + ports: + - 80 + - 443 + addr: "{{ network_zones.svc.__svc_web__ }}" + imap: + ports: + - 143 + - 993 + addr: "{{ network_zones.svc.__svc_imap__ }}" diff --git a/inventory/host_vars/ch-apps.yml b/inventory/host_vars/ch-apps.yml index 1f2e02bc..c5f20645 100644 --- a/inventory/host_vars/ch-apps.yml +++ b/inventory/host_vars/ch-apps.yml @@ -3,8 +3,8 @@ install_jumphost: ch-jump install: vm: - memory: 8G - numcpus: 6 + memory: 12G + numcpus: 8 autostart: True disks: primary: /dev/sda @@ -12,7 +12,11 @@ install: sda: type: zfs name: root - size: 10g + size: 25g + sdb: + type: zfs + name: data + size: 100g interfaces: - bridge: br-svc name: svc0 |