From 6a1afddd9af1e46251316dd174baa14351b99983 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld <christian.elberfeld@adesso.de> Date: Thu, 16 May 2019 20:51:27 +0200 Subject: [PATCH] rollenverteilung restrukturiert --- all/main.yml | 8 --- site.yml | 125 +++++++++++++++++++++++++++++++++++++--- verwaltung/main.yml | 19 ------ warphab/main.yml | 8 --- warpsrvext/main.yml | 7 --- warpsrvint/main.yml | 25 -------- webserver-test/main.yml | 11 ---- webserver/main.yml | 28 --------- 8 files changed, 116 insertions(+), 115 deletions(-) delete mode 100644 all/main.yml delete mode 100644 verwaltung/main.yml delete mode 100644 warphab/main.yml delete mode 100644 warpsrvext/main.yml delete mode 100644 warpsrvint/main.yml delete mode 100644 webserver/main.yml diff --git a/all/main.yml b/all/main.yml deleted file mode 100644 index e37a2243..00000000 --- a/all/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Globale Konfiguration für alle Server - -- hosts: all - remote_user: root - roles: - - { role: hostname, tags: common } - - { role: common, tags: common } diff --git a/site.yml b/site.yml index 558c9b27..ad24a6e9 100644 --- a/site.yml +++ b/site.yml @@ -1,12 +1,119 @@ --- -# Hauptdatei, includiert lediglich die einzelnen Playbooks +################################################## +# Globale Konfiguration für alle Server +################################################## -- import_playbook: all/main.yml -- import_playbook: verwaltung/main.yml -- import_playbook: warphab/main.yml -- import_playbook: warpsrvint/main.yml -- import_playbook: warpsrvext/main.yml -- import_playbook: webserver/main.yml -- import_playbook: webserver-test/main.yml +- hosts: all + remote_user: root + roles: + - { role: all/hostname, tags: common } + - { role: all/common, tags: common } - \ No newline at end of file + +################################################## +# Produktive Server +################################################## + +- hosts: warpsrvext + remote_user: root + roles: + - { role: common/borgserver, tags: borgserver } + +- hosts: warpsrvint + remote_user: root + roles: + - { role: common/borgbackup, tags: borgbackup } + - { role: common/borgserver, tags: borgserver } + - { role: common/docker, tags: docker } + - { role: common/telegraf, tags: telegraf } + - { role: common/docker_ldap, tags: ldap } + - { role: common/nginx, tags: nginx } + - { role: warpsrvint/docker_grafana, tags: grafana } + - { role: warpsrvint/docker_influx, tags: influx } + - { role: warpsrvint/docker_iobroker, tags: iobroker } + - { role: warpsrvint/docker_kapacitor, tags: kapacitor } + - { role: warpsrvint/docker_librenms, tags: librenms } + - { role: warpsrvint/docker_l4z0r, tags: l4z0r } + - { role: warpsrvint/docker_matestatdb, tags: matestatdb } + - { role: warpsrvint/docker_mqtt, tags: mqtt } + - { role: warpsrvint/docker_nodered, tags: nodered } + - { role: warpsrvint/docker_prometheus, tags: prometheus } + - { role: warpsrvint/docker_unifi, tags: unifi } + - { role: warpsrvint/docker_warpinfra, tags: warpinfra } + - { role: warpsrvint/docker_warpinfratest, tags: warpinfratest } + + +- hosts: webserver + remote_user: root + roles: + - { role: common/borgbackup, tags: borgbackup } + - { role: common/docker, tags: docker } + - { role: common/telegraf, tags: telegraf } + - { role: common/nginx, tags: nginx } + - { role: common/openvpn, tags: openvpn } + - { role: common/docker_ldap, tags: ldap } + - { role: webserver/docker_alerta, tags: alerta } + - { role: webserver/docker_dokuwiki, tags: dokuwiki } + - { role: webserver/docker_etherpad, tags: etherpad } + - { role: webserver/docker_gitlab, tags: gitlab } + - { role: webserver/docker_hackmd, tags: hackmd } + - { role: webserver/docker_jabber, tags: jabber } + - { role: webserver/docker_keycloak, tags: keycloak } + - { role: webserver/docker_matterbridge, tags: matterbridge } + - { role: webserver/docker_matrix, tags: matrix } + - { role: webserver/docker_warpapi, tags: warpapi } + - { role: webserver/docker_warpinfra, tags: warpinfra } + - { role: webserver/docker_wordpress, tags: wordpress } + +# Entfällt durch testserver +# - { role: docker_jabber_test, tags: jabber_test } +# - { role: docker_warpinfratest, tags: warpinfratest } + + +- hosts: verwaltung + remote_user: root + roles: + - { role: common/telegraf, tags: telegraf } + - { role: common/docker, tags: docker } + - { role: common/nginx, tags: nginx } + - { role: common/openvpn, tags: openvpn } + - { role: verwaltung/docker_gitea, tags: gitea } + - { role: verwaltung/docker_nextcloud, tags: nextcloud } + - { role: verwaltung/docker_mysql, tags: mysql } + - { role: verwaltung/user, tags: user } + - { role: verwaltung/jameica, tags: jameica } + - { role: verwaltung/x2goserver, tags: x2goserver } +# - { role: ../common/borgbackup, tags: borgbackup } +# - { role: git, tags: git } + + + +################################################## +# 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: 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 } +# - { role: ../webserver/docker_warpinfra, tags: warpinfra } + +- hosts: warphab + remote_user: root + roles: + - { role: warphab/homegear, tags: homegear } + - { role: warphab/openhab, tags: openhab } diff --git a/verwaltung/main.yml b/verwaltung/main.yml deleted file mode 100644 index a433d43d..00000000 --- a/verwaltung/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- - -- hosts: verwaltung - remote_user: root - roles: - - { role: ../common/telegraf, tags: telegraf } - - { role: ../common/docker, tags: docker } - - { role: ../common/nginx, tags: nginx } - - { role: ../common/openvpn, tags: openvpn } - - { role: docker_gitea, tags: gitea } - - { role: docker_nextcloud, tags: nextcloud } - - { role: docker_mysql, tags: mysql } - - { role: user, tags: user } - - { role: jameica, tags: jameica } - - { role: x2goserver, tags: x2goserver } - -# - { role: ../common/borgbackup, tags: borgbackup } -# - { role: git, tags: git } - diff --git a/warphab/main.yml b/warphab/main.yml deleted file mode 100644 index e9a132e2..00000000 --- a/warphab/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Rollen, die nur auf dem WarpHAB-Server verwendet werden - -- hosts: warphab - remote_user: root - roles: - - { role: homegear, tags: homegear } - - { role: openhab, tags: openhab } diff --git a/warpsrvext/main.yml b/warpsrvext/main.yml deleted file mode 100644 index 60eb1455..00000000 --- a/warpsrvext/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -- hosts: warpsrvext - remote_user: root - roles: - - { role: ../common/borgserver, tags: borgserver } - diff --git a/warpsrvint/main.yml b/warpsrvint/main.yml deleted file mode 100644 index 27b789fd..00000000 --- a/warpsrvint/main.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- - -- hosts: warpsrvint - remote_user: root - roles: - - { role: ../common/borgbackup, tags: borgbackup } - - { role: ../common/borgserver, tags: borgserver } - - { role: ../common/docker, tags: docker } - - { role: ../common/telegraf, tags: telegraf } - - { role: ../common/docker_ldap, tags: ldap } - - { role: nginx, tags: nginx } - - { role: docker_grafana, tags: grafana } - - { role: docker_influx, tags: influx } - - { role: docker_iobroker, tags: iobroker } - - { role: docker_kapacitor, tags: kapacitor } - - { role: docker_librenms, tags: librenms } - - { role: docker_l4z0r, tags: l4z0r } - - { role: docker_matestatdb, tags: matestatdb } - - { role: docker_mqtt, tags: mqtt } - - { role: docker_nodered, tags: nodered } - - { role: docker_prometheus, tags: prometheus } - - { role: docker_unifi, tags: unifi } - - { role: docker_warpinfra, tags: warpinfra } - - { role: docker_warpinfratest, tags: warpinfratest } - diff --git a/webserver-test/main.yml b/webserver-test/main.yml index 12dcc535..849169c7 100644 --- a/webserver-test/main.yml +++ b/webserver-test/main.yml @@ -1,14 +1,3 @@ --- -- 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 } -# - { role: ../webserver/docker_warpinfra, tags: warpinfra } diff --git a/webserver/main.yml b/webserver/main.yml deleted file mode 100644 index 8d03ab48..00000000 --- a/webserver/main.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- - -- hosts: webserver - remote_user: root - roles: - - { role: ../common/borgbackup, tags: borgbackup } - - { role: ../common/docker, tags: docker } - - { role: ../common/telegraf, tags: telegraf } - - { role: ../common/nginx, tags: nginx } - - { role: ../common/openvpn, tags: openvpn } - - { role: ../common/docker_ldap, tags: ldap } - - { role: docker_alerta, tags: alerta } - - { role: docker_dokuwiki, tags: dokuwiki } - - { role: docker_etherpad, tags: etherpad } - - { role: docker_gitlab, tags: gitlab } - - { role: docker_hackmd, tags: hackmd } - - { role: docker_jabber, tags: jabber } - - { role: docker_keycloak, tags: keycloak } - - { role: docker_matterbridge, tags: matterbridge } - - { role: docker_matrix, tags: matrix } - - { role: docker_warpapi, tags: warpapi } - - { role: docker_warpinfra, tags: warpinfra } - - { role: docker_wordpress, tags: wordpress } - - -# Entfällt durch testserver -# - { role: docker_jabber_test, tags: jabber_test } -# - { role: docker_warpinfratest, tags: warpinfratest } -- GitLab