From dcb4443e7f06ee012512c5535958205c902c919f Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Wed, 2 Nov 2022 23:55:07 +0100
Subject: [PATCH] =?UTF-8?q?Neuer=20Server=20ogg=20f=C3=BCr=20interne=20Die?=
=?UTF-8?q?nste,=20alter=20Server=20warpsrvint=20raus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
host_vars/{warpsrvint => ogg} | 49 ++-----
hosts | 6 +-
.../docker_esphome/files/config/04B03.ttf | Bin
.../docker_esphome/tasks/main.yml | 0
.../docker_esphome/templates/compile.sh | 0
.../templates/config/esphome_alarm.yaml | 2 +-
.../templates/config/esphome_dach.yaml | 0
.../templates/config/esphome_display01.yaml | 0
.../templates/config/esphome_display02.yaml | 0
.../templates/config/esphome_feinstaub01.yaml | 0
.../templates/config/esphome_hauptraum.yaml | 0
.../config/esphome_holzwerkstatt.yaml | 0
.../templates/config/esphome_kamin.yaml | 0
.../config/esphome_kuehlschrank.yaml | 0
.../templates/config/esphome_lounge.yaml | 0
.../config/esphome_luftfilter01.yaml | 2 -
.../templates/config/esphome_strommesser.yaml | 0
.../config/esphome_vortragsraum.yaml | 0
.../templates/docker-compose.yml | 0
.../templates/includes/ansible.inc.yaml | 0
.../templates/includes/board.d1_mini.inc.yaml | 0
.../templates/includes/common.inc.yaml | 0
intern/docker_heimdall/tasks/main.yml | 21 +++
.../templates/docker-compose.yml | 16 ++
.../docker_mqtt/tasks/main.yml | 0
.../docker_mqtt/templates/docker-compose.yml | 0
.../docker_mqtt/templates/telegraf.conf | 0
.../docker_nodered/tasks/main.yml | 2 -
.../templates/docker-compose.yml | 5 +-
.../docker_openhab/tasks/main.yml | 0
.../templates/conf/items/groups.items | 0
.../templates/conf/items/mqtt.items | 0
.../templates/conf/items/network.items | 0
.../templates/conf/items/other.items | 0
.../templates/conf/items/weather.items | 0
.../templates/conf/items/wled.items | 0
.../conf/persistence/influxdb.persist | 0
.../templates/conf/persistence/rrd4j.persist | 0
.../templates/conf/rules/zonestatus.rules | 0
.../templates/conf/services/addons.cfg | 0
.../templates/conf/services/influxdb.cfg | 0
.../templates/conf/services/mqtt.cfg | 0
.../templates/conf/services/network.cfg | 0
.../templates/conf/services/runtime.cfg | 0
.../templates/conf/things/astro.things | 0
.../templates/conf/things/mqtt.things | 0
.../templates/conf/things/network.things | 0
.../templates/conf/things/weather.things | 0
.../templates/conf/things/wled.things | 0
.../templates/docker-compose.yml | 0
.../docker_openhab/templates/logrotate | 0
.../docker_unifi/tasks/main.yml | 0
.../docker_unifi/templates/docker-compose.yml | 0
site.yml | 61 ++------
warpsrvint/docker_grafana/tasks/main.yml | 38 -----
.../templates/docker-compose.yml | 18 ---
.../docker_grafana/templates/grafana.ini | 137 ------------------
warpsrvint/docker_grafana/templates/ldap.toml | 59 --------
warpsrvint/docker_l4z0r/tasks/main.yml | 28 ----
.../docker_l4z0r/templates/docker-compose.yml | 19 ---
warpsrvint/docker_matestatdb/tasks/main.yml | 23 ---
.../templates/docker-compose.yml | 18 ---
warpsrvint/docker_mete/tasks/main.yml | 34 -----
warpsrvint/docker_mete/templates/database.yml | 9 --
.../docker_mete/templates/docker-compose.yml | 36 -----
warpsrvint/docker_warpinfra/tasks/main.yml | 118 ---------------
.../docker_warpinfra/templates/config.ini | 51 -------
warpsrvint/samba/tasks/main.yml | 40 -----
warpsrvint/samba/templates/smb.conf | 31 ----
69 files changed, 71 insertions(+), 752 deletions(-)
rename host_vars/{warpsrvint => ogg} (63%)
rename {warpsrvint => intern}/docker_esphome/files/config/04B03.ttf (100%)
rename {warpsrvint => intern}/docker_esphome/tasks/main.yml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/compile.sh (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_alarm.yaml (95%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_dach.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_display01.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_display02.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_feinstaub01.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_hauptraum.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_holzwerkstatt.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_kamin.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_kuehlschrank.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_lounge.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_luftfilter01.yaml (90%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_strommesser.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/config/esphome_vortragsraum.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/docker-compose.yml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/includes/ansible.inc.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/includes/board.d1_mini.inc.yaml (100%)
rename {warpsrvint => intern}/docker_esphome/templates/includes/common.inc.yaml (100%)
create mode 100644 intern/docker_heimdall/tasks/main.yml
create mode 100644 intern/docker_heimdall/templates/docker-compose.yml
rename {warpsrvint => intern}/docker_mqtt/tasks/main.yml (100%)
rename {warpsrvint => intern}/docker_mqtt/templates/docker-compose.yml (100%)
rename {warpsrvint => intern}/docker_mqtt/templates/telegraf.conf (100%)
rename {warpsrvint => intern}/docker_nodered/tasks/main.yml (92%)
rename {warpsrvint => intern}/docker_nodered/templates/docker-compose.yml (94%)
rename {warpsrvint => intern}/docker_openhab/tasks/main.yml (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/items/groups.items (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/items/mqtt.items (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/items/network.items (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/items/other.items (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/items/weather.items (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/items/wled.items (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/persistence/influxdb.persist (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/persistence/rrd4j.persist (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/rules/zonestatus.rules (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/services/addons.cfg (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/services/influxdb.cfg (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/services/mqtt.cfg (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/services/network.cfg (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/services/runtime.cfg (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/things/astro.things (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/things/mqtt.things (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/things/network.things (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/things/weather.things (100%)
rename {warpsrvint => intern}/docker_openhab/templates/conf/things/wled.things (100%)
rename {warpsrvint => intern}/docker_openhab/templates/docker-compose.yml (100%)
rename {warpsrvint => intern}/docker_openhab/templates/logrotate (100%)
rename {warpsrvint => intern}/docker_unifi/tasks/main.yml (100%)
rename {warpsrvint => intern}/docker_unifi/templates/docker-compose.yml (100%)
delete mode 100644 warpsrvint/docker_grafana/tasks/main.yml
delete mode 100644 warpsrvint/docker_grafana/templates/docker-compose.yml
delete mode 100644 warpsrvint/docker_grafana/templates/grafana.ini
delete mode 100644 warpsrvint/docker_grafana/templates/ldap.toml
delete mode 100644 warpsrvint/docker_l4z0r/tasks/main.yml
delete mode 100644 warpsrvint/docker_l4z0r/templates/docker-compose.yml
delete mode 100644 warpsrvint/docker_matestatdb/tasks/main.yml
delete mode 100644 warpsrvint/docker_matestatdb/templates/docker-compose.yml
delete mode 100644 warpsrvint/docker_mete/tasks/main.yml
delete mode 100644 warpsrvint/docker_mete/templates/database.yml
delete mode 100644 warpsrvint/docker_mete/templates/docker-compose.yml
delete mode 100644 warpsrvint/docker_warpinfra/tasks/main.yml
delete mode 100644 warpsrvint/docker_warpinfra/templates/config.ini
delete mode 100644 warpsrvint/samba/tasks/main.yml
delete mode 100644 warpsrvint/samba/templates/smb.conf
diff --git a/host_vars/warpsrvint b/host_vars/ogg
similarity index 63%
rename from host_vars/warpsrvint
rename to host_vars/ogg
index 544cacfb..b432b226 100644
--- a/host_vars/warpsrvint
+++ b/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" }
diff --git a/hosts b/hosts
index 7fbddf89..d5bec054 100644
--- a/hosts
+++ b/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
diff --git a/warpsrvint/docker_esphome/files/config/04B03.ttf b/intern/docker_esphome/files/config/04B03.ttf
similarity index 100%
rename from warpsrvint/docker_esphome/files/config/04B03.ttf
rename to intern/docker_esphome/files/config/04B03.ttf
diff --git a/warpsrvint/docker_esphome/tasks/main.yml b/intern/docker_esphome/tasks/main.yml
similarity index 100%
rename from warpsrvint/docker_esphome/tasks/main.yml
rename to intern/docker_esphome/tasks/main.yml
diff --git a/warpsrvint/docker_esphome/templates/compile.sh b/intern/docker_esphome/templates/compile.sh
similarity index 100%
rename from warpsrvint/docker_esphome/templates/compile.sh
rename to intern/docker_esphome/templates/compile.sh
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_alarm.yaml b/intern/docker_esphome/templates/config/esphome_alarm.yaml
similarity index 95%
rename from warpsrvint/docker_esphome/templates/config/esphome_alarm.yaml
rename to intern/docker_esphome/templates/config/esphome_alarm.yaml
index 58b5f213..98699472 100644
--- a/warpsrvint/docker_esphome/templates/config/esphome_alarm.yaml
+++ b/intern/docker_esphome/templates/config/esphome_alarm.yaml
@@ -1,4 +1,4 @@
-{% set devicename = "esphome_strommesser" %}
+{% set devicename = "esphome_alarm" %}
{% include "/includes/ansible.inc.yaml" %}
{% include "/includes/board.d1_mini.inc.yaml" %}
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_dach.yaml b/intern/docker_esphome/templates/config/esphome_dach.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_dach.yaml
rename to intern/docker_esphome/templates/config/esphome_dach.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_display01.yaml b/intern/docker_esphome/templates/config/esphome_display01.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_display01.yaml
rename to intern/docker_esphome/templates/config/esphome_display01.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_display02.yaml b/intern/docker_esphome/templates/config/esphome_display02.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_display02.yaml
rename to intern/docker_esphome/templates/config/esphome_display02.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_feinstaub01.yaml b/intern/docker_esphome/templates/config/esphome_feinstaub01.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_feinstaub01.yaml
rename to intern/docker_esphome/templates/config/esphome_feinstaub01.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_hauptraum.yaml b/intern/docker_esphome/templates/config/esphome_hauptraum.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_hauptraum.yaml
rename to intern/docker_esphome/templates/config/esphome_hauptraum.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_holzwerkstatt.yaml b/intern/docker_esphome/templates/config/esphome_holzwerkstatt.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_holzwerkstatt.yaml
rename to intern/docker_esphome/templates/config/esphome_holzwerkstatt.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_kamin.yaml b/intern/docker_esphome/templates/config/esphome_kamin.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_kamin.yaml
rename to intern/docker_esphome/templates/config/esphome_kamin.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_kuehlschrank.yaml b/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_kuehlschrank.yaml
rename to intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_lounge.yaml b/intern/docker_esphome/templates/config/esphome_lounge.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_lounge.yaml
rename to intern/docker_esphome/templates/config/esphome_lounge.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_luftfilter01.yaml b/intern/docker_esphome/templates/config/esphome_luftfilter01.yaml
similarity index 90%
rename from warpsrvint/docker_esphome/templates/config/esphome_luftfilter01.yaml
rename to intern/docker_esphome/templates/config/esphome_luftfilter01.yaml
index dffe6ca9..2e36d1b4 100644
--- a/warpsrvint/docker_esphome/templates/config/esphome_luftfilter01.yaml
+++ b/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
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_strommesser.yaml b/intern/docker_esphome/templates/config/esphome_strommesser.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_strommesser.yaml
rename to intern/docker_esphome/templates/config/esphome_strommesser.yaml
diff --git a/warpsrvint/docker_esphome/templates/config/esphome_vortragsraum.yaml b/intern/docker_esphome/templates/config/esphome_vortragsraum.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/config/esphome_vortragsraum.yaml
rename to intern/docker_esphome/templates/config/esphome_vortragsraum.yaml
diff --git a/warpsrvint/docker_esphome/templates/docker-compose.yml b/intern/docker_esphome/templates/docker-compose.yml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/docker-compose.yml
rename to intern/docker_esphome/templates/docker-compose.yml
diff --git a/warpsrvint/docker_esphome/templates/includes/ansible.inc.yaml b/intern/docker_esphome/templates/includes/ansible.inc.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/includes/ansible.inc.yaml
rename to intern/docker_esphome/templates/includes/ansible.inc.yaml
diff --git a/warpsrvint/docker_esphome/templates/includes/board.d1_mini.inc.yaml b/intern/docker_esphome/templates/includes/board.d1_mini.inc.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/includes/board.d1_mini.inc.yaml
rename to intern/docker_esphome/templates/includes/board.d1_mini.inc.yaml
diff --git a/warpsrvint/docker_esphome/templates/includes/common.inc.yaml b/intern/docker_esphome/templates/includes/common.inc.yaml
similarity index 100%
rename from warpsrvint/docker_esphome/templates/includes/common.inc.yaml
rename to intern/docker_esphome/templates/includes/common.inc.yaml
diff --git a/intern/docker_heimdall/tasks/main.yml b/intern/docker_heimdall/tasks/main.yml
new file mode 100644
index 00000000..45a8fbf7
--- /dev/null
+++ b/intern/docker_heimdall/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+- name: create folder struct for {{ servicename }}
+ ansible.builtin.file:
+ path: "{{ item }}"
+ state: "directory"
+ recurse: yes
+ with_items:
+ - "{{ basedir }}/config"
+
+- name: copy config files for {{ servicename }}
+ ansible.builtin.template:
+ src: "{{ item }}"
+ dest: "{{ basedir }}/{{ item }}"
+ mode: '0755'
+ with_items:
+ - docker-compose.yml
+
+- name: start {{ servicename }}
+ community.docker.docker_compose:
+ state: present
+ project_src: "{{ basedir }}"
diff --git a/intern/docker_heimdall/templates/docker-compose.yml b/intern/docker_heimdall/templates/docker-compose.yml
new file mode 100644
index 00000000..bb154553
--- /dev/null
+++ b/intern/docker_heimdall/templates/docker-compose.yml
@@ -0,0 +1,16 @@
+---
+version: "2.1"
+
+services:
+
+ app:
+ image: lscr.io/linuxserver/heimdall:2.4.13
+ restart: always
+ environment:
+ - PUID=1000
+ - PGID=1000
+ - TZ=Europe/Berlin
+ volumes:
+ - "{{ basedir }}/config:/config"
+ ports:
+ - 80:80
diff --git a/warpsrvint/docker_mqtt/tasks/main.yml b/intern/docker_mqtt/tasks/main.yml
similarity index 100%
rename from warpsrvint/docker_mqtt/tasks/main.yml
rename to intern/docker_mqtt/tasks/main.yml
diff --git a/warpsrvint/docker_mqtt/templates/docker-compose.yml b/intern/docker_mqtt/templates/docker-compose.yml
similarity index 100%
rename from warpsrvint/docker_mqtt/templates/docker-compose.yml
rename to intern/docker_mqtt/templates/docker-compose.yml
diff --git a/warpsrvint/docker_mqtt/templates/telegraf.conf b/intern/docker_mqtt/templates/telegraf.conf
similarity index 100%
rename from warpsrvint/docker_mqtt/templates/telegraf.conf
rename to intern/docker_mqtt/templates/telegraf.conf
diff --git a/warpsrvint/docker_nodered/tasks/main.yml b/intern/docker_nodered/tasks/main.yml
similarity index 92%
rename from warpsrvint/docker_nodered/tasks/main.yml
rename to intern/docker_nodered/tasks/main.yml
index 4b423d0a..6e15dd41 100644
--- a/warpsrvint/docker_nodered/tasks/main.yml
+++ b/intern/docker_nodered/tasks/main.yml
@@ -3,8 +3,6 @@
ansible.builtin.file:
path: "/srv/nodered/data/"
state: "directory"
- owner: fnord
- group: users
recurse: yes
- name: copy docker-compose file
diff --git a/warpsrvint/docker_nodered/templates/docker-compose.yml b/intern/docker_nodered/templates/docker-compose.yml
similarity index 94%
rename from warpsrvint/docker_nodered/templates/docker-compose.yml
rename to intern/docker_nodered/templates/docker-compose.yml
index 849a080c..06c1f56e 100644
--- a/warpsrvint/docker_nodered/templates/docker-compose.yml
+++ b/intern/docker_nodered/templates/docker-compose.yml
@@ -7,10 +7,11 @@
version: "3"
services:
- node-red:
+
+ app:
image: nodered/node-red:1.3.5
environment:
- - TZ=Europe/Amsterdam
+ - TZ=Europe/Berlin
ports:
- "1880:1880"
networks:
diff --git a/warpsrvint/docker_openhab/tasks/main.yml b/intern/docker_openhab/tasks/main.yml
similarity index 100%
rename from warpsrvint/docker_openhab/tasks/main.yml
rename to intern/docker_openhab/tasks/main.yml
diff --git a/warpsrvint/docker_openhab/templates/conf/items/groups.items b/intern/docker_openhab/templates/conf/items/groups.items
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/items/groups.items
rename to intern/docker_openhab/templates/conf/items/groups.items
diff --git a/warpsrvint/docker_openhab/templates/conf/items/mqtt.items b/intern/docker_openhab/templates/conf/items/mqtt.items
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/items/mqtt.items
rename to intern/docker_openhab/templates/conf/items/mqtt.items
diff --git a/warpsrvint/docker_openhab/templates/conf/items/network.items b/intern/docker_openhab/templates/conf/items/network.items
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/items/network.items
rename to intern/docker_openhab/templates/conf/items/network.items
diff --git a/warpsrvint/docker_openhab/templates/conf/items/other.items b/intern/docker_openhab/templates/conf/items/other.items
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/items/other.items
rename to intern/docker_openhab/templates/conf/items/other.items
diff --git a/warpsrvint/docker_openhab/templates/conf/items/weather.items b/intern/docker_openhab/templates/conf/items/weather.items
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/items/weather.items
rename to intern/docker_openhab/templates/conf/items/weather.items
diff --git a/warpsrvint/docker_openhab/templates/conf/items/wled.items b/intern/docker_openhab/templates/conf/items/wled.items
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/items/wled.items
rename to intern/docker_openhab/templates/conf/items/wled.items
diff --git a/warpsrvint/docker_openhab/templates/conf/persistence/influxdb.persist b/intern/docker_openhab/templates/conf/persistence/influxdb.persist
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/persistence/influxdb.persist
rename to intern/docker_openhab/templates/conf/persistence/influxdb.persist
diff --git a/warpsrvint/docker_openhab/templates/conf/persistence/rrd4j.persist b/intern/docker_openhab/templates/conf/persistence/rrd4j.persist
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/persistence/rrd4j.persist
rename to intern/docker_openhab/templates/conf/persistence/rrd4j.persist
diff --git a/warpsrvint/docker_openhab/templates/conf/rules/zonestatus.rules b/intern/docker_openhab/templates/conf/rules/zonestatus.rules
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/rules/zonestatus.rules
rename to intern/docker_openhab/templates/conf/rules/zonestatus.rules
diff --git a/warpsrvint/docker_openhab/templates/conf/services/addons.cfg b/intern/docker_openhab/templates/conf/services/addons.cfg
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/services/addons.cfg
rename to intern/docker_openhab/templates/conf/services/addons.cfg
diff --git a/warpsrvint/docker_openhab/templates/conf/services/influxdb.cfg b/intern/docker_openhab/templates/conf/services/influxdb.cfg
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/services/influxdb.cfg
rename to intern/docker_openhab/templates/conf/services/influxdb.cfg
diff --git a/warpsrvint/docker_openhab/templates/conf/services/mqtt.cfg b/intern/docker_openhab/templates/conf/services/mqtt.cfg
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/services/mqtt.cfg
rename to intern/docker_openhab/templates/conf/services/mqtt.cfg
diff --git a/warpsrvint/docker_openhab/templates/conf/services/network.cfg b/intern/docker_openhab/templates/conf/services/network.cfg
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/services/network.cfg
rename to intern/docker_openhab/templates/conf/services/network.cfg
diff --git a/warpsrvint/docker_openhab/templates/conf/services/runtime.cfg b/intern/docker_openhab/templates/conf/services/runtime.cfg
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/services/runtime.cfg
rename to intern/docker_openhab/templates/conf/services/runtime.cfg
diff --git a/warpsrvint/docker_openhab/templates/conf/things/astro.things b/intern/docker_openhab/templates/conf/things/astro.things
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/things/astro.things
rename to intern/docker_openhab/templates/conf/things/astro.things
diff --git a/warpsrvint/docker_openhab/templates/conf/things/mqtt.things b/intern/docker_openhab/templates/conf/things/mqtt.things
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/things/mqtt.things
rename to intern/docker_openhab/templates/conf/things/mqtt.things
diff --git a/warpsrvint/docker_openhab/templates/conf/things/network.things b/intern/docker_openhab/templates/conf/things/network.things
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/things/network.things
rename to intern/docker_openhab/templates/conf/things/network.things
diff --git a/warpsrvint/docker_openhab/templates/conf/things/weather.things b/intern/docker_openhab/templates/conf/things/weather.things
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/things/weather.things
rename to intern/docker_openhab/templates/conf/things/weather.things
diff --git a/warpsrvint/docker_openhab/templates/conf/things/wled.things b/intern/docker_openhab/templates/conf/things/wled.things
similarity index 100%
rename from warpsrvint/docker_openhab/templates/conf/things/wled.things
rename to intern/docker_openhab/templates/conf/things/wled.things
diff --git a/warpsrvint/docker_openhab/templates/docker-compose.yml b/intern/docker_openhab/templates/docker-compose.yml
similarity index 100%
rename from warpsrvint/docker_openhab/templates/docker-compose.yml
rename to intern/docker_openhab/templates/docker-compose.yml
diff --git a/warpsrvint/docker_openhab/templates/logrotate b/intern/docker_openhab/templates/logrotate
similarity index 100%
rename from warpsrvint/docker_openhab/templates/logrotate
rename to intern/docker_openhab/templates/logrotate
diff --git a/warpsrvint/docker_unifi/tasks/main.yml b/intern/docker_unifi/tasks/main.yml
similarity index 100%
rename from warpsrvint/docker_unifi/tasks/main.yml
rename to intern/docker_unifi/tasks/main.yml
diff --git a/warpsrvint/docker_unifi/templates/docker-compose.yml b/intern/docker_unifi/templates/docker-compose.yml
similarity index 100%
rename from warpsrvint/docker_unifi/templates/docker-compose.yml
rename to intern/docker_unifi/templates/docker-compose.yml
diff --git a/site.yml b/site.yml
index 8ddce07d..73aff2fa 100644
--- a/site.yml
+++ b/site.yml
@@ -22,25 +22,6 @@
- { role: common/cronapt, tags: cronapt }
-- hosts: octoprint1
- remote_user: root
- roles:
- - { role: common/cronapt, tags: cronapt }
- - { role: common/docker, tags: docker }
- - { role: common/prometheus-node, tags: prometheus-node }
- - {
- role: common/docker_dockerstats, tags: dockerstats,
- servicename: dockerstats,
- basedir: /srv/dockerstats
- }
- - {
- role: octoprint/docker_octoprint, tags: octoprint,
- servicename: octoprint,
- basedir: /srv/octoprint,
- octoprint_port: 80
- }
-
-
- hosts: weatherwax
remote_user: root
roles:
@@ -48,12 +29,11 @@
- { role: common/cronapt, tags: cronapt }
-- hosts: warpsrvint
+- hosts: ogg
remote_user: root
roles:
- { role: common/borgbackup, tags: borgbackup }
- - { role: common/borgserver, tags: borgserver }
-# - { role: common/cronapt, tags: cronapt }
+ - { role: common/cronapt, tags: cronapt }
- { role: common/docker, tags: docker }
- { role: common/prometheus-node, tags: prometheus-node }
- {
@@ -62,58 +42,37 @@
basedir: /srv/dockerstats
}
- {
- role: common/docker_ldap,
- tags: ldap,
- servicename: ldap
- }
- - { role: common/nginx, tags: nginx }
- - {
- role: warpsrvint/samba,
- tags: samba
- }
- - {
- role: warpsrvint/docker_esphome,
- tags: esphome,
+ role: intern/docker_esphome, tags: esphome,
servicename: esphome,
basedir: /srv/esphome
}
- {
- role: warpsrvint/docker_grafana,
- tags: grafana,
- servicename: grafana
+ role: intern/docker_heimdall, tags: heimdall,
+ servicename: heimdall,
+ basedir: /srv/heimdall
}
- - { role: warpsrvint/docker_l4z0r, tags: l4z0r }
- - { role: warpsrvint/docker_matestatdb, tags: matestatdb }
- {
- role: warpsrvint/docker_mete,
- tags: mete,
- servicename: mete,
- mete_port: 8084
- }
- - {
- role: warpsrvint/docker_mqtt,
+ role: intern/docker_mqtt,
tags: mqtt,
servicename: mqtt,
influxdb_port: 18086
}
- {
- role: warpsrvint/docker_nodered,
+ role: intern/docker_nodered,
tags: nodered,
servicename: nodered
}
- {
- role: warpsrvint/docker_openhab,
+ role: intern/docker_openhab,
tags: openhab,
servicename: openhab,
influxdb_port: 28086
}
- {
- role: warpsrvint/docker_unifi,
+ role: intern/docker_unifi,
tags: unifi,
servicename: unifi
}
- - { role: warpsrvint/docker_warpinfra, tags: warpinfra }
-
- hosts: webserver
diff --git a/warpsrvint/docker_grafana/tasks/main.yml b/warpsrvint/docker_grafana/tasks/main.yml
deleted file mode 100644
index 036f5cf4..00000000
--- a/warpsrvint/docker_grafana/tasks/main.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-# Get secrets
-- include_tasks: ../functions/get_secret.yml
- with_items:
- - { path: /srv/ldap/secret/ldap_readonly_pass, length: 24 }
- - { path: /srv/grafana/grafana_admin_pass, length: 12 }
-
-- name: create folder struct for grafana
- file:
- path: "{{ item }}"
- state: "directory"
- with_items:
- - "/srv/grafana/"
- - "/srv/grafana/config/"
- - "/srv/grafana/data/"
-
-- name: create config files
- template: src={{ item }} dest=/srv/grafana/config/{{ item }}
- with_items:
- - grafana.ini
- - ldap.toml
- register: config
-
-- name: Docker Compose Konfig-Datei erstellen
- template:
- src: "docker-compose.yml"
- dest: "/srv/grafana/docker-compose.yml"
-
-# - name: start grafana docker
-# docker_service:
-# project_src: /srv/grafana/
-# state: absent
-# when: config.changed
-
-# - name: start grafana docker
-# docker_service:
-# project_src: /srv/grafana/
-# state: present
diff --git a/warpsrvint/docker_grafana/templates/docker-compose.yml b/warpsrvint/docker_grafana/templates/docker-compose.yml
deleted file mode 100644
index 48c9ffd3..00000000
--- a/warpsrvint/docker_grafana/templates/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3"
-
-services:
-
- app:
-
- image: grafana/grafana:6.6.0
- restart: always
- ports:
- - 3000:3000
- volumes:
- - /srv/grafana/config/grafana.ini:/etc/grafana/grafana.ini
- - /srv/grafana/config/ldap.toml:/etc/grafana/ldap.toml
- - /srv/grafana/data/:/var/lib/grafana
- environment:
- GF_SERVER_ROOT_URL: "http://warpsrvint:3000"
- GF_SECURITY_ADMIN_PASSWORD: "{{ grafana_admin_pass }}"
-
diff --git a/warpsrvint/docker_grafana/templates/grafana.ini b/warpsrvint/docker_grafana/templates/grafana.ini
deleted file mode 100644
index 1add827f..00000000
--- a/warpsrvint/docker_grafana/templates/grafana.ini
+++ /dev/null
@@ -1,137 +0,0 @@
-##################### Grafana Configuration ##################################
-#
-# Everything has defaults so you only need to uncomment things you want to
-# change
-
-# possible values : production, development
-app_mode = production
-
-# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
-instance_name = intern
-
-#
-#################################### Server ####################################
-[server]
-# Protocol (http, https, socket)
-;protocol = http
-
-# The ip address to bind to, empty will bind to all interfaces
-;http_addr =
-
-# The http port to use
-;http_port = 3000
-
-# The public facing domain name used to access grafana from a browser
-;domain = localhost
-
-# Redirect to correct domain if host header does not match domain
-# Prevents DNS rebinding attacks
-;enforce_domain = false
-
-# The full public facing url you use in browser, used for redirects and emails
-# If you use reverse proxy and sub path specify full url (with sub path)
-;root_url = http://localhost:3000
-
-# Log web requests
-;router_logging = false
-
-# the path relative working path
-;static_root_path = public
-
-# enable gzip
-;enable_gzip = false
-
-# https certs & key file
-;cert_file =
-;cert_key =
-
-# Unix socket path
-;socket =
-
-
-#################################### Security ####################################
-[security]
-# default admin user, created on startup
-;admin_user = admin
-
-# default admin password, can be changed before first start of grafana, or in profile settings
-;admin_password = admin
-
-# used for signing
-;secret_key = SW2YcwTIb9zpOOhoPsMm
-
-# Auto-login remember days
-;login_remember_days = 7
-;cookie_username = grafana_user
-;cookie_remember_name = grafana_remember
-
-# disable gravatar profile images
-;disable_gravatar = false
-
-# data source proxy whitelist (ip_or_domain:port separated by spaces)
-;data_source_proxy_whitelist =
-
-[snapshots]
-# snapshot sharing options
-;external_enabled = true
-;external_snapshot_url = https://snapshots-origin.raintank.io
-;external_snapshot_name = Publish to snapshot.raintank.io
-
-# remove expired snapshot
-;snapshot_remove_expired = true
-
-# remove snapshots after 90 days
-;snapshot_TTL_days = 90
-
-#################################### Users ####################################
-[users]
-# disable user signup / registration
-allow_sign_up = false
-
-# Allow non admin users to create organizations
-allow_org_create = false
-
-# Set to true to automatically assign new users to the default organization (id 1)
-auto_assign_org = true
-
-# Default role new users will be automatically assigned (if disabled above is set to true)
-auto_assign_org_role = Viewer
-
-# Background text for the user field on the login page
-login_hint = infa.warpzone.ms account
-
-# Default UI theme ("dark" or "light")
-default_theme = dark
-
-[auth]
-# Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
-;disable_login_form = false
-
-# Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false
-;disable_signout_menu = false
-
-#################################### Anonymous Auth ##########################
-[auth.anonymous]
-# enable anonymous access
-enabled = true
-
-# specify organization name that should be used for unauthenticated users
-org_name = Main Org.
-
-# specify role for unauthenticated users
-org_role = Viewer
-
-#################################### Auth LDAP ##########################
-[auth.ldap]
-enabled = true
-config_file = /etc/grafana/ldap.toml
-allow_sign_up = true
-
-
-#################################### Alerting ############################
-[alerting]
-# Disable alerting engine & UI features
-enabled = false
-# Makes it possible to turn off alert rule execution but alerting UI is visible
-execute_alerts = false
-
diff --git a/warpsrvint/docker_grafana/templates/ldap.toml b/warpsrvint/docker_grafana/templates/ldap.toml
deleted file mode 100644
index 769cf708..00000000
--- a/warpsrvint/docker_grafana/templates/ldap.toml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Set to true to log user information returned from LDAP
-verbose_logging = false
-
-[[servers]]
-# Ldap server host (specify multiple hosts space separated)
-host = "{{ int_ip4 }}"
-# Default port is 389 or 636 if use_ssl = true
-port = 389
-# Set to true if ldap server supports TLS
-use_ssl = false
-# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS)
-start_tls = false
-# set to true if you want to skip ssl cert validation
-ssl_skip_verify = false
-# set to the path to your root CA certificate or leave unset to use system defaults
-# root_ca_cert = "/path/to/certificate.crt"
-
-# Search user bind dn
-bind_dn = "cn=readonly,dc=warpzone,dc=ms"
-# Search user bind password
-# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
-bind_password = '{{ldap_readonly_pass}}'
-
-# User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"
-search_filter = "(&(uid=%s)(memberOf=cn=active,ou=groups,dc=warpzone,dc=ms))"
-
-# An array of base dns to search through
-search_base_dns = ["dc=warpzone,dc=ms"]
-
-# In POSIX LDAP schemas, without memberOf attribute a secondary query must be made for groups.
-# This is done by enabling group_search_filter below. You must also set member_of= "cn"
-# in [servers.attributes] below.
-
-## Group search filter, to retrieve the groups of which the user is a member (only set if memberOf attribute is not available)
-# group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
-## An array of the base DNs to search through for groups. Typically uses ou=groups
-# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
-
-# Specify names of the ldap attributes your ldap uses
-[servers.attributes]
-name = "givenName"
-surname = "sn"
-username = "uid"
-member_of = "memberOf"
-email = "email"
-
-# Map ldap groups to grafana org roles
-[[servers.group_mappings]]
-group_dn = "cn=grafana-admin,ou=infrastructure,dc=warpzone,dc=ms"
-org_role = "Admin"
-
-[[servers.group_mappings]]
-group_dn = "cn=active,ou=groups,dc=warpzone,dc=ms"
-org_role = "Editor"
-
-[[servers.group_mappings]]
-# If you want to match all (or no ldap groups) then you can use wildcard
-group_dn = "*"
-org_role = "Viewer"
diff --git a/warpsrvint/docker_l4z0r/tasks/main.yml b/warpsrvint/docker_l4z0r/tasks/main.yml
deleted file mode 100644
index 78ce8b11..00000000
--- a/warpsrvint/docker_l4z0r/tasks/main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-
-# Create folders
-- name: create folder struct for l4z0r
- file:
- path: "{{ item }}"
- state: "directory"
- with_items:
- - "/srv/l4z0r"
- - "/srv/l4z0r/db"
-
-# Get secrets
-- include_tasks: ../functions/get_secret.yml
- with_items:
- - { path: /srv/l4z0r/mysql_root_pw, length: 24 }
- - { path: /srv/l4z0r/mysql_user_pw, length: 12 }
-
-# Create docker-compose.yml
-- name: Konfig-Datei erstellen
- template:
- src: "docker-compose.yml"
- dest: "/srv/l4z0r/docker-compose.yml"
-
-# # Start containers
-# - name: start l4z0r docker
-# docker_service:
-# project_src: /srv/l4z0r/
-# state: present
diff --git a/warpsrvint/docker_l4z0r/templates/docker-compose.yml b/warpsrvint/docker_l4z0r/templates/docker-compose.yml
deleted file mode 100644
index 2afb0b2f..00000000
--- a/warpsrvint/docker_l4z0r/templates/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-version: "3"
-
-services:
-
- db:
-
- image: mariadb:10.1
- restart: always
- ports:
- - 0.0.0.0:33306:3306
- volumes:
- - /srv/l4z0r/db/:/var/lib/mysql
- environment:
- MYSQL_DATABASE: l4z0r
- MYSQL_USER: l4z0r
- MYSQL_PASSWORD: {{ mysql_user_pw }}
- MYSQL_ROOT_PASSWORD: {{ mysql_root_pw }}
-
diff --git a/warpsrvint/docker_matestatdb/tasks/main.yml b/warpsrvint/docker_matestatdb/tasks/main.yml
deleted file mode 100644
index cfb5db17..00000000
--- a/warpsrvint/docker_matestatdb/tasks/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# Get secrets
-- include_tasks: ../functions/get_secret.yml
- with_items:
- - { path: /srv/matestatdb/postgres_admin_pw, length: 24 }
-
-- name: create folder struct for matestatdb
- file:
- path: "{{ item }}"
- state: "directory"
- with_items:
- - "/srv/matestatdb/"
- - "/srv/matestatdb/data/"
-
-- name: Docker Compose Konfig-Datei erstellen
- template:
- src: "docker-compose.yml"
- dest: "/srv/matestatdb/docker-compose.yml"
-
-# - name: start matestatdb docker
-# docker_service:
-# project_src: /srv/matestatdb/
-# state: present
diff --git a/warpsrvint/docker_matestatdb/templates/docker-compose.yml b/warpsrvint/docker_matestatdb/templates/docker-compose.yml
deleted file mode 100644
index 5a4ba1b2..00000000
--- a/warpsrvint/docker_matestatdb/templates/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3"
-
-services:
-
- db:
-
- image: postgres:9.6
- restart: always
- ports:
- - 15432:5432
- volumes:
- - /srv/matestatdb/data/:/var/lib/postgresql/data/pgdata
- environment:
- PGDATA: /var/lib/postgresql/data/pgdata
- POSTGRES_DB: "matestatdb"
- POSTGRES_USER: "postgres"
- POSTGRES_PASSWORD: "{{ postgres_admin_pw }}"
-
diff --git a/warpsrvint/docker_mete/tasks/main.yml b/warpsrvint/docker_mete/tasks/main.yml
deleted file mode 100644
index 0734baba..00000000
--- a/warpsrvint/docker_mete/tasks/main.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-
----
-
-- include_tasks: ../functions/get_secret.yml
- with_items:
- - { path: "/srv/{{servicename}}/postgres_user_pass", length: 24 }
-
-- name: "create folder struct for {{servicename}}"
- file:
- path: "/srv/{{servicename}}"
- state: "directory"
-
-- name: "create folder struct for {{servicename}}"
- file:
- path: "{{ item }}"
- state: "directory"
- with_items:
- - "/srv/{{servicename}}/db"
- - "/srv/{{servicename}}/data"
-
-- name: "create docker-compose file"
- template:
- src: "{{ item }}"
- dest: "/srv/{{ servicename }}/{{ item }}"
- with_items:
- - database.yml
- - docker-compose.yml
-
-
-- name: "start {{servicename}} docker"
- docker_compose:
- project_src: /srv/{{servicename}}/
- state: present
-
diff --git a/warpsrvint/docker_mete/templates/database.yml b/warpsrvint/docker_mete/templates/database.yml
deleted file mode 100644
index 86f11ff3..00000000
--- a/warpsrvint/docker_mete/templates/database.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-production:
- adapter: postgresql
- database: mete
- host: db
- username: mete
- password: {{ postgres_user_pass }}
- pool: 5
- timeout: 5000
diff --git a/warpsrvint/docker_mete/templates/docker-compose.yml b/warpsrvint/docker_mete/templates/docker-compose.yml
deleted file mode 100644
index 7844cfeb..00000000
--- a/warpsrvint/docker_mete/templates/docker-compose.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: "3"
-
-services:
-
- db:
- image: postgres:14.1
- restart: always
- volumes:
- - "/srv/{{servicename}}/db:/var/lib/postgresql/data"
- environment:
- POSTGRES_DB: mete
- POSTGRES_USER: mete
- POSTGRES_PASSWORD: {{ postgres_user_pass }}
- POSTGRES_INITDB_ARGS: --encoding=UTF-8
-
- app:
- image: chaosdorf/mete@sha256:744e0845a1f75f6aeb33d1232e7c62c3dd86a69d916817242d1303f2fe7c05d1 # latest from 23.12.2021
- restart: always
- depends_on:
- - db
- ports:
- - "{{mete_port}}:80"
- volumes:
- - "/srv/{{servicename}}/database.yml:/app/config/database.yml:ro"
- - "/srv/{{servicename}}/data:/app/public/system"
- environment:
- RAILS_ENV: production
-
-# Grobe Skizze wie der Sync als Container laufen könnte
-#
-# sync:
-# build: ....
-# image: ....
-# restart: always
-# environment:
-# AAA: production
diff --git a/warpsrvint/docker_warpinfra/tasks/main.yml b/warpsrvint/docker_warpinfra/tasks/main.yml
deleted file mode 100644
index 6a80ec52..00000000
--- a/warpsrvint/docker_warpinfra/tasks/main.yml
+++ /dev/null
@@ -1,118 +0,0 @@
----
-# Einige Secrets sind auf dem Server lokal gespeichert und werden von dort gelesen
-# Auslesen der Dateien vom Server, zwischengespeicert wird in der Variable gitlab_secrets
-# Anschließend müssen die entsprechenden Einträge aus gitlab_secrets extrahiert werden
-# Die Daten, die von Slurp gelesen werden sind Base64 codiert
-# Zur Sicherheit werden Whitespace-Zeichen entfert, damit z.B. Zeilenumbrüche nicht übernommen werden
-
-- name: get secrets from server 1
- slurp: src={{ item }}
- with_items:
- - /srv/shared/noreply_email_pass
- - /srv/ldap/secret/ldap_admin_pass
- - /srv/ldap/secret/ldap_readonly_pass
- - /srv/warpinfra/secret/web_secret_key
- - /srv/warpinfra/secret/mysql_root_pw
- - /srv/warpinfra/secret/mysql_user_pw
- register: warpinfra_secrets
-
-- name: get secrets from server 2
- set_fact:
- noreply_email_pass: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/shared/noreply_email_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}"
- ldap_admin_pass: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/ldap/secret/ldap_admin_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}"
- ldap_readonly_pass: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/ldap/secret/ldap_readonly_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}"
- web_secret_key: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/web_secret_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}"
- mysql_root_pw: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/mysql_root_pw') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}"
- mysql_user_pw: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/mysql_user_pw') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}"
-
-- name: create folder struct for warpinfra
- file:
- path: "/tmp/warpinfra_docker/"
- state: "directory"
-
-- name: create folder struct for warpinfra
- file:
- path: "/srv/warpinfra/etc"
- state: "directory"
-
-- name: create folder struct for warpinfra
- file:
- path: "/srv/warpinfra/data"
- state: "directory"
-
-- name: create folder struct for warpinfra
- file:
- path: "/srv/warpinfra/log"
- state: "directory"
-
-- name: clone repo
- git:
- repo: "https://gitlab.warpzone.ms/infrastruktur/warpinfra.git"
-# version: "1.1"
- dest: "/tmp/warpinfra_docker"
- force: "yes"
- register: gitclone
-
-- name: clone repo status
- debug:
- msg: "{{gitclone}}"
-
-- name: Konfig-Datei erstellen
- template:
- src: "config.ini"
- dest: "/srv/warpinfra/etc/config.ini"
-
-# commit id in den Namen des Image einbeziehen
-# als tag scheint von docker_image nicht korrekt gesetzt zu werden
-
-- name: build the image
- docker_image:
- name: "warpinfra-app-{{ gitclone.after }}"
- path: /tmp/warpinfra_docker/www/
- state: present
-
-
-# Docker für DB manuel starten
-# docker run -it -v /srv/warpinfra/db/:/var/lib/mysql -p 13306:3306 mariadb:10.1
-
-- name: start warpinfra-db docker
- docker_container:
- name: warpinfra-db
- image: mariadb:10.1
- state: started
- interactive: yes
- restart_policy: always
- volumes:
- - /srv/warpinfra/db/:/var/lib/mysql
- ports:
- - 13306:3306
- env:
- MYSQL_DATABASE=warpinfra
- MYSQL_USER=warpinfra
- MYSQL_PASSWORD={{ mysql_user_pw }}
- MYSQL_ROOT_PASSWORD={{ mysql_root_pw }}
-
-
-- name: start warpinfra docker
- docker_container:
- name: warpinfra-app
- image: "warpinfra-app-{{ gitclone.after }}"
- state: started
- interactive: yes
- restart_policy: always
- volumes:
- - /tmp/warpinfra:/opt/socket
- - /srv/warpinfra/etc:/etc/warpinfra
- - /srv/warpinfra/data:/opt/database
- - /srv/warpinfra/log:/opt/log
- links:
- - warpinfra-db:mysql
-# - ldap-service:ldap
-
-
-# Manuelle Migration nach Deployment (wenn notwendig)
-
-# docker exec -it warpinfra-app bash
-# root@fb1748e7f8e5:/# cd /opt/warpinfra/
-# root@fb1748e7f8e5:/opt/warpinfra# python3 manage.py makemigrations
-# => Als Werte 0 oder ""
diff --git a/warpsrvint/docker_warpinfra/templates/config.ini b/warpsrvint/docker_warpinfra/templates/config.ini
deleted file mode 100644
index b96a3cc4..00000000
--- a/warpsrvint/docker_warpinfra/templates/config.ini
+++ /dev/null
@@ -1,51 +0,0 @@
-
-[common]
-# Possible Apps: warpmain, warpauth, warpfood, warpapi, warppay
-APPS = warpmain, warpauth, warppay
-
-INSTANCE_NAME = 'INTERN-PRODUKTIV'
-GIT_COMMIT = '{{ gitclone.after }}'
-DEPLOY_DATE = '{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}'
-
-[debug]
-DEBUG = False
-
-[security]
-SECRET_KEY = '{{ web_secret_key }}'
-PW_RESET_TOKEN_LIFETIME = 5
-ALLOWED_HOSTS = infra.warpzone
-
-[mattermost]
-API_KEY = ''
-
-[mysql]
-MYSQL_HOST = mysql
-MYSQL_PORT = 3306
-MYSQL_USER = warpinfra
-MYSQL_PASS = {{ mysql_user_pw }}
-MYSQL_NAME = warpinfra
-
-[ldap]
-LDAP_HOST = {{ ldap_ip_int }}
-LDAP_BIND_DN = cn=admin,dc=warpzone,dc=ms
-LDAP_PASSWORD = {{ ldap_admin_pass }}
-
-LDAP_USER_SEARCH_PATH = ou=users,dc=warpzone,dc=ms
-LDAP_GROUP_SEARCH_PATH = dc=warpzone,dc=ms
-LDAP_USER_SEARCH_FILTER = (uid=%(user)s)
-
-LDAP_GROUP_IS_ACTIVE = cn=active,ou=groups,dc=warpzone,dc=ms
-LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
-LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
-
-[email]
-SMTP_HOST = {{ smtp_host }}
-SMTP_PORT = {{ smtp_port }}
-SMTP_USERNAME = {{ noreply_email_user }}
-SMTP_PASSWORD = {{ noreply_email_pass }}
-SMTP_EMAIL_FROM = {{ noreply_email_user }}
-SMTP_USE_TLS = True
-SUBJECT_PREFIX = ''
-
-[misc]
-LOG_PATH = /opt/log/
diff --git a/warpsrvint/samba/tasks/main.yml b/warpsrvint/samba/tasks/main.yml
deleted file mode 100644
index 76861c44..00000000
--- a/warpsrvint/samba/tasks/main.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-
-- name: Install Packages for {{ servicename }}
- apt:
- state: present
- name:
- - samba
- - logrotate
-
-- name: Konfig-Dateien erstellen
- template:
- src: "{{ item }}"
- dest: "/etc/samba/{{ item }}"
- with_items:
- - smb.conf
- register: config
-
-- name: Enable and start smbd service for {{ servicename }}
- systemd:
- name: smbd
- state: started
- enabled: yes
-
-- name: Restart smbd service for {{ servicename }}
- systemd:
- name: smbd
- state: restarted
- when: config.changed
-
-- name: Enable and start nmbd service for {{ servicename }}
- systemd:
- name: nmbd
- state: started
- enabled: yes
-
-- name: Restart nmbd service for {{ servicename }}
- systemd:
- name: nmbd
- state: restarted
- when: config.changed
diff --git a/warpsrvint/samba/templates/smb.conf b/warpsrvint/samba/templates/smb.conf
deleted file mode 100644
index 74e86d7c..00000000
--- a/warpsrvint/samba/templates/smb.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-
-## Global settings
-
-[global]
-
-workgroup = warpzone
-netbios name = {{ inventory_hostname }}
-guest account = nobody
-log file = /usr/local/samba/var/log.%m
-max log size = 50
-security = user
-map to guest = bad user
-encrypt passwords = yes
-
-
-## Public Shares
-
-{% for share in samba_shares_public %}
-
-[{{ share.name }}]
-path = {{ share.path }}
-read only = no
-writable = yes
-browseable = yes
-only guest = yes
-guest ok = yes
-public = yes
-create mask = 777
-
-{% endfor %}
-
--
GitLab