einstellungen in variablen verlagert

dhcpdns/bind/tasks/main.yml

@@ -66,6 +66,7 @@
   when: 
     - all_leases.json[0].arguments.leases is defined
 
+
 - name: "Force DDNS update for each lease"
   uri:
     url: "http://127.0.0.1:8000"

dhcpdns/dhcpinfo/templates/app.py

@@ -15,21 +15,21 @@ from flask_swagger_ui import get_swaggerui_blueprint
 # Flask App Setup
 app = Flask(__name__)
 logging.basicConfig(
-  level=logging.DEBUG,
-  stream=sys.stdout,
-  format='%(asctime)s %(levelname)s %(message)s'
+    level=logging.DEBUG,
+    stream=sys.stdout,
+    format='%(asctime)s %(levelname)s %(message)s'
 )
 
 # Kea Configuration 
-KEA_CONTROL_AGENT_URL = "http://127.0.0.1:8000"
+KEA_CONTROL_AGENT_URL = "http://127.0.0.1:{{ kea_ctrl_agent_port }}"
 KEA_SERVICE = "dhcp4"  # oder "dhcp6" für IPv6
-KEA_USERNAME = "kea-api"
+KEA_USERNAME = "{{ kea_ctrl_agent_user }}"
 KEA_PASSWORD = "{{ kea_api_password }}"
 
 # Web Server Configuration
 WEB_HOST = "0.0.0.0"
-WEB_PORT = 80
-WEB_DEBUG = True
+WEB_PORT = {{ dhcpinfo_web_port }}
+WEB_DEBUG = False
 
 # Auto-Refresh Intervall in Sekunden (0 = kein Auto-Refresh)
 AUTO_REFRESH = 30

dhcpdns/kea/templates/kea-ctrl-agent.conf

@@ -2,14 +2,14 @@
 {
 "Control-agent": {
     "http-host": "127.0.0.1",
-    "http-port": 8000,
+    "http-port": {{ kea_ctrl_agent_port }},
     "authentication": {
         "type": "basic",
         "realm": "Kea Control Agent",
         "directory": "/etc/kea",
         "clients": [
             {
-                "user": "kea-api",
+                "user": "{{ kea_ctrl_agent_user }}",
                 "password-file": "kea_api_password"
             }
         ]

dhcpdns/kea/templates/kea-dhcp-ddns.conf

@@ -2,7 +2,7 @@
 {
     "DhcpDdns": {
         "ip-address": "127.0.0.1",
-        "port": 53001,
+        "port": {{ kea_ddns_service_port }},
         "dns-server-timeout" : 1000,
         "user-context": { "version": 1 },
         "control-socket": {

dhcpdns/kea/templates/kea-dhcp4.conf

@@ -82,12 +82,12 @@
     "dhcp-ddns": {
         "enable-updates": true,
         "server-ip": "127.0.0.1",
-        "server-port":53001,
-        "sender-ip":"",
-        "sender-port":0,
-        "max-queue-size":1024,
-        "ncr-protocol":"UDP",
-        "ncr-format":"JSON"
+        "server-port": {{ kea_ddns_service_port }},
+        "sender-ip": "",
+        "sender-port": 0,
+        "max-queue-size": 1024,
+        "ncr-protocol": "UDP",
+        "ncr-format": "JSON"
     },
 }
 }

site.yml

@@ -256,14 +256,20 @@
     - { role: common/cronapt, tags: cronapt }
     - { role: common/prometheus-node, tags: prometheus-node }
     - { 
-        role: dhcpdns/kea, tags: kea
+        role: dhcpdns/kea, tags: kea,
+        kea_ctrl_agent_port: 8000,
+        kea_ctrl_agent_user: "kea-api",
+        kea_ddns_service_port: 53001
       }
     - { 
         role: dhcpdns/bind, tags: bind
       }
     - { 
         role: dhcpdns/dhcpinfo, tags: dhcpinfo,
-        basedir: /srv/dhcpinfo
+        basedir: /srv/dhcpinfo,
+        kea_ctrl_agent_port: 8000,
+        kea_ctrl_agent_user: "kea-api",
+        dhcpinfo_web_port: 80
       }
 
 - hosts: webserver