webserver/docker_gitlab/templates/docker-compose.yml

@@ -5,7 +5,7 @@ services:
 
   app:
 
-    image: gitlab/gitlab-ce:15.10.2-ce.0
+    image: gitlab/gitlab-ce:15.11.5-ce.0
     restart: always
     ports:
       - "444:22"

webserver/docker_icinga/templates/etc/icinga/conf.d/hosts_manual.conf

 
-object Host "warpfire" {
+object Host "wz-router" {
   import "generic-host"
 
   address = "192.168.0.1"
@@ -7,11 +7,77 @@ object Host "warpfire" {
   groups = [ "network" ]
 }
 
-object Host "switch-sw01-hp" {
+object Host "wz-sw-core" {
   import "generic-host"
 
-  address = "192.168.0.100"
+  address = "192.168.0.2"
 
   groups = [ "network" ]
 }
 
+object Host "wz-sw-access" {
+  import "generic-host"
+
+  address = "192.168.0.3"
+  
+  # Keine Notifications, da der Switch aus ist wenn die Zone geschlossen ist 
+  vars.enable_nofitications = false
+
+  groups = [ "network" ]
+}
+
+object Host "wz-sw-dach" {
+  import "generic-host"
+
+  address = "192.168.0.4"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-dach" {
+  import "generic-host"
+
+  address = "192.168.0.13"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-eingang" {
+  import "generic-host"
+
+  address = "192.168.0.14"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-lounge" {
+  import "generic-host"
+
+  address = "192.168.0.10"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-vortrag" {
+  import "generic-host"
+
+  address = "192.168.0.12"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-werkstatt" {
+  import "generic-host"
+
+  address = "192.168.0.11"
+
+  groups = [ "network" ]
+}
+
+object Host "homematic-ccu2" {
+  import "generic-host"
+
+  address = "{{ homematic.ccu2_host }}"
+
+  groups = [ "network" ]
+}

webserver/docker_icinga/templates/etc/icinga/conf.d/notifications.conf

@@ -6,7 +6,7 @@ apply Notification "matrix" to Host {
 
   interval = 4h
 
-  assign where host.address 
+  assign where host.address && host.vars.enable_nofitications != false
 }
 
 
@@ -17,6 +17,6 @@ apply Notification "matrix" to Service {
 
   interval = 4h
 
-  assign where service.name
+  assign where service.name && service.vars.enable_nofitications != false
 }
 

webserver/docker_icinga/templates/etc/icinga/conf.d/services_domains.conf

@@ -151,6 +151,8 @@ apply Service "spf record - {{ mail_domains[maildomain].maildomain }}" {
   assign where host.address && host.vars.is_dnsserver == "True"
 }
 
+  {% if mail_domains[maildomain].dmarc is defined %}
+
 apply Service "DMARC record - {{ mail_domains[maildomain].maildomain }}" {
   import "generic-service"
 
@@ -166,7 +168,7 @@ apply Service "DMARC record - {{ mail_domains[maildomain].maildomain }}" {
 
   assign where host.address && host.vars.is_dnsserver == "True"
 }
-
+  {% endif %}
 
   {% if mail_domains[maildomain].dkim is defined %}
   {% for entry in mail_domains[maildomain].dkim %}
@@ -179,7 +181,7 @@ apply Service "DKIM {{entry.selector}} record - {{ mail_domains[maildomain].mail
 
   vars.dig_lookup = "{{entry.selector}}._domainkey.{{ mail_domains[maildomain].maildomain }}"
   vars.dig_record_type = "TXT"
-  vars.dig_expected_address = "{{ entry.value }}"
+  vars.dig_expected_address = "{{ entry.value | replace("\"","\\\"") }}"
   vars.dig_arguments = "+tcp"
 
   groups = [ "mail" ]

webserver/docker_icinga/templates/etc/icinga/conf.d/services_homematic.conf

+
+apply Service "homematic-exporter" {
+  import "generic-service"
+
+  check_command = "http"
+  enable_perfdata = false
+
+  vars.http_address = "{{ hostvars['ogg'].int_ip4 }}"
+  vars.http_port = 8010
+  vars.http_uri = "/metrics"
+
+  groups = [ "exporter", "homematic" ]
+
+  assign where host.name == "ogg"
+}
+
+{% for device in homematic.devices_heizung %}
+
+apply Service "{{ device.name }}_homematic_lowbat" {
+  import "generic-service"
+
+  check_command = "check_metric_value"
+  enable_perfdata = true
+
+  vars.metric_url = "http://{{ hostvars['ogg'].int_ip4 }}:8010/metrics"
+  vars.metric_name = "homematic_lowbat"
+  vars.metric_labelname = "device"
+  vars.metric_labelvalue = "{{ device.id }}:0"
+  vars.metric_operator = "gt"
+  vars.metric_warn = "0"
+  vars.metric_crit = "0"
+
+  assign where host.name == "ogg"
+}
+
+{% endfor %}
\ No newline at end of file

webserver/docker_icinga/templates/etc/icinga/conf.d/services_manual.conf

@@ -9,4 +9,49 @@ apply Service "warpfire-admin" {
   vars.http_port = 80
 
   assign where host.name == "warpfire"
-}
\ No newline at end of file
+}
+
+apply Service "wz-uplink-globe" {
+  import "generic-service"
+
+  check_command = "ping4"
+
+  vars.ping_address = "212.124.34.242"
+
+  vars.ping_wrta = "100"
+  vars.ping_crta = "300"
+  vars.ping_wpl = "20"
+  vars.ping_cpl = "50"
+
+  assign where host.name == "wz-router"
+}
+
+apply Service "wz-uplink-webdiscount-1" {
+  import "generic-service"
+
+  check_command = "ping4"
+
+  vars.ping_address = "212.3.64.45"
+
+  vars.ping_wrta = "100"
+  vars.ping_crta = "300"
+  vars.ping_wpl = "20"
+  vars.ping_cpl = "50"
+
+  assign where host.name == "wz-router"
+}
+
+apply Service "wz-uplink-webdiscount-2" {
+  import "generic-service"
+
+  check_command = "ping4"
+
+  vars.ping_address = "212.3.80.222"
+
+  vars.ping_wrta = "100"
+  vars.ping_crta = "300"
+  vars.ping_wpl= "20"
+  vars.ping_cpl = "50"
+
+  assign where host.name == "wz-router"
+}

