intern/docker_homematic/templates/docker-compose.yml

-
-version: "3"
-
-services:
-  
-  app:
-
-    image: sfudeus/homematic_exporter:2023-05-21
-    restart: always
-    command: "--ccu_host {{ homematic.ccu2_host }} --ccu_port 2001 --port {{ homematic_metrics_port }}"
-    ports:
-      - "{{ int_ip4 }}:{{ homematic_metrics_port }}:{{ homematic_metrics_port }}"
-    networks:
-      - default
-
-  
-  influxdb:
-
-    image: influxdb:2.6.1
-    restart: always
-    ports:
-      - "{{ int_ip4 }}:{{ influxdb_port }}:8086"
-    volumes:
-      - "{{ basedir }}/influxdb:/var/lib/influxdb2"
-    environment:
-      DOCKER_INFLUXDB_INIT_MODE: setup
-      DOCKER_INFLUXDB_INIT_USERNAME: homematic
-      DOCKER_INFLUXDB_INIT_PASSWORD: {{ influxdb_password }}
-      DOCKER_INFLUXDB_INIT_ORG: homematic
-      DOCKER_INFLUXDB_INIT_BUCKET: homematic
-      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: {{ influxdb_token }}
-    networks:
-      - default
-
-
-  telegraf:
-
-    image: telegraf:1.25.3
-    restart: always
-    depends_on: 
-      - app
-      - influxdb
-    volumes:
-      - "{{ basedir }}/telegraf.conf:/etc/telegraf/telegraf.conf:ro"

intern/docker_homematic/templates/telegraf.conf

