From 0283e332441d594ea7f3138ba6decf1aba705825 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <christian.elberfeld@adesso.de>
Date: Sun, 18 Jul 2021 00:34:15 +0200
Subject: [PATCH] update esphome configs
---
common/nginx/includes/unifi.warpone | 4 +++
common/nginx/tasks/main.yml | 34 -------------------
host_vars/warpsrvint | 1 +
site.yml | 33 +++++++-----------
.../templates/config/common.inc.yaml | 2 +-
.../templates/config/hauptraum.yaml | 31 +++++++++++++----
.../templates/config/holzwerkstatt.yaml | 31 +++++++++++++----
.../templates/config/lounge.yaml | 31 +++++++++++++----
.../templates/config/vortragsraum.yaml | 31 +++++++++++++----
.../templates/docker-compose.yml | 3 +-
10 files changed, 121 insertions(+), 80 deletions(-)
create mode 100644 common/nginx/includes/unifi.warpone
diff --git a/common/nginx/includes/unifi.warpone b/common/nginx/includes/unifi.warpone
new file mode 100644
index 00000000..d266449e
--- /dev/null
+++ b/common/nginx/includes/unifi.warpone
@@ -0,0 +1,4 @@
+
+ location / {
+ rewrite ^(.*) https://warpsrvint:8443$1;
+ }
diff --git a/common/nginx/tasks/main.yml b/common/nginx/tasks/main.yml
index dc2c8d18..4afb9d88 100644
--- a/common/nginx/tasks/main.yml
+++ b/common/nginx/tasks/main.yml
@@ -41,43 +41,9 @@
state: absent
-# LetsEncrypt Script erstellen
-- name: LetsEncrypt Script erstellen
- template: src=letsencrypt.sh dest=/opt/letsencrypt.sh mode=o+x
- notify: restart nginx
- when: webserver_ssl == true
-
-
-- name: Cronjob für Zertifikatserneuerung
- cron: name="letsencrypt" weekday="*" hour="6" minute="0" job="/opt/letsencrypt.sh"
- when: webserver_ssl == true
-
-
# nginx konfigurieren
- include: config_site.yml
with_items:
- "{{ webserver_domains }}"
-# matrix config
-- name: Konfig-Datei matrix erstellen
- template: src=nginx-matrix dest=/etc/nginx/sites-enabled/matrix
- notify: restart nginx
- when: inventory_hostname == 'webserver'
-
-- name: Konfig-Datei status erstellen
- template: src=nginx-status dest=/etc/nginx/sites-enabled/status
- notify: restart nginx
-
-
-# telegraf konfigurieren
-- name: Konfig-Datei status erstellen
- template: src=telegraf.conf dest=/etc/telegraf/telegraf.d/nginx.conf
- notify: restart telegraf
-
-- name: adding existing user 'telegraf' to group adm
- user:
- name: telegraf
- groups: adm
- append: yes
-
diff --git a/host_vars/warpsrvint b/host_vars/warpsrvint
index fe244c2a..49e53ec2 100644
--- a/host_vars/warpsrvint
+++ b/host_vars/warpsrvint
@@ -35,6 +35,7 @@ webserver_domains:
- "infra.warpzone"
- "esphome.warpzone"
- "ldap.warpzone"
+ - "unifi.warpzone"
administratorenteam:
- "void"
diff --git a/site.yml b/site.yml
index 8cb7a6f5..a98d8035 100644
--- a/site.yml
+++ b/site.yml
@@ -202,27 +202,20 @@
# Test / Development Server
##################################################
-- hosts: develop
- remote_user: root
- roles:
- - { role: common/docker, tags: docker }
- - { role: common/telegraf, tags: telegraf }
- - { role: common/nginx, tags: nginx }
+# - hosts: develop
+# remote_user: root
+# roles:
+# - { role: common/docker, tags: docker }
+# - { role: common/nginx, tags: nginx }
-- hosts: webserver-test
- remote_user: root
- roles:
- - { role: common/docker, tags: docker }
- - { role: common/nginx, tags: nginx }
-# - { role: ../webserver/docker_ldap, tags: ldap }
- - { role: webserver/docker_wordpress, tags: wordpress }
+# - hosts: webserver-test
+# remote_user: root
+# roles:
+# - { role: common/docker, tags: docker }
+# - { role: common/nginx, tags: nginx }
+# # - { role: ../webserver/docker_ldap, tags: ldap }
+# - { role: webserver/docker_wordpress, tags: wordpress }
+
-# - { role: docker_mail, tags: mail }
-# - { role: ../webserver/docker_jabber, tags: jabber }
-- hosts: warphab
- remote_user: root
- roles:
- - { role: warphab/homegear, tags: homegear }
- - { role: warphab/openhab, tags: openhab }
diff --git a/warpsrvint/docker_esphome/templates/config/common.inc.yaml b/warpsrvint/docker_esphome/templates/config/common.inc.yaml
index e18316a2..42b517c7 100644
--- a/warpsrvint/docker_esphome/templates/config/common.inc.yaml
+++ b/warpsrvint/docker_esphome/templates/config/common.inc.yaml
@@ -1,7 +1,7 @@
# WiFi settings
wifi:
- ssid: "warpzone"
+ ssid: "Internet-of-Shit"
password: "{{ wlan_pass }}"
# Enable fallback hotspot (captive portal) in case wifi connection fails
diff --git a/warpsrvint/docker_esphome/templates/config/hauptraum.yaml b/warpsrvint/docker_esphome/templates/config/hauptraum.yaml
index ec1a4219..eb62f7bb 100644
--- a/warpsrvint/docker_esphome/templates/config/hauptraum.yaml
+++ b/warpsrvint/docker_esphome/templates/config/hauptraum.yaml
@@ -8,14 +8,14 @@
# Sensor configs
i2c:
- sda: D3
- scl: D4
+ sda: D0
+ scl: D5
scan: True
sensor:
- platform: bme280
temperature:
- name: "Temp"
+ name: "Temp_bme280"
oversampling: 16x
filters:
- offset: 0.635
@@ -24,7 +24,7 @@ sensor:
send_every: 3
send_first_at: 3
pressure:
- name: "Pressure"
+ name: "Pressure_bme280"
oversampling: 16x
accuracy_decimals: 2
filters:
@@ -33,7 +33,7 @@ sensor:
send_every: 3
send_first_at: 3
humidity:
- name: "Humidity"
+ name: "Humidity_bme280"
oversampling: 16x
accuracy_decimals: 2
filters:
@@ -44,4 +44,23 @@ sensor:
address: 0x76
update_interval: 10s
iir_filter: 16x
-
\ No newline at end of file
+
+ - platform: bmp280
+ temperature:
+ name: "Temp_bmp280"
+ oversampling: 16x
+ filters:
+ - offset: 0.635
+ - sliding_window_moving_average:
+ window_size: 3
+ send_every: 3
+ send_first_at: 3
+ pressure:
+ name: "Pressure_bmp280"
+ oversampling: 16x
+ accuracy_decimals: 2
+ filters:
+ - sliding_window_moving_average:
+ window_size: 3
+ send_every: 3
+ send_first_at: 3
diff --git a/warpsrvint/docker_esphome/templates/config/holzwerkstatt.yaml b/warpsrvint/docker_esphome/templates/config/holzwerkstatt.yaml
index c4ba9868..114280d5 100644
--- a/warpsrvint/docker_esphome/templates/config/holzwerkstatt.yaml
+++ b/warpsrvint/docker_esphome/templates/config/holzwerkstatt.yaml
@@ -8,14 +8,14 @@
# Sensor configs
i2c:
- sda: D3
- scl: D4
+ sda: D0
+ scl: D5
scan: True
sensor:
- platform: bme280
temperature:
- name: "Temp"
+ name: "Temp_bme280"
oversampling: 16x
filters:
- offset: 0.635
@@ -24,7 +24,7 @@ sensor:
send_every: 3
send_first_at: 3
pressure:
- name: "Pressure"
+ name: "Pressure_bme280"
oversampling: 16x
accuracy_decimals: 2
filters:
@@ -33,7 +33,7 @@ sensor:
send_every: 3
send_first_at: 3
humidity:
- name: "Humidity"
+ name: "Humidity_bme280"
oversampling: 16x
accuracy_decimals: 2
filters:
@@ -44,4 +44,23 @@ sensor:
address: 0x76
update_interval: 10s
iir_filter: 16x
-
\ No newline at end of file
+
+ - platform: bmp280
+ temperature:
+ name: "Temp_bmp280"
+ oversampling: 16x
+ filters:
+ - offset: 0.635
+ - sliding_window_moving_average:
+ window_size: 3
+ send_every: 3
+ send_first_at: 3
+ pressure:
+ name: "Pressure_bmp280"
+ oversampling: 16x
+ accuracy_decimals: 2
+ filters:
+ - sliding_window_moving_average:
+ window_size: 3
+ send_every: 3
+ send_first_at: 3
diff --git a/warpsrvint/docker_esphome/templates/config/lounge.yaml b/warpsrvint/docker_esphome/templates/config/lounge.yaml
index 604688ca..ecfebe08 100644
--- a/warpsrvint/docker_esphome/templates/config/lounge.yaml
+++ b/warpsrvint/docker_esphome/templates/config/lounge.yaml
@@ -8,14 +8,14 @@
# Sensor configs
i2c:
- sda: D3
- scl: D4
+ sda: D0
+ scl: D5
scan: True
sensor:
- platform: bme280
temperature:
- name: "Temp"
+ name: "Temp_bme280"
oversampling: 16x
filters:
- offset: 0.635
@@ -24,7 +24,7 @@ sensor:
send_every: 3
send_first_at: 3
pressure:
- name: "Pressure"
+ name: "Pressure_bme280"
oversampling: 16x
accuracy_decimals: 2
filters:
@@ -33,7 +33,7 @@ sensor:
send_every: 3
send_first_at: 3
humidity:
- name: "Humidity"
+ name: "Humidity_bme280"
oversampling: 16x
accuracy_decimals: 2
filters:
@@ -44,4 +44,23 @@ sensor:
address: 0x76
update_interval: 10s
iir_filter: 16x
-
\ No newline at end of file
+
+ - platform: bmp280
+ temperature:
+ name: "Temp_bmp280"
+ oversampling: 16x
+ filters:
+ - offset: 0.635
+ - sliding_window_moving_average:
+ window_size: 3
+ send_every: 3
+ send_first_at: 3
+ pressure:
+ name: "Pressure_bmp280"
+ oversampling: 16x
+ accuracy_decimals: 2
+ filters:
+ - sliding_window_moving_average:
+ window_size: 3
+ send_every: 3
+ send_first_at: 3
diff --git a/warpsrvint/docker_esphome/templates/config/vortragsraum.yaml b/warpsrvint/docker_esphome/templates/config/vortragsraum.yaml
index e19bf4bd..429a58d8 100644
--- a/warpsrvint/docker_esphome/templates/config/vortragsraum.yaml
+++ b/warpsrvint/docker_esphome/templates/config/vortragsraum.yaml
@@ -8,14 +8,14 @@
# Sensor configs
i2c:
- sda: D3
- scl: D4
+ sda: D0
+ scl: D5
scan: True
sensor:
- platform: bme280
temperature:
- name: "Temp"
+ name: "Temp_bme280"
oversampling: 16x
filters:
- offset: 0.635
@@ -24,7 +24,7 @@ sensor:
send_every: 3
send_first_at: 3
pressure:
- name: "Pressure"
+ name: "Pressure_bme280"
oversampling: 16x
accuracy_decimals: 2
filters:
@@ -33,7 +33,7 @@ sensor:
send_every: 3
send_first_at: 3
humidity:
- name: "Humidity"
+ name: "Humidity_bme280"
oversampling: 16x
accuracy_decimals: 2
filters:
@@ -44,4 +44,23 @@ sensor:
address: 0x76
update_interval: 10s
iir_filter: 16x
-
\ No newline at end of file
+
+ - platform: bmp280
+ temperature:
+ name: "Temp_bmp280"
+ oversampling: 16x
+ filters:
+ - offset: 0.635
+ - sliding_window_moving_average:
+ window_size: 3
+ send_every: 3
+ send_first_at: 3
+ pressure:
+ name: "Pressure_bmp280"
+ oversampling: 16x
+ accuracy_decimals: 2
+ filters:
+ - sliding_window_moving_average:
+ window_size: 3
+ send_every: 3
+ send_first_at: 3
diff --git a/warpsrvint/docker_esphome/templates/docker-compose.yml b/warpsrvint/docker_esphome/templates/docker-compose.yml
index b9f71249..d43da733 100644
--- a/warpsrvint/docker_esphome/templates/docker-compose.yml
+++ b/warpsrvint/docker_esphome/templates/docker-compose.yml
@@ -6,6 +6,7 @@ services:
image: esphome/esphome:1.19.0
restart: always
- network_mode: "host"
+ # listen on Port 6052
+ network_mode: host
volumes:
- "{{ basedir }}/config/:/config"
--
GitLab