Neuer Server ogg für interne Dienste, alter Server warpsrvint raus

host_vars/warpsrvint → host_vars/ogg

@@ -2,13 +2,14 @@
 # Host spezifische Variablen
 
 motd_lines:
-  - "Interner Server @ warpzone"
-  - "Haupt-IP @ eth1: {{ansible_eth1.ipv4.address}}"
+  - "Ogg - Interne Services @ warpzone"
+  - "Haupt-IP @ eth0: {{ansible_eth0.ipv4.address}}"
 
 debian_sources:
-  - "deb http://ftp2.de.debian.org/debian/ buster main contrib non-free"
-  - "deb http://security.debian.org/ buster/updates main contrib non-free"
-  - "deb https://download.docker.com/linux/debian buster stable"
+  - "deb http://ftp2.de.debian.org/debian/ bullseye main contrib non-free"
+  - "deb http://ftp.debian.org/debian bullseye-updates main contrib non-free"
+  - "deb http://security.debian.org/ bullseye-security main contrib non-free"
+  - "deb https://download.docker.com/linux/debian bullseye stable"
 
 debian_keys_id:
 
@@ -22,17 +23,15 @@ debian_keys_url:
 int_ip4: 192.168.0.201
 
 
-# Art des Hosts: physical, vm, docker
-host_type: "physical"
+# Art des Hosts: physical, vm, lxc
+host_type: "lxc"
 
 # SSL deaktivieren
 webserver_ssl: false
 
 # Liste der gehosteten Domänen
 webserver_domains:
-  - "infra.warpzone"
   - "esphome.warpzone"
-  - "ldap.warpzone"
   - "unifi.warpzone"
 
 administratorenteam:
@@ -51,25 +50,15 @@ alert:
     crit: 4
   containers:
     - { name: "dockerstats_app_1" }    
-    - { name: "grafana_app_1" }
-    - { name: "l4z0r_db_1" }
-    - { name: "ldap_openldap_1" }
-    - { name: "ldap_phpldapadmin_1" }
-    - { name: "ldap_syncreplexporter_1" }
-    - { name: "matestatdb_db_1" }
-    - { name: "mqtt-service" } 
-    - { name: "nodered-app" }
+    - { name: "mqtt_app_1" } 
+    - { name: "mqtt_influxdb_1" } 
+    - { name: "mqtt_telegraf_1" } 
+    - { name: "nodered_app_1" }
     - { name: "unifi_app_1" }
-    - { name: "warpinfra-db" }
-    - { name: "warpinfra-app" }
   disks:
     - { mountpoint: "/", warn: "5 GB", crit: "1 GB" }
-
-
-# SAMBA Freigaben 
-samba_shares_public:
-  - { name: Projekte, path: /shares/projekte }
-  - { name: Temp, path: /shares/temp }
+    - { mountpoint: "/srv", warn: "5 GB", crit: "1 GB" }
+    - { mountpoint: "/var/lib/docker", warn: "5 GB", crit: "1 GB" }
 
 
 # Definition von Borgbackup Repositories
@@ -78,7 +67,7 @@ borgbackup_repos:
   borgbase:
 
     # URL des Repos
-    repo: "u127404b@u127404b.repo.borgbase.com:repo"
+    repo: "juxt0t1v@juxt0t1v.repo.borgbase.com:repo"
 
     # Repo-spezifische Optionen zum Aufruf von Borgbackup
     # z.B. bei Sicherungen zu rsync.net ist --remote-path=borg1 erforderlich
@@ -112,14 +101,6 @@ borgbackup_directories:
   - "/srv/"
 
 
-borgbackup_user:
-
-  warpzone:
-
-     sshkeys:
-       - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIENYus4S4XOaGHVL4B6vbnIrovtqaCT1lbEF73StiTt+ root@webserver"
-       - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGIBBvcQaD0MmEHY0q+lcoMN9sXHs/HnSiXGsAhm+Vwp root@vorstand"
-
 wled_devices:
   - { id: "loungedecke",      groups: "gLounge" }
   - { id: "theke",            groups: "gKueche" }

hosts

@@ -9,12 +9,16 @@
 # https://wiki.warpzone.ms/intern:warpzone_internal_it_infrastructure#host_fuer_interne_dienste_watchguard_xtm_505
 # Für Verbindungen über den Webserver als Jumphost folgende Parameter ergänzen: 
 # ansible_ssh_common_args='-o ForwardAgent=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand="ssh -W %h:%p -q 159.69.57.51"'
-warpsrvint   ansible_ssh_host=192.168.0.201
 
 # Interner Proxmox-Server (neu ab 09-2022) 
 weatherwax   ansible_ssh_host=192.168.0.200
 
+# Server für interne Dienste (neu ab 09-2022)
+# Container auf dem internen Proxmox Server 
+# Wichtige Optionen: Nesting = Yes, keyctl = enabled
+ogg          ansible_ssh_host=192.168.0.201
 
+# Externe Server Warpzone
 # Öffentlicher Root Server Warpzone bei Hetzner 
 tiffany     ansible_ssh_host=159.69.57.15
 

warpsrvint/docker_esphome/templates/config/esphome_alarm.yaml → intern/docker_esphome/templates/config/esphome_alarm.yaml

-{% set devicename = "esphome_strommesser"  %}
+{% set devicename = "esphome_alarm"  %}
 
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.d1_mini.inc.yaml" %}

warpsrvint/docker_esphome/templates/config/esphome_luftfilter01.yaml → intern/docker_esphome/templates/config/esphome_luftfilter01.yaml

@@ -56,5 +56,3 @@ fan:
    id: fan_internal
    name: "Luftfilter01"
    speed_count: 3
-   speed_command_topic: "ESPHome/esphome_luftfilter01/fan/luftfilter01/speed/command"
-   command_topic: "ESPHome/esphome_luftfilter01/fan/luftfilter01/speed/on-off"
\ No newline at end of file