-# Telegraf Configuration
-#
-# Telegraf is entirely plugin driven. All metrics are gathered from the
-# declared inputs, and sent to the declared outputs.
-#
-# Plugins must be declared in here to be active.
-# To deactivate a plugin, comment out the name and any variables.
-#
-# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
-# file would generate.
-#
-# Environment variables can be used anywhere in this config file, simply surround
-# them with ${}. For strings the variable must be within quotes (ie, "${STR_VAR}"),
-# for numbers and booleans they should be plain (ie, ${INT_VAR}, ${BOOL_VAR})
-
-
-# Global tags can be specified here in key="value" format.
-[global_tags]
-  # dc = "us-east-1" # will tag all metrics with dc=us-east-1
-  # rack = "1a"
-  ## Environment variables can be used as tags, and throughout the config file
-  # user = "$USER"
-
-# Configuration for telegraf agent
-[agent]
-  ## Default data collection interval for all inputs
-  interval = "5s"
-  ## Rounds collection interval to 'interval'
-  ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
-  round_interval = true
-
-  ## Telegraf will send metrics to outputs in batches of at most
-  ## metric_batch_size metrics.
-  ## This controls the size of writes that Telegraf sends to output plugins.
-  metric_batch_size = 100
-
-  ## Maximum number of unwritten metrics per output.  Increasing this value
-  ## allows for longer periods of output downtime without dropping metrics at the
-  ## cost of higher maximum memory usage.
-  metric_buffer_limit = 10000
-
-  ## Collection jitter is used to jitter the collection by a random amount.
-  ## Each plugin will sleep for a random time within jitter before collecting.
-  ## This can be used to avoid many plugins querying things like sysfs at the
-  ## same time, which can have a measurable effect on the system.
-  collection_jitter = "0s"
-
-  ## Default flushing interval for all outputs. Maximum flush_interval will be
-  ## flush_interval + flush_jitter
-  flush_interval = "10s"
-  ## Jitter the flush interval by a random amount. This is primarily to avoid
-  ## large write spikes for users running a large number of telegraf instances.
-  ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
-  flush_jitter = "0s"
-
-  ## By default or when set to "0s", precision will be set to the same
-  ## timestamp order as the collection interval, with the maximum being 1s.
-  ##   ie, when interval = "10s", precision will be "1s"
-  ##       when interval = "250ms", precision will be "1ms"
-  ## Precision will NOT be used for service inputs. It is up to each individual
-  ## service input to set the timestamp at the appropriate precision.
-  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
-  precision = ""
-
-  ## Log at debug level.
-  # debug = false
-  ## Log only error level messages.
-  # quiet = false
-
-  ## Log target controls the destination for logs and can be one of "file",
-  ## "stderr" or, on Windows, "eventlog".  When set to "file", the output file
-  ## is determined by the "logfile" setting.
-  # logtarget = "file"
-
-  ## Name of the file to be logged to when using the "file" logtarget.  If set to
-  ## the empty string then logs are written to stderr.
-  # logfile = ""
-
-  ## The logfile will be rotated after the time interval specified.  When set
-  ## to 0 no time based rotation is performed.  Logs are rotated only when
-  ## written to, if there is no log activity rotation may be delayed.
-  # logfile_rotation_interval = "0d"
-
-  ## The logfile will be rotated when it becomes larger than the specified
-  ## size.  When set to 0 no size based rotation is performed.
-  # logfile_rotation_max_size = "0MB"
-
-  ## Maximum number of rotated archives to keep, any older logs are deleted.
-  ## If set to -1, no archives are removed.
-  # logfile_rotation_max_archives = 5
-
-  ## Pick a timezone to use when logging or type 'local' for local time.
-  ## Example: America/Chicago
-  # log_with_timezone = ""
-
-  ## Override default hostname, if empty use os.Hostname()
-  hostname = ""
-  ## If set to true, do no set the "host" tag in the telegraf agent.
-  omit_hostname = false
-
-###############################################################################
-#                            OUTPUT PLUGINS                                   #
-###############################################################################
-
-# Configuration for sending metrics to InfluxDB 2.0
-[[outputs.influxdb_v2]]
-  ## The URLs of the InfluxDB cluster nodes.
-  ##
-  ## Multiple URLs can be specified for a single cluster, only ONE of the
-  ## urls will be written to each interval.
-  ##   ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"]
-  urls = ["http://influxdb:8086"]
-
-  ## Token for authentication.
-  token = "{{ influxdb_token }}"
-
-  ## Organization is the name of the organization you wish to write to.
-  organization = "homematic"
-
-  ## Destination bucket to write into.
-  bucket = "homematic"
-
-  ## The value of this tag will be used to determine the bucket.  If this
-  ## tag is not set the 'bucket' option is used as the default.
-  # bucket_tag = ""
-
-  ## If true, the bucket tag will not be added to the metric.
-  # exclude_bucket_tag = false
-
-  ## Timeout for HTTP messages.
-  # timeout = "5s"
-
-  ## Additional HTTP headers
-  # http_headers = {"X-Special-Header" = "Special-Value"}
-
-  ## HTTP Proxy override, if unset values the standard proxy environment
-  ## variables are consulted to determine which proxy, if any, should be used.
-  # http_proxy = "http://corporate.proxy:3128"
-
-  ## HTTP User-Agent
-  # user_agent = "telegraf"
-
-  ## Content-Encoding for write request body, can be set to "gzip" to
-  ## compress body or "identity" to apply no encoding.
-  # content_encoding = "gzip"
-
-  ## Enable or disable uint support for writing uints influxdb 2.0.
-  # influx_uint_support = false
-
-  ## Optional TLS Config for use on HTTP connections.
-  # tls_ca = "/etc/telegraf/ca.pem"
-  # tls_cert = "/etc/telegraf/cert.pem"
-  # tls_key = "/etc/telegraf/key.pem"
-  ## Use TLS but skip chain & host verification
-  # insecure_skip_verify = false
-
-
-###############################################################################
-#                            INPUT PLUGINS                                    #
-###############################################################################
-
-# Read metrics from one or many prometheus clients
-[[inputs.prometheus]]
-  ## An array of urls to scrape metrics from.
-  urls = ["http://app:{{ homematic_metrics_port }}/metrics"]
-
-  ## Metric version controls the mapping from Prometheus metrics into Telegraf metrics.
-  ## See "Metric Format Configuration" in plugins/inputs/prometheus/README.md for details.
-  ## Valid options: 1, 2
-  # metric_version = 1
-
-  ## Url tag name (tag containing scrapped url. optional, default is "url")
-  # url_tag = "url"
-
-  ## Whether the timestamp of the scraped metrics will be ignored.
-  ## If set to true, the gather time will be used.
-  # ignore_timestamp = false
-

