diff --git a/functions b/functions
index 900377e4f72486f6699ecf736f96adfbc04e92da..e8a049414bca2b14b158444dac1b94c2ca90d9be 160000
--- a/functions
+++ b/functions
@@ -1 +1 @@
-Subproject commit 900377e4f72486f6699ecf736f96adfbc04e92da
+Subproject commit e8a049414bca2b14b158444dac1b94c2ca90d9be
diff --git a/intern/docker_openhab/tasks/main.yml b/intern/docker_openhab/tasks/main.yml
deleted file mode 100644
index 1621efcef65b10c360d903d821ff2494badc835f..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/tasks/main.yml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-
-- include: ../functions/get_secret.yml
- with_items:
- - { path: "{{ basedir }}/openweathermap_apikey", length: -1 }
- - { path: "{{ basedir }}/warpai_status_update_key", length: -1 }
- - { path: "{{ basedir }}/influxdb_password", length: 12 }
- - { path: "{{ basedir }}/influxdb_token", length: 32 }
-
-
-- name: pakete installieren
- apt:
- state: present
- name:
- - logrotate
-
-
-- name: openhab LogRotate config erstellen
- template:
- src: logrotate
- dest: /etc/logrotate.d/openhab
-
-
-- name: "create folder struct for {{ basedir }}"
- file:
- path: "{{ item }}"
- state: "directory"
- with_items:
- - "{{ basedir }}"
- - "{{ basedir }}/addons/"
- - "{{ basedir }}/conf/"
- - "{{ basedir }}/conf/items/"
- - "{{ basedir }}/conf/services/"
- - "{{ basedir }}/conf/persistence/"
- - "{{ basedir }}/conf/rules/"
- - "{{ basedir }}/conf/things/"
- - "{{ basedir }}/userdata/"
- - "{{ basedir }}/influxdb/"
-
-
-- name: "copy config files for {{ basedir }}"
- template:
- src: "{{ item }}"
- dest: "{{ basedir }}/{{ item }}"
- with_items:
- - docker-compose.yml
- register: docker_config_files
-
-
-- name: "copy config files for {{ basedir }} 2"
- template:
- src: "{{ item }}"
- dest: "{{ basedir }}/{{ item }}"
- with_items:
- - conf/items/groups.items
- - conf/items/mqtt.items
- - conf/items/network.items
- - conf/items/other.items
- - conf/items/weather.items
- - conf/items/wled.items
- - conf/persistence/influxdb.persist
- - conf/persistence/rrd4j.persist
- - conf/rules/zonestatus.rules
- - conf/services/addons.cfg
- - conf/services/influxdb.cfg
- - conf/services/mqtt.cfg
- - conf/services/network.cfg
- - conf/services/runtime.cfg
- - conf/things/astro.things
- - conf/things/mqtt.things
- - conf/things/network.things
- - conf/things/weather.things
- - conf/things/wled.things
-
-
-- name: stop openhab docker
- docker_compose:
- project_src: "{{ basedir }}"
- state: absent
- when: docker_config_files.changed
-
-
-- name: start openhab docker
- docker_compose:
- project_src: "{{ basedir }}"
- state: present
diff --git a/intern/docker_openhab/templates/conf/items/groups.items b/intern/docker_openhab/templates/conf/items/groups.items
deleted file mode 100644
index 3315642043821b94d120f066ee58d0ee5c2924f3..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/items/groups.items
+++ /dev/null
@@ -1,16 +0,0 @@
-
-// Gruppendefinitionen
-// ID, Name, Icon, Tag
-// Liste der Icons: https://www.openhab.org/docs/configuration/iconsets/classic/
-// Liste der Semantic Tags: https://github.com/openhab/openhab-core/blob/main/bundles/org.openhab.core.semantics/model/SemanticTags.csv
-
-Group gFlur "Flur" <corridor> ["Corridor"]
-Group gHauptraum "Hauptraum" <settings> ["GuestRoom"]
-Group gHolzwerkstatt "Holzwerkstatt" <settings> ["GuestRoom"]
-Group gKueche "Küche" <kitchen> ["Kitchen"]
-Group gLounge "Lounge" <sofa> ["LivingRoom"]
-Group gToilet "Toilette" <toilet> ["Bathroom"]
-Group gVortragsraum "Vortragsraum" <screen> ["GuestRoom"]
-
-
-
diff --git a/intern/docker_openhab/templates/conf/items/mqtt.items b/intern/docker_openhab/templates/conf/items/mqtt.items
deleted file mode 100644
index 15175ac68043aa5e823169a7380d2bd847369346..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/items/mqtt.items
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Number Werkstatt_Licht "Werkstatt Licht [%.0f (0-225)]" <light> (gHauptraum) ["Light"] {
- channel="mqtt:topic:mosquitto:werkstattlicht:level"
-}
-
-{% for device in esphome_devices %}
- {% if device.sensors is defined %}
- {% for sensor in device.sensors %}
-
- {% if sensor == "Temp" or sensor == "HeizungVorlauf" or sensor == "HeizungRuecklauf" or sensor == "Kuehlschrank-Temp" %}
-
-Number MQTT_{{ device.id }}_{{ sensor | replace("-","") }} "Sensor {{ device.name }} {{ sensor }} [%.1f °C]" <temperature> ({{ device.groups }}) ["Measurement","Temperature","CurrentTemperature"] {
- channel="mqtt:topic:mosquitto:{{ device.id }}:{{ sensor | replace("-","") | lower }}"
-}
-
- {% elif sensor == "pressure" %}
-
-Number MQTT_{{ device.id }}_{{ sensor }} "Sensor {{ device.name }} Pressure [%.1f hPa]" <pressure> ({{ device.groups }}) ["Measurement","Pressure"] {
- channel="mqtt:topic:mosquitto:{{ device.id }}:{{ sensor }}"
-}
-
- {% elif sensor == "humidity" %}
-
-Number MQTT_{{ device.id }}_{{ sensor }} "Sensor {{ device.name }} Humidity [%.1f %%]" <humidity> ({{ device.groups }}) ["Measurement","Humidity","CurrentHumidity"] {
- channel="mqtt:topic:mosquitto:{{ device.id }}:{{ sensor }}"
-}
-
- {% elif sensor == "feinstaub_2_5" %}
-
-Number MQTT_{{ device.id }}_{{ sensor }} "Sensor {{ device.name }} 2.5 PM [%.1f µg/m³]" ({{ device.groups }}) ["Measurement"] {
- channel="mqtt:topic:mosquitto:{{ device.id }}:{{ sensor }}"
-}
-
- {% elif sensor == "stromverbrauch" %}
-
-Number MQTT_{{ device.id }}_{{ sensor }} "Sensor {{ device.name }} kW [%.1f kW]" ({{ device.groups }}) ["Measurement"] {
- channel="mqtt:topic:mosquitto:{{ device.id }}:{{ sensor }}"
-}
-
- {% elif sensor == "Kuehlschrank-Door" or sensor == "warpzone_status" %}
-
-Switch MQTT_{{ device.id }}_{{ sensor | replace("-","") | lower }} "Sensor {{ device.name }} {{ sensor }}" ({{ device.groups }}) {
- channel="mqtt:topic:mosquitto:{{ device.id }}:{{ sensor | replace("-","") | lower }}"
-}
-
- {% endif %}
-
- {% endfor %}
- {% endif %}
-{% endfor %}
-
diff --git a/intern/docker_openhab/templates/conf/items/network.items b/intern/docker_openhab/templates/conf/items/network.items
deleted file mode 100644
index f9e6b63390b6ce390b230ccad71c3d5af39af3a3..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/items/network.items
+++ /dev/null
@@ -1,5 +0,0 @@
-
-// Netzwerkgeräte für Präsenzinformationen
-
-Switch Switch01 "Switch 01" <network> ["Measurement", "Presence"] { channel="network:pingdevice:switch01:online" }
-Switch Switch02 "Switch 02" <network> ["Measurement", "Presence"] { channel="network:pingdevice:switch02:online" }
diff --git a/intern/docker_openhab/templates/conf/items/other.items b/intern/docker_openhab/templates/conf/items/other.items
deleted file mode 100644
index 9482dd5ff45bdf24cd2807fe99c90d1db85f2d6d..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/items/other.items
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// Sonne über Horizont (positiv) bzw. unter Horizint (negativ)
-// Check in Regeln: if(Sun_Elevation.state < 0)
-Number Sun_Elevation "Sun Elevation" <sun_clouds> (gAussen) ["Measurement"] {
- channel="astro:sun:local:position#elevation"
-}
-
diff --git a/intern/docker_openhab/templates/conf/items/weather.items b/intern/docker_openhab/templates/conf/items/weather.items
deleted file mode 100644
index 9ab366197d6af79a90e02400364df653c29a79f9..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/items/weather.items
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Number:Temperature Weather_OWM_Temperature "Temperature [%.1f %unit%]" <temperature> (gAussen) ["Measurement","Temperature","CurrentTemperature"] {
- channel="openweathermap:weather-and-forecast:api:local:current#temperature",
- alexa="TemperatureSensor.temperature" [scale="Celsius"]
-}
-
-Number:Dimensionless Weather_OWM_Humidity "Humidity [%d %unit%]" <humidity> (gAussen) ["Measurement","Humidity","CurrentHumidity"] {
- channel="openweathermap:weather-and-forecast:api:local:current#humidity",
- alexa="RangeController.rangeValue" [friendlyNames="@Setting.Humidity", nonControllable=true, supportedRange="0:100:1", unitOfMeasure="Percent"]
-}
diff --git a/intern/docker_openhab/templates/conf/items/wled.items b/intern/docker_openhab/templates/conf/items/wled.items
deleted file mode 100644
index 8cde5c89496d4b48c8fd4b87986eed9457b61a24..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/items/wled.items
+++ /dev/null
@@ -1,24 +0,0 @@
-
-{% for device in wled_devices %}
-
-Color WLED_{{ device.id }}_Master "WLED {{ device.id }} Master" <colorlight> ({{ device.groups }}) [ "Switch","Light" ] {
- channel="wled:wled:{{ device.id }}:masterControls"
-}
-
-String WLED_{{ device.id }}_FX "WLED {{ device.id }} Effect" ({{ device.groups }}) [ "Light" ] {
- channel="wled:wled:{{ device.id }}:fx"
-}
-
-String WLED_{{ device.id }}_Palettes "WLED {{ device.id }} Palettes" ({{ device.groups }}) [ "Light" ] {
- channel="wled:wled:{{ device.id }}:palettes"
-}
-
-String WLED_{{ device.id }}_Presets "WLED {{ device.id }} Presets" ({{ device.groups }}) [ "Light" ] {
- channel="wled:wled:{{ device.id }}:presets"
-}
-
-Switch WLED_{{ device.id }}_PresetCycle "WLED {{ device.id }} PresetCycle" ({{ device.groups }}) [ "Light" ] {
- channel="wled:wled:{{ device.id }}:presetCycle"
-}
-
-{% endfor %}
diff --git a/intern/docker_openhab/templates/conf/persistence/influxdb.persist b/intern/docker_openhab/templates/conf/persistence/influxdb.persist
deleted file mode 100644
index 283ca4c90e7fdb783f8df89d4acd9c93b7a8ff3a..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/persistence/influxdb.persist
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Strategies {
- everyMinute : "0 * * * * ?"
-}
-
-Items {
- * : strategy = everyChange, everyMinute
-}
diff --git a/intern/docker_openhab/templates/conf/persistence/rrd4j.persist b/intern/docker_openhab/templates/conf/persistence/rrd4j.persist
deleted file mode 100644
index f1ced2c2ff2205949829515988e2ab9d12851bca..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/persistence/rrd4j.persist
+++ /dev/null
@@ -1,10 +0,0 @@
-Strategies {
- // for rrd charts, we need a cron strategy
- everyMinute : "0 * * * * ?"
-}
-
-Items {
- // persist items on every change and every minute
- * : strategy = everyChange, everyMinute
-}
-
diff --git a/intern/docker_openhab/templates/conf/rules/zonestatus.rules b/intern/docker_openhab/templates/conf/rules/zonestatus.rules
deleted file mode 100644
index 404d0fe081beb2404e45e90489a3224bcfbbe51c..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/rules/zonestatus.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-
-rule "Zonestatus"
-when
- Item Switch02 received update
-then
- val topic = "warpzone/door/status"
- val message = if (Switch02.state == ON) "OPEN" else "CLOSED"
-
- logInfo("default.rules","Switch02 updated to: " + Switch02.state + " sending: " + message + " to " + topic)
-
- val mqttActions = getActions("mqtt", "mqtt:broker:mosquitto")
- mqttActions.publishMQTT(topic, message)
-
- val headers = newHashMap()
- val output = sendHttpGetRequest("https://api.warpzone.ms/setstatus?newstatus=" + message + "&update_key={{ warpai_status_update_key }}", headers, 1000)
-
-end
-
diff --git a/intern/docker_openhab/templates/conf/services/addons.cfg b/intern/docker_openhab/templates/conf/services/addons.cfg
deleted file mode 100644
index d8115dfe54bf7979af755a64d8913c032af859ba..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/services/addons.cfg
+++ /dev/null
@@ -1,40 +0,0 @@
-# The base installation package of this openHAB instance
-# Note: This is only regarded at the VERY FIRST START of openHAB
-# Optional. If not set, the dashboard (https://<yourserver>:8080/) will ask you to choose a package.
-#
-# Valid options:
-# - minimal : Installation only with dashboard, but no UIs or other addons
-# - simple : Setup for using openHAB purely through UIs - you need to expect MANY constraints in functionality!
-# - standard : Default setup for normal users, best for textual setup
-# - expert : Setup for expert users, especially for people migrating from openHAB 1.x
-# - demo : A demo setup which includes UIs, a few bindings, config files etc.
-#
-package = standard
-
-# Access Remote Add-on Repositories
-# Defines whether the remote openHAB add-on repository should be used for browsing and installing add-ons.
-# This not only makes latest snapshots of add-ons available, it is also required for the installation of
-# any legacy 1.x add-on and all experimental features. (default is false for offline distro, true for online distro)
-#
-remote = true
-
-# A comma-separated list of bindings to install (e.g. "sonos,knx,zwave")
-binding = astro,mqtt,network,openweathermap,wled
-
-# A comma-separated list of UIs to install (e.g. "basic,paper")
-# ui = habpanel
-
-# A comma-separated list of persistence services to install (e.g. "rrd4j,jpa")
-persistence = rrd4j,influxdb
-
-# A comma-separated list of actions to install (e.g. "mail,pushover")
-# action = pushover
-
-# A comma-separated list of transformation services to install (e.g. "map,jsonpath")
-transformation = map,regex,jsonpath,jinja
-
-# A comma-separated list of voice services to install (e.g. "marytts,freetts")
-#voice =
-
-# A comma-separated list of miscellaneous services to install (e.g. "myopenhab")
-# misc = openhabcloud
diff --git a/intern/docker_openhab/templates/conf/services/influxdb.cfg b/intern/docker_openhab/templates/conf/services/influxdb.cfg
deleted file mode 100644
index 52f9b6443e0f1b13b2d15ff8e23d382263bfd383..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/services/influxdb.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-version=V2
-url=http://influxdb:8086
-user=openhab
-token={{ influxdb_token }}
-db=openhab
-retentionPolicy=openhab
diff --git a/intern/docker_openhab/templates/conf/services/mqtt.cfg b/intern/docker_openhab/templates/conf/services/mqtt.cfg
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/intern/docker_openhab/templates/conf/services/network.cfg b/intern/docker_openhab/templates/conf/services/network.cfg
deleted file mode 100644
index 9b48208106482b180a2ab453dc1c73f3735d85aa..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/services/network.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-binding.network:allowSystemPings=true
-binding.network:allowDHCPlisten=false
-binding.network:arpPingToolPath=arping
-binding.network:cacheDeviceStateTimeInMS=2000
diff --git a/intern/docker_openhab/templates/conf/services/runtime.cfg b/intern/docker_openhab/templates/conf/services/runtime.cfg
deleted file mode 100644
index d484983ef18fec5e84886c2ed76830454e0b8a00..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/services/runtime.cfg
+++ /dev/null
@@ -1,106 +0,0 @@
-##################### LOCALE ####################
-
-# The default language that should be used. If not specified, the system default locale is used.
-# The ISO 639 alpha-2 or alpha-3 language code (if there is no alpha-2 one).
-# Example: "en" (English), "de" (German), "ja" (Japanese), "kok" (Konkani)
-#
-org.openhab.i18n:language=de
-
-# The region that should be used.
-# ISO 3166 alpha-2 country code or UN M.49 numeric-3 area code.
-# Example: "US" (United States), "DE" (Germany), "FR" (France), "029" (Caribbean)
-#
-org.openhab.i18n:region=DE
-
-# Location
-org.openhab.i18n:location=51.944514, 7.638933
-
-# Timezone
-org.openhab.i18n:timezon=Europe/Berlin
-
-
-################ PERSISTENCE ####################
-
-# The persistence service to use if no other is specified.
-#
-org.openhab.persistence:default=rrd4j
-
-################### AUDIO #######################
-
-# This parameter defines the default audio source to use (if not set, the first available one will be used.
-#
-#org.openhab.audio:defaultSource=
-
-# This parameter defines the default audio sink to use (if not set, the first available one will be used.
-#
-#org.openhab.audio:defaultSink=
-
-##################### VOICE #####################
-
-# This parameter defines the default text-to-speech service to use (if not set, the first available one will be used.
-#
-#org.openhab.voice:defaultTTS=
-
-# This parameter defines the default speech-to-text service to use (if not set, the first available one will be used.
-#
-#org.openhab.voice:defaultSTT=
-
-# The default voice to use if no specific TTS service or voice is specified.
-#
-#org.openhab.voice:defaultVoice=
-
-# The default human language interpreter to use if no other is specified.
-#
-#org.openhab.voice:defaultHLI=
-
-################ MISCELLANOUS ###################
-
-# The karaf sshHost parameter configures the bind address for the ssh login to karaf.
-# Default is 127.0.0.1 (localhost), so it is only possible to login from the local machine.
-#
-# Setting this to the address of another network interfaces will allow login from this network.
-# Setting this to 0.0.0.0 will allow login from all network interfaces.
-#
-# !!! Security warning !!!
-# Remember to change default login/password, if you allow external login.
-# See https://www.openhab.org/docs/administration/console.html for details.
-#
-#org.apache.karaf.shell:sshHost = 0.0.0.0
-
-# Setting this to true will automatically approve all inbox entries and create Things for them,
-# so that they are immediately available in the system (default is false)
-#
-#org.openhab.inbox:autoApprove=true
-
-# Cross-origin resource sharing (CORS) is a browser security feature that restricts cross-origin
-# HTTP requests that are initiated from scripts running in the browser. Setting this option to 'true'
-# will disable the browser cross-origin check. This is required if you want to use a web UI that is not
-# hosted on the openHAB server domain.
-#org.openhab.cors:enable=true
-
-# This parameter defines how the members of a group are sorted in UIs rendering sitemaps.
-# 3 values are accepted:
-# - NONE: no sorting (this is the default)
-# - LABEL: sorted by label
-# - NAME: sorted by name
-#org.openhab.sitemap:groupMembersSorting=NONE
-
-################ REST API ###################
-
-# Allow the use of Basic authentication to access protected API resources, in addition to access tokens and API tokens
-#
-#org.openhab.restauth:allowBasicAuth=true
-
-# When basic authentication is activated, credentials are put in a cache in order to speed up request
-# authorization. The entries in the cache expire after a while in order to not keep credentials in memory indefinitely.
-# This value defines the expiration time in hours. Set it to 0 for disabling the cache.
-#
-#org.openhab.restauth:cacheExpiration=6
-
-# By default, operations requiring the "user" role are available when unauthenticated.
-# Disabling this option will enforce authorization for these operations.
-# Warning: This causes clients that do not support authentication to break.
-#
-#org.openhab.restauth:implicitUserRole=false
-
-
diff --git a/intern/docker_openhab/templates/conf/things/astro.things b/intern/docker_openhab/templates/conf/things/astro.things
deleted file mode 100644
index 6fe2943d165530e26aa899e3006b0b0a7612b1fe..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/things/astro.things
+++ /dev/null
@@ -1,2 +0,0 @@
-
-astro:sun:home [ geolocation="51.944514, 7.638933", interval=60 ]
diff --git a/intern/docker_openhab/templates/conf/things/mqtt.things b/intern/docker_openhab/templates/conf/things/mqtt.things
deleted file mode 100644
index 9e95a6606f313e47f9e98913a4adce316b4c6380..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/things/mqtt.things
+++ /dev/null
@@ -1,53 +0,0 @@
-
-Bridge mqtt:broker:mosquitto [ host="{{ int_ip4 }}", secure=false, enableDiscovery=false, qos=1, retain=true, async=false ]
-{
-
- Thing topic werkstattlicht "Werkstatt Licht (dali)" {
- Channels:
- Type number : level "Werkstatt Licht (dali)" [ stateTopic="light/dali", commandTopic="light/dali", postCommand=true, min=0, max=255 ]
- }
-
-{% for device in esphome_devices %}
-
- Thing topic {{ device.id }} "Sensor {{ device.name }}" {
-
- {% if device.sensors is defined %}
- Channels:
-
- {% for sensor in device.sensors %}
-
- {% if sensor == "Temp" or sensor == "HeizungVorlauf" or sensor == "HeizungRuecklauf" or sensor == "Kuehlschrank-Temp" %}
-
- Type number : {{ sensor | replace("-","") | lower }} "Sensor {{ device.name }} {{ sensor }}" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor | lower }}/state" ]
-
- {% elif sensor == "pressure" %}
-
- Type number : {{ sensor }} "Sensor {{ device.name }} Pressure" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor }}/state" ]
-
- {% elif sensor == "humidity" %}
-
- Type number : {{ sensor }} "Sensor {{ device.name }} Humidity" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor }}/state" ]
-
- {% elif sensor == "feinstaub_2_5" %}
-
- Type number : {{ sensor }} "Sensor {{ device.name }} 2.5 PM" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor }}/state" ]
-
- {% elif sensor == "stromverbrauch" %}
-
- Type number : {{ sensor }} "Sensor {{ device.name }} kW" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor }}/state" ]
-
- {% elif sensor == "Kuehlschrank-Door" or sensor == "warpzone_status" %}
-
- Type switch : {{ sensor | replace("-","") | lower }} "Sensor {{ device.name }} {{ sensor }}" [ stateTopic="ESPHome/esphome_{{ device.id }}/binary_sensor/{{ sensor | lower }}/state", on="ON", off="OFF" ]
-
- {% endif %}
-
- {% endfor %}
- {% endif %}
-
- }
-
-{% endfor %}
-
-}
-
diff --git a/intern/docker_openhab/templates/conf/things/network.things b/intern/docker_openhab/templates/conf/things/network.things
deleted file mode 100644
index 004ecc5d3c0c9bb0798340466f641593be64dd8b..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/things/network.things
+++ /dev/null
@@ -1,5 +0,0 @@
-
-// Netzwerk Geräte
-
-network:pingdevice:switch01 [ hostname="TL-SG3428XMP", retry=3, timeout=5000, refreshInterval=10000, uses_arp_ping="no" ]
-network:pingdevice:switch02 [ hostname="TL-SG3452X", retry=3, timeout=5000, refreshInterval=10000, uses_arp_ping="no" ]
diff --git a/intern/docker_openhab/templates/conf/things/weather.things b/intern/docker_openhab/templates/conf/things/weather.things
deleted file mode 100644
index eaeb322a10d92996bff7d31d45afc95475f4d4ef..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/things/weather.things
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Bridge openweathermap:weather-api:api "OpenWeatherMap" [apikey="{{ openweathermap_apikey }}", refreshInterval=15, language="de"] {
- Thing weather-and-forecast local "Local Weather And Forecast" [location="51.944514, 7.638933", forecastHours=0, forecastDays=7]
-}
-
-
diff --git a/intern/docker_openhab/templates/conf/things/wled.things b/intern/docker_openhab/templates/conf/things/wled.things
deleted file mode 100644
index f5dd16c4ed6b881029033f5cb1116e8200e1e866..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/conf/things/wled.things
+++ /dev/null
@@ -1,8 +0,0 @@
-
-{% for device in wled_devices %}
-
-wled:wled:{{ device.id }} "WLed {{ device.id }}" [address="http://wled-{{ device.id }}"]
-
-{% endfor %}
-
-
diff --git a/intern/docker_openhab/templates/docker-compose.yml b/intern/docker_openhab/templates/docker-compose.yml
deleted file mode 100644
index 375ab9aa3de096150d8748a09948a56adf6a6d57..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/docker-compose.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-version: "3"
-
-services:
-
- app:
-
- image: openhab/openhab:3.3.0-debian
- restart: always
- # The command node is very important. It overrides
- # the "gosu openhab tini -s ./start.sh" command from Dockerfile and runs as root!
- command: "tini -s ./start.sh server"
- volumes:
- - "/boot/cmdline.txt:/boot/cmdline.txt:ro"
- - "/etc/localtime:/etc/localtime:ro"
- - "/etc/timezone:/etc/timezone:ro"
- - "{{ basedir }}/addons:/openhab/addons"
- - "{{ basedir }}/conf:/openhab/conf"
- - "{{ basedir }}/userdata:/openhab/userdata"
- environment:
- OPENHAB_HTTP_PORT: 8080
- OPENHAB_HTTPS_PORT: 8443
- EXTRA_JAVA_OPTS: "-Duser.timezone=Europe/Berlin"
- labels:
- - traefik.enable=true
- - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`)
- - traefik.http.routers.{{ servicename }}.entrypoints=websecure
- - traefik.http.services.{{ servicename }}.loadbalancer.server.port=8080
- networks:
- - default
- - web
-
-
- influxdb:
-
- image: influxdb:2.6.0
- restart: always
- ports:
- - {{ int_ip4 }}:{{ influxdb_port }}:8086
- volumes:
- - "{{ basedir }}/influxdb:/var/lib/influxdb2"
- environment:
- DOCKER_INFLUXDB_INIT_MODE: setup
- DOCKER_INFLUXDB_INIT_USERNAME: openhab
- DOCKER_INFLUXDB_INIT_PASSWORD: {{ influxdb_password }}
- DOCKER_INFLUXDB_INIT_ORG: openhab
- DOCKER_INFLUXDB_INIT_BUCKET: openhab
- DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: {{ influxdb_token }}
- networks:
- - default
-
-
-networks:
- web:
- external: true
diff --git a/intern/docker_openhab/templates/logrotate b/intern/docker_openhab/templates/logrotate
deleted file mode 100644
index 422afe0e9f440534dc15cfc7ab34384ab93851b1..0000000000000000000000000000000000000000
--- a/intern/docker_openhab/templates/logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/srv/openhab/userdata/logs/*.log {
- rotate 12
- monthly
- compress
- missingok
- notifempty
-}
diff --git a/site.yml b/site.yml
index 1b0a80e31fd1283cb0ab258b970e89ec49922ac4..ab66e1c244b5dad630f0e2765cc6151597a8d6c2 100644
--- a/site.yml
+++ b/site.yml
@@ -88,13 +88,6 @@
basedir: /srv/nodered,
domain: "nodered.warpzone.lan"
}
- - {
- role: intern/docker_openhab, tags: openhab,
- servicename: openhab,
- basedir: /srv/openhab,
- domain: "openhab.warpzone.lan",
- influxdb_port: 28086
- }
- {
role: intern/docker_omada, tags: omada,
servicename: omada,