diff --git a/hosts b/hosts index 320b3bc..722757c 100644 --- a/hosts +++ b/hosts @@ -4,7 +4,7 @@ VM-debian11-template [cluster:children] glustertest -[servers] +[server] pve netbox Samba-AD-DC @@ -12,22 +12,22 @@ librenms grafana haproxy -[servers:children] +[server:children] cluster -databases -dhcpservers +database +dhcpserver docker -fileservers +fileserver icinga jitsimeet -mailservers +mailserver mastodon -nameservers -printspoolers -proxyservers -webservers +nameserver +printspooler +proxyserver +webserver -[databases] +[database] coruscant.universe.local mariadb01 mariadb02 @@ -38,7 +38,7 @@ endor.universe.local endorvm.universe.local tuxedo-book-xp1511.universe.local -[dhcpservers] +[dhcpserver] coruscant.universe.local dhcp-kea @@ -46,7 +46,7 @@ dhcp-kea docker01 docker02 -[fileservers] +[fileserver] coruscant.universe.local [glustertest] @@ -54,19 +54,19 @@ glustertest01 glustertest02 glustertest03 -[icingamaster] +[icinga_master] icinga -[icingasatellite] +[icinga_satellite] [icinga:children] -icingamaster -icingasatellite +icinga_master +icinga_satellite [jitsimeet] mewimeet.de jitsi_fqdn=mewimeet.de -[mailservers] +[mailserver] coruscant.universe.local mail.mewissen.site @@ -77,7 +77,7 @@ ubuntu-test [mobile] tuxedo-book-xp1511.universe.local -[nameservers] +[nameserver] coruscant.universe.local mewimeet.de mewitoot.de @@ -90,10 +90,10 @@ endor.universe.local endorvm.universe.local tuxedo-book-xp1511.universe.local -[printspoolers] +[printspooler] coruscant.universe.local -[proxyservers] +[proxyserver] coruscant.universe.local [video_editing] @@ -101,12 +101,12 @@ endor.universe.local endorvm.universe.local tuxedo-book-xp1511.universe.local -[webservers] +[webserver] coruscant.universe.local nextcloud webserver -[workstations:children] +[workstation:children] development mobile photo_editing diff --git a/local.yml b/local.yml index adb494a..24df2dc 100644 --- a/local.yml +++ b/local.yml @@ -38,77 +38,77 @@ # roles: # - workstation -- hosts: servers - tags: servers +- hosts: server + tags: server become: true roles: - - servers + - server -- hosts: nameservers - tags: servers,nameservers +- hosts: nameserver + tags: server,nameserver become: true roles: - - nameservers + - nameserver -- hosts: webservers - tags: servers,webservers +- hosts: webserver + tags: server,webserver become: true roles: - - webservers + - webserver -# - hosts: mailservers -# tags: servers,mailservers +# - hosts: mailserver +# tags: server,mailserver # become: true # roles: -# - mailservers +# - mailserver -- hosts: databases - tags: servers,databases +- hosts: database + tags: server,database become: true roles: - - databases + - database -# - hosts: dhcpservers -# tags: servers,dhcpservers +# - hosts: dhcpserver +# tags: server,dhcpserver # become: true # roles: -# - dhcpservers +# - dhcpserver - hosts: docker - tags: servers,docker + tags: server,docker become: true roles: - docker -# - hosts: fileservers -# tags: servers,fileservers +# - hosts: fileserver +# tags: server,fileserver # become: true # roles: # - fileserver - hosts: mastodon - tags: servers,mastodon + tags: server,mastodon become: true roles: - mastodon -# - hosts: printspoolers -# tags: servers,printspoolers +# - hosts: printspooler +# tags: server,printspooler # become: true # roles: # - printspooler - hosts: jitsimeet - tags: servers,jitsimeet,webservers + tags: server,jitsimeet,webserver become: true roles: - jitsimeet -# - hosts: proxyservers -# tags: servers,proxyservers +# - hosts: proxyserver +# tags: server,proxyserver # become: true # roles: -# - proxyservers +# - proxyserver # end of roles; cleanup and reporting - hosts: all diff --git a/roles/databases/tasks/configure_snmpd.yml b/roles/database/tasks/configure_snmpd.yml similarity index 100% rename from roles/databases/tasks/configure_snmpd.yml rename to roles/database/tasks/configure_snmpd.yml diff --git a/roles/databases/tasks/install_check_postgres.yml b/roles/database/tasks/install_check_postgres.yml similarity index 100% rename from roles/databases/tasks/install_check_postgres.yml rename to roles/database/tasks/install_check_postgres.yml diff --git a/roles/databases/tasks/install_mysql.yml b/roles/database/tasks/install_mysql.yml similarity index 100% rename from roles/databases/tasks/install_mysql.yml rename to roles/database/tasks/install_mysql.yml diff --git a/roles/databases/tasks/install_postgres.yml b/roles/database/tasks/install_postgres.yml similarity index 100% rename from roles/databases/tasks/install_postgres.yml rename to roles/database/tasks/install_postgres.yml diff --git a/roles/databases/tasks/install_redis.yml b/roles/database/tasks/install_redis.yml similarity index 100% rename from roles/databases/tasks/install_redis.yml rename to roles/database/tasks/install_redis.yml diff --git a/roles/databases/tasks/main.yml b/roles/database/tasks/main.yml similarity index 100% rename from roles/databases/tasks/main.yml rename to roles/database/tasks/main.yml diff --git a/roles/databases/vars/debian.yml b/roles/database/vars/debian.yml similarity index 100% rename from roles/databases/vars/debian.yml rename to roles/database/vars/debian.yml diff --git a/roles/databases/vars/ubuntu.yml b/roles/database/vars/ubuntu.yml similarity index 100% rename from roles/databases/vars/ubuntu.yml rename to roles/database/vars/ubuntu.yml diff --git a/roles/nameservers/files/snmpd_bind.conf b/roles/nameserver/files/snmpd_bind.conf similarity index 100% rename from roles/nameservers/files/snmpd_bind.conf rename to roles/nameserver/files/snmpd_bind.conf diff --git a/roles/nameservers/handlers/main.yml b/roles/nameserver/handlers/main.yml similarity index 100% rename from roles/nameservers/handlers/main.yml rename to roles/nameserver/handlers/main.yml diff --git a/roles/nameservers/tasks/configure_bind_snmpd.yml b/roles/nameserver/tasks/configure_bind_snmpd.yml similarity index 100% rename from roles/nameservers/tasks/configure_bind_snmpd.yml rename to roles/nameserver/tasks/configure_bind_snmpd.yml diff --git a/roles/nameservers/tasks/configure_unbound_snmpd.yml b/roles/nameserver/tasks/configure_unbound_snmpd.yml similarity index 100% rename from roles/nameservers/tasks/configure_unbound_snmpd.yml rename to roles/nameserver/tasks/configure_unbound_snmpd.yml diff --git a/roles/nameservers/tasks/disable-systemd-resolved.yml b/roles/nameserver/tasks/disable-systemd-resolved.yml similarity index 100% rename from roles/nameservers/tasks/disable-systemd-resolved.yml rename to roles/nameserver/tasks/disable-systemd-resolved.yml diff --git a/roles/nameservers/tasks/install_bind.yml b/roles/nameserver/tasks/install_bind.yml similarity index 100% rename from roles/nameservers/tasks/install_bind.yml rename to roles/nameserver/tasks/install_bind.yml diff --git a/roles/nameservers/tasks/install_unbound.yml b/roles/nameserver/tasks/install_unbound.yml similarity index 100% rename from roles/nameservers/tasks/install_unbound.yml rename to roles/nameserver/tasks/install_unbound.yml diff --git a/roles/nameservers/tasks/main.yml b/roles/nameserver/tasks/main.yml similarity index 100% rename from roles/nameservers/tasks/main.yml rename to roles/nameserver/tasks/main.yml diff --git a/roles/nameservers/templates/unbound_network.conf.j2 b/roles/nameserver/templates/unbound_network.conf.j2 similarity index 100% rename from roles/nameservers/templates/unbound_network.conf.j2 rename to roles/nameserver/templates/unbound_network.conf.j2 diff --git a/roles/nameservers/vars/Archlinux.yml b/roles/nameserver/vars/Archlinux.yml similarity index 100% rename from roles/nameservers/vars/Archlinux.yml rename to roles/nameserver/vars/Archlinux.yml diff --git a/roles/nameservers/vars/Debian.yml b/roles/nameserver/vars/Debian.yml similarity index 100% rename from roles/nameservers/vars/Debian.yml rename to roles/nameserver/vars/Debian.yml diff --git a/roles/nameservers/vars/Ubuntu.yml b/roles/nameserver/vars/Ubuntu.yml similarity index 100% rename from roles/nameservers/vars/Ubuntu.yml rename to roles/nameserver/vars/Ubuntu.yml diff --git a/roles/proxyservers/tasks/main.yaml b/roles/proxyserver/tasks/main.yaml similarity index 100% rename from roles/proxyservers/tasks/main.yaml rename to roles/proxyserver/tasks/main.yaml diff --git a/roles/proxyservers/tasks/squid.yml b/roles/proxyserver/tasks/squid.yml similarity index 100% rename from roles/proxyservers/tasks/squid.yml rename to roles/proxyserver/tasks/squid.yml diff --git a/roles/proxyservers/tasks/tinyproxy.yaml b/roles/proxyserver/tasks/tinyproxy.yaml similarity index 100% rename from roles/proxyservers/tasks/tinyproxy.yaml rename to roles/proxyserver/tasks/tinyproxy.yaml diff --git a/roles/servers/files/distro b/roles/server/files/distro similarity index 100% rename from roles/servers/files/distro rename to roles/server/files/distro diff --git a/roles/servers/files/sudoers b/roles/server/files/sudoers similarity index 100% rename from roles/servers/files/sudoers rename to roles/server/files/sudoers diff --git a/roles/servers/handlers/main.yml b/roles/server/handlers/main.yml similarity index 100% rename from roles/servers/handlers/main.yml rename to roles/server/handlers/main.yml diff --git a/roles/servers/tasks/main.yml b/roles/server/tasks/main.yml similarity index 100% rename from roles/servers/tasks/main.yml rename to roles/server/tasks/main.yml diff --git a/roles/servers/tasks/system_setup/cron.yml b/roles/server/tasks/system_setup/cron.yml similarity index 100% rename from roles/servers/tasks/system_setup/cron.yml rename to roles/server/tasks/system_setup/cron.yml diff --git a/roles/servers/tasks/system_setup/mail.yml b/roles/server/tasks/system_setup/mail.yml similarity index 100% rename from roles/servers/tasks/system_setup/mail.yml rename to roles/server/tasks/system_setup/mail.yml diff --git a/roles/servers/tasks/system_setup/swap.yml b/roles/server/tasks/system_setup/swap.yml similarity index 100% rename from roles/servers/tasks/system_setup/swap.yml rename to roles/server/tasks/system_setup/swap.yml diff --git a/roles/servers/tasks/system_setup/sysctl.yml b/roles/server/tasks/system_setup/sysctl.yml similarity index 100% rename from roles/servers/tasks/system_setup/sysctl.yml rename to roles/server/tasks/system_setup/sysctl.yml diff --git a/roles/servers/tasks/utilities/glusterfs.yml b/roles/server/tasks/utilities/glusterfs.yml similarity index 100% rename from roles/servers/tasks/utilities/glusterfs.yml rename to roles/server/tasks/utilities/glusterfs.yml diff --git a/roles/servers/tasks/utilities/mta.yml b/roles/server/tasks/utilities/mta.yml similarity index 100% rename from roles/servers/tasks/utilities/mta.yml rename to roles/server/tasks/utilities/mta.yml diff --git a/roles/servers/tasks/utilities/netdata.yml b/roles/server/tasks/utilities/netdata.yml similarity index 100% rename from roles/servers/tasks/utilities/netdata.yml rename to roles/server/tasks/utilities/netdata.yml diff --git a/roles/servers/tasks/utilities/snmpd.yml b/roles/server/tasks/utilities/snmpd.yml similarity index 100% rename from roles/servers/tasks/utilities/snmpd.yml rename to roles/server/tasks/utilities/snmpd.yml diff --git a/roles/servers/templates/client_VPN.conf.j2 b/roles/server/templates/client_VPN.conf.j2 similarity index 100% rename from roles/servers/templates/client_VPN.conf.j2 rename to roles/server/templates/client_VPN.conf.j2 diff --git a/roles/servers/templates/main.yml b/roles/server/templates/main.yml similarity index 100% rename from roles/servers/templates/main.yml rename to roles/server/templates/main.yml diff --git a/roles/servers/vars/Archlinux.yml b/roles/server/vars/Archlinux.yml similarity index 100% rename from roles/servers/vars/Archlinux.yml rename to roles/server/vars/Archlinux.yml diff --git a/roles/servers/vars/Debian.yml b/roles/server/vars/Debian.yml similarity index 100% rename from roles/servers/vars/Debian.yml rename to roles/server/vars/Debian.yml diff --git a/roles/servers/vars/Ubuntu.yml b/roles/server/vars/Ubuntu.yml similarity index 100% rename from roles/servers/vars/Ubuntu.yml rename to roles/server/vars/Ubuntu.yml diff --git a/roles/servers/vars/main.yml b/roles/server/vars/main.yml similarity index 100% rename from roles/servers/vars/main.yml rename to roles/server/vars/main.yml diff --git a/roles/servers/vars/mewimeet.com.yml b/roles/server/vars/mewimeet.com.yml similarity index 100% rename from roles/servers/vars/mewimeet.com.yml rename to roles/server/vars/mewimeet.com.yml diff --git a/roles/servers/vars/mewimeet.de.yml b/roles/server/vars/mewimeet.de.yml similarity index 100% rename from roles/servers/vars/mewimeet.de.yml rename to roles/server/vars/mewimeet.de.yml diff --git a/roles/servers/vars/snmp_users.yml b/roles/server/vars/snmp_users.yml similarity index 100% rename from roles/servers/vars/snmp_users.yml rename to roles/server/vars/snmp_users.yml diff --git a/roles/webservers/files/nginx_localhost b/roles/webserver/files/nginx_localhost similarity index 100% rename from roles/webservers/files/nginx_localhost rename to roles/webserver/files/nginx_localhost diff --git a/roles/webservers/handlers/main.yml b/roles/webserver/handlers/main.yml similarity index 100% rename from roles/webservers/handlers/main.yml rename to roles/webserver/handlers/main.yml diff --git a/roles/webservers/tasks/apps/apps.yml b/roles/webserver/tasks/apps/apps.yml similarity index 100% rename from roles/webservers/tasks/apps/apps.yml rename to roles/webserver/tasks/apps/apps.yml diff --git a/roles/webservers/tasks/apps/nextcloud/nextcloud.yml b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml similarity index 100% rename from roles/webservers/tasks/apps/nextcloud/nextcloud.yml rename to roles/webserver/tasks/apps/nextcloud/nextcloud.yml diff --git a/roles/webservers/tasks/apps/nextcloud/prereq.yml b/roles/webserver/tasks/apps/nextcloud/prereq.yml similarity index 100% rename from roles/webservers/tasks/apps/nextcloud/prereq.yml rename to roles/webserver/tasks/apps/nextcloud/prereq.yml diff --git a/roles/webservers/tasks/configure_nginx_snmpd.yml b/roles/webserver/tasks/configure_nginx_snmpd.yml similarity index 100% rename from roles/webservers/tasks/configure_nginx_snmpd.yml rename to roles/webserver/tasks/configure_nginx_snmpd.yml diff --git a/roles/webservers/tasks/install_apache.yml b/roles/webserver/tasks/install_apache.yml similarity index 100% rename from roles/webservers/tasks/install_apache.yml rename to roles/webserver/tasks/install_apache.yml diff --git a/roles/webservers/tasks/install_nginx.yml b/roles/webserver/tasks/install_nginx.yml similarity index 100% rename from roles/webservers/tasks/install_nginx.yml rename to roles/webserver/tasks/install_nginx.yml diff --git a/roles/webservers/tasks/install_php.yml b/roles/webserver/tasks/install_php.yml similarity index 100% rename from roles/webservers/tasks/install_php.yml rename to roles/webserver/tasks/install_php.yml diff --git a/roles/webservers/tasks/main.yml b/roles/webserver/tasks/main.yml similarity index 100% rename from roles/webservers/tasks/main.yml rename to roles/webserver/tasks/main.yml diff --git a/roles/webservers/templates/nextcloud/config.php.j2 b/roles/webserver/templates/nextcloud/config.php.j2 similarity index 100% rename from roles/webservers/templates/nextcloud/config.php.j2 rename to roles/webserver/templates/nextcloud/config.php.j2 diff --git a/roles/webservers/vars/Debian.yml b/roles/webserver/vars/Debian.yml similarity index 100% rename from roles/webservers/vars/Debian.yml rename to roles/webserver/vars/Debian.yml diff --git a/roles/webservers/vars/Ubuntu.yml b/roles/webserver/vars/Ubuntu.yml similarity index 100% rename from roles/webservers/vars/Ubuntu.yml rename to roles/webserver/vars/Ubuntu.yml diff --git a/roles/webservers/vars/nextcloud.yml b/roles/webserver/vars/nextcloud.yml similarity index 100% rename from roles/webservers/vars/nextcloud.yml rename to roles/webserver/vars/nextcloud.yml