From 3a8354d8088631d3df016b925f5af72f6bb9ec4a Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 29 Aug 2020 02:15:03 +0200
Subject: finalize ch-http-proxy

---
 inventory/group_vars/chaos-at-home/network.yml |  4 ++--
 inventory/host_vars/ch-auth-legacy.yml         | 33 ++++++++++++++++++++++++++
 inventory/host_vars/ch-http-proxy.yml          |  3 +--
 inventory/hosts.ini                            |  2 ++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 inventory/host_vars/ch-auth-legacy.yml

(limited to 'inventory')

diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index f3d1620d..c13b9602 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -16,10 +16,10 @@ network_zones:
       ch-oulu-vm1: 3 ## testing
       ch-mc: 10
       ch-prometheus: 200
-      ch-prometheus-old: 250
       ch-gw-lan: 254
       #############
       ## legacy stuff
+      ch-prometheus-old: 250
       ch-auth-legacy: 88 ## legacy
       ch-prometheus-legacy: 99 ## legacy
     wifi:
@@ -59,7 +59,7 @@ network_zones:
       #############
       ## legacy stuff
       ch-stats-legacy: 10
-      ch-web-legacy: 80
+      ch-web-legacy: 81
       ch-auth-legacy: 88
       ch-mail-legacy: 144
 
diff --git a/inventory/host_vars/ch-auth-legacy.yml b/inventory/host_vars/ch-auth-legacy.yml
new file mode 100644
index 00000000..c06796cb
--- /dev/null
+++ b/inventory/host_vars/ch-auth-legacy.yml
@@ -0,0 +1,33 @@
+---
+install_jumphost: ch-jump
+
+install:
+  vm:
+    memory: 512M
+    numcpus: 2
+    autostart: True
+  disks:
+    primary: /dev/sda
+    scsi:
+      sda:
+        type: zfs
+        name: root
+        size: 7g
+  interfaces:
+  - bridge: br-svc
+    name: eth0
+
+network:
+  nameservers: "{{ network_zones.svc.dns }}"
+  domain: "{{ host_domain }}"
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary: &_network_primary_
+    name: eth0
+    address: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.svc.gateway }}"
+    static_routes:
+    - destination: "{{ network_zones.lan.prefix }}"
+      gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}"
+  interfaces:
+  - *_network_primary_
diff --git a/inventory/host_vars/ch-http-proxy.yml b/inventory/host_vars/ch-http-proxy.yml
index 13e764cb..69acde86 100644
--- a/inventory/host_vars/ch-http-proxy.yml
+++ b/inventory/host_vars/ch-http-proxy.yml
@@ -33,5 +33,4 @@ network:
   - *_network_primary_
 
 
-acmetool_reconcile_disabled: yes
-#acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}"
+acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 71564bcf..c26678b9 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -25,6 +25,7 @@ ch-prometheus host_name=prometheus
 ch-apps host_name=apps
 ch-http-proxy host_name=http-proxy
 ch-imap-proxy host_name=imap-proxy
+ch-auth-legacy host_name=auth
 ch-atlas host_name=atlas
 ch-pan host_name=pan
 ch-keyserver host_name=keyserver
@@ -263,6 +264,7 @@ vmhost-ch-gnocchi-guests
 ch-apps
 ch-http-proxy
 ch-imap-proxy
+ch-auth-legacy
 [vmhost-ch-prometheus]
 ch-prometheus
 [vmhost-ch-prometheus:children]
-- 
cgit v1.2.3