From 9acca552c1a45b5dbd6cafb65d019efc6a791ff5 Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@arxes-tolina.de>
Date: Thu, 5 Aug 2021 12:15:37 +0200
Subject: [PATCH] chore: network settings

---
 README.md                                     | 13 ++++---------
 roles/hcloud/templates/firewall-awx.json.j2   |  3 ++-
 .../hcloud/templates/firewall-default.json.j2 |  9 ++++++---
 .../hcloud/templates/firewall-docker.json.j2  | 19 -------------------
 .../hcloud/templates/firewall-kibana.json.j2  |  2 +-
 .../templates/firewall-monitoring.json.j2     |  3 ++-
 6 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 roles/hcloud/templates/firewall-docker.json.j2

diff --git a/README.md b/README.md
index 541c7b6..eed2103 100644
--- a/README.md
+++ b/README.md
@@ -36,15 +36,10 @@ Create/Start servers for stage-dev
 
 # TODO
 
-212.121.131.106 - Siemansdamm - IPFire
-
-Keykloak
-  Read Flow for Docker
-  Get ID by 'docker auth'
-  Update Client 'docker-registry'
-  Download Installation
-Docker-Registry
-  Use Installation from Keycloak Client 'docker-registry'
+IPFire
+  149.233.6.129 - eShelter
+  212.121.131.106 - Siemansdamm
+
 Prometheus (Grafana)
   docker exec -i df4d6b176f5e sh -c 'grafana-cli plugins install grafana-piechart-panel'
   docker restart df4d6b176f5e
diff --git a/roles/hcloud/templates/firewall-awx.json.j2 b/roles/hcloud/templates/firewall-awx.json.j2
index b42e8c7..5a751cf 100644
--- a/roles/hcloud/templates/firewall-awx.json.j2
+++ b/roles/hcloud/templates/firewall-awx.json.j2
@@ -10,7 +10,8 @@
       "source_ips": [
         "149.233.6.129/32",
         "212.121.131.106/32",
-        "87.150.34.206/32"
+        "79.215.1.110/32",
+        "159.69.46.214/32"
       ],
       "destination_ips": [
       ]
diff --git a/roles/hcloud/templates/firewall-default.json.j2 b/roles/hcloud/templates/firewall-default.json.j2
index e11840b..087a0b7 100644
--- a/roles/hcloud/templates/firewall-default.json.j2
+++ b/roles/hcloud/templates/firewall-default.json.j2
@@ -21,7 +21,8 @@
       "source_ips": [
         "149.233.6.129/32",
         "212.121.131.106/32",
-        "87.150.34.206/32"
+        "162.55.214.230/32",
+        "79.215.1.110/32"
       ],
       "destination_ips": [
       ]
@@ -33,7 +34,8 @@
       "source_ips": [
         "149.233.6.129/32",
         "212.121.131.106/32",
-        "87.150.34.206/32"
+        "162.55.214.230/32",
+        "79.215.1.110/32"
       ],
       "destination_ips": [
       ]
@@ -45,7 +47,8 @@
       "source_ips": [
         "149.233.6.129/32",
         "212.121.131.106/32",
-        "87.150.34.206/32"
+        "162.55.214.230/32",
+        "79.215.1.110/32"
       ],
       "destination_ips": [
       ]
diff --git a/roles/hcloud/templates/firewall-docker.json.j2 b/roles/hcloud/templates/firewall-docker.json.j2
deleted file mode 100644
index 9a570f9..0000000
--- a/roles/hcloud/templates/firewall-docker.json.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "docker",
-  "labels": {
-  },
-  "rules": [
-    {
-      "direction": "in",
-      "protocol": "tcp",
-      "port": "443",
-      "source_ips": [
-        "157.90.236.71/32",
-        "162.55.54.246/32",
-        "162.55.63.118/32"
-      ],
-      "destination_ips": [
-      ]
-    }
-  ]
-}
diff --git a/roles/hcloud/templates/firewall-kibana.json.j2 b/roles/hcloud/templates/firewall-kibana.json.j2
index d71b4b1..b681d95 100644
--- a/roles/hcloud/templates/firewall-kibana.json.j2
+++ b/roles/hcloud/templates/firewall-kibana.json.j2
@@ -10,7 +10,7 @@
       "source_ips": [
         "149.233.6.129/32",
         "212.121.131.106/32",
-        "87.150.34.206/32"
+        "79.215.1.110/32"
       ],
       "destination_ips": [
       ]
diff --git a/roles/hcloud/templates/firewall-monitoring.json.j2 b/roles/hcloud/templates/firewall-monitoring.json.j2
index 8c63277..12b3684 100644
--- a/roles/hcloud/templates/firewall-monitoring.json.j2
+++ b/roles/hcloud/templates/firewall-monitoring.json.j2
@@ -8,8 +8,9 @@
       "protocol": "tcp",
       "port": "9080-9085",
       "source_ips": [
+        "149.233.6.129/32",
         "212.121.131.106/32",
-        "87.150.34.206/32",
+        "79.215.1.110/32",
         "94.130.97.253/32"
       ],
       "destination_ips": [