intern/docker_mqtt/tasks/main.yml

 ---
-- include: ../functions/get_secret.yml
+- include_tasks: ../functions/get_secret.yml
   with_items:
    - { path: "{{ basedir }}/influxdb_password", length: 12 }
    - { path: "{{ basedir }}/influxdb_token", length: 24 }

remote/docker_homeassistant/tasks/main.yml

 ---
 
-- include: ../functions/get_secret.yml
+- include_tasks: ../functions/get_secret.yml
   with_items:
    - { path: "{{ basedir }}/homeassistant_admin_password", length: 12 }
    - { path: "{{ basedir }}/influxdb_password",            length: 12 }

site.yml

@@ -95,13 +95,6 @@
         homematic_callback_port: 8060,
         influxdb_port: 38086       
       }
-    - { 
-        role: intern/docker_homematic, tags: homematic, 
-        servicename: homematic, 
-        basedir: /srv/homematic,
-        homematic_metrics_port: 8010,
-        influxdb_port: 48086       
-      }
     - { 
         role: intern/docker_mqtt, tags: mqtt, 
         servicename: mqtt,

verwaltung/docker_gitea/tasks/main.yml

 ---
 # Get secrets 
-- include: ../functions/get_secret.yml
+- include_tasks: ../functions/get_secret.yml
   with_items:
     - { path: /srv/gitea/mysql_root_pw, length: 24 }
     - { path: /srv/gitea/mysql_user_pw, length: 12 }

verwaltung/docker_mysql/tasks/main.yml

 ---
 # Get secrets
-- include: ../functions/get_secret.yml
+- include_tasks: ../functions/get_secret.yml
   with_items:
     - { path: /srv/mysql/mysql_root_pw, length: 24 }
     - { path: /srv/mysql/mysql_user_pw, length: 12 }

verwaltung/docker_nextcloud/tasks/main.yml

 ---
 
-- include: ../functions/get_secret.yml
+- include_tasks: ../functions/get_secret.yml
   with_items:
     - { path: /srv/nextcloud/nextcloud_admin_pass,  length: 24 }
     - { path: /srv/nextcloud/mysql_admin_pass,  length: 24 }

verwaltung/docker_nextcloud/templates/docker-compose.yml

@@ -42,6 +42,9 @@ services:
       MYSQL_HOST: mysql
       NEXTCLOUD_ADMIN_USER: "admin"
       NEXTCLOUD_ADMIN_PASSWORD: "{{nextcloud_admin_pass}}"
+      OVERWRITEPROTOCOL: https
+      OVERWRITECLIURL: https://{{ domain }}
+      OVERWRITEHOST: {{ domain }}
     labels:
       - traefik.enable=true
       - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`)

webserver/docker_icinga/tasks/main.yml

 ---
 
-- include: ../functions/get_secret.yml
+- include_tasks: ../functions/get_secret.yml
   with_items:
     - { path: /srv/ldap/secret/ldap_readonly_pass, length: -1 }
     - { path: "{{ basedir }}/icinga_admin_pass",  length: 12 }

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

@@ -74,10 +74,10 @@ object Host "wz-ap-werkstatt" {
   groups = [ "network" ]
 }
 
-object Host "homematic-ccu2" {
+object Host "eq3max-cube" {
   import "generic-host"
 
-  address = "{{ homematic.ccu2_host }}"
+  address = "{{ eq3max.cube_host }}"
 
   groups = [ "network" ]
 }

webserver/docker_mail/templates/mailu.env

@@ -3,7 +3,7 @@
 ###################################
 
 # Set Version 
-MAILU_VERSION=2.0.4
+MAILU_VERSION=2.0.16
 
 # enable IPv6
 SUBNET6=fd00:dead:beef:25::/64
@@ -27,9 +27,6 @@ SQLALCHEMY_DATABASE_URI_ROUNDCUBE=mysql://roundcube:{{ roundcube_db_pass }}@db/r
 # Common configuration variables
 ###################################
 
-# Set mailu version 
-MAILU_VERSION=2.0
-
 # Set to a randomly generated 16 bytes string
 SECRET_KEY={{ mailu_secret_key }}