webserver/docker_mail/tasks/main.yaml

@@ -69,6 +69,13 @@
     - mailu/overrides/postfix/postfix.cf
   register: config
 
+- name: "set local dns record"
+  become: true
+  blockinfile:
+    path: /etc/hosts
+    create: yes
+    block: |
+      {{ ext_ip4 }} mailserver.warpzone.ms
 
 # - name: deploy LogRotate configs
 #   template:

webserver/docker_mail/templates/mailu.env

@@ -5,6 +5,9 @@
 # Set Version 
 MAILU_VERSION=2.0.4
 
+# enable IPv6
+SUBNET6=fd00:dead:beef:25::/64
+
 # Autocreate Admin User 
 INITIAL_ADMIN_ACCOUNT=mailadmin
 INITIAL_ADMIN_DOMAIN={{ domain }}

webserver/docker_matrix/templates/docker-compose.yml

@@ -10,7 +10,7 @@ services:
 
   db:
 
-    image: postgres:13.6
+    image: postgres:13.11
     restart: always
     volumes:
       - /srv/matrix/db:/var/lib/postgresql/data
@@ -24,7 +24,7 @@ services:
 
   synapse:
 
-    image: matrixdotorg/synapse:v1.78.0
+    image: matrixdotorg/synapse:v1.83.0
     restart: always
     cpu_count: "1"
     cpuset: "0"