From 642a7018797f033749d3e6e5f35c101a769230e9 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Sat, 9 Jul 2022 12:51:26 +0200 Subject: [PATCH] restructure roles repo --- ansible_runner/defaults/main.yml | 10 --- ansible_runner/handlers/main.yml | 3 - ansible_runner/tasks/main.yml | 72 ------------------- ansible_runner/templates/run_deployment.sh | 7 -- .../backup/client}/defaults/main.yml | 0 .../client}/filter_plugins/backup_config.py | 0 .../backup/client}/tasks/main.yml | 0 .../backup/client}/templates/backup.sh | 0 .../backup/client}/vars/main.yml | 0 .../backup/server}/defaults/main.yml | 0 .../backup/server}/tasks/main.yml | 0 .../bootstrap}/defaults/main.yml | 0 .../bootstrap}/handlers/main.yml | 0 .../bootstrap}/tasks/alpine.yml | 0 .../bootstrap}/tasks/archlinux.yml | 0 .../bootstrap}/tasks/common.yml | 0 .../bootstrap}/tasks/main.yml | 0 .../bootstrap}/tasks/openbsd.yml | 0 .../bootstrap}/tasks/ubuntu.yml | 0 {bootstrap => common/bootstrap}/vars/main.yml | 0 .../cronjobs}/defaults/main.yml | 0 {cronjobs => common/cronjobs}/tasks/main.yml | 0 .../data_sync}/defaults/main.yml | 0 .../data_sync}/tasks/main.yml | 0 {data_sync => common/data_sync}/vars/main.yml | 0 {gitea => common/gitea}/defaults/main.yml | 0 {gitea => common/gitea}/handlers/main.yml | 0 {gitea => common/gitea}/tasks/common.yml | 0 {gitea => common/gitea}/tasks/main.yml | 0 .../gitea}/templates/dkim_signing.conf.j2 | 0 .../gitea}/templates/httpd.conf.gitea.j2 | 0 .../gitea}/templates/smtpd.conf.j2 | 0 {gitea => common/gitea}/vars/main.yml | 0 .../keydisk}/restore/tasks/main.yml | 0 .../keydisk}/wipe/tasks/main.yml | 0 .../mailrelay}/defaults/main.yml | 0 .../mailrelay}/handlers/main.yml | 0 .../mailrelay}/tasks/main.yml | 0 .../mailrelay}/tasks/openbsd.yml | 0 .../mailrelay}/tasks/ubuntu.yml | 0 .../mailrelay}/templates/postfix_secrets | 0 .../mailrelay}/templates/secrets | 0 .../mailrelay}/templates/smtpd.conf | 0 .../add_to_icinga2}/defaults/main.yml | 0 .../files/check_services_openbsd.sh | 0 .../files/listening_tcp_openbsd.sh | 0 .../add_to_icinga2}/tasks/common.yml | 0 .../monitoring/add_to_icinga2}/tasks/main.yml | 0 .../add_to_icinga2}/tasks/openbsd.yml | 0 .../add_to_icinga2}/tasks/ubuntu.yml | 0 .../monitoring/add_to_icinga2}/vars/main.yml | 0 .../monitoring/icinga2}/defaults/main.yml | 0 .../icinga2}/files/commands/openbsd.conf | 0 .../monitoring/icinga2}/files/downtimes.conf | 0 .../icinga2}/files/notifications.conf | 0 .../files/services/haproxy_services.conf | 0 .../files/services/http_services.conf | 0 .../icinga2}/files/services/tcp_services.conf | 0 .../files/services/unix_services.conf | 0 .../files/services/windows_services.conf | 0 .../monitoring/icinga2}/files/ssh_config | 0 .../icinga2}/files/templates/byssh.conf | 0 .../icinga2}/files/templates/common.conf | 0 .../icinga2}/files/templates/linux.conf | 0 .../icinga2}/files/templates/openbsd.conf | 0 .../monitoring/icinga2}/handlers/main.yml | 0 .../monitoring/icinga2}/tasks/main.yml | 0 .../monitoring/icinga2}/tasks/openbsd.yml | 0 .../monitoring/icinga2}/tasks/ubuntu.yml | 0 .../icinga2}/templates/api-users.conf | 0 .../icinga2}/templates/ido-mysql.conf | 0 .../monitoring/icinga2}/templates/users.conf | 0 .../monitoring/icinga2}/vars/main.yml | 0 .../icinga_director}/defaults/main.yml | 0 .../icinga_director}/files/config.ini | 0 .../files/icinga-director.service | 0 .../icinga_director}/tasks/main.yml | 0 .../icinga_director}/tasks/openbsd.yml | 0 .../icinga_director}/tasks/ubuntu.yml | 0 .../monitoring/icinga_director}/vars/main.yml | 0 .../icingaweb2-grafana}/handlers/main.yml | 0 .../icingaweb2-grafana}/tasks/main.yml | 0 .../icingaweb2-grafana}/tasks/openbsd.yml | 0 .../icingaweb2-grafana}/tasks/ubuntu.yml | 0 .../templates/influxdb.conf | 0 .../icingaweb2-grafana}/vars/main.yml | 0 .../icingaweb2-theme}/defaults/main.yml | 0 .../files/icinga-director.service | 0 .../icingaweb2-theme}/tasks/main.yml | 0 .../icingaweb2-theme}/tasks/ubuntu.yml | 0 .../monitoring/icingaweb2}/defaults/main.yml | 0 .../files/etc/icingaweb2/authentication.ini | 0 .../files/etc/icingaweb2/config.ini | 0 .../files/etc/icingaweb2/groups.ini | 0 .../modules/monitoring/backends.ini | 0 .../files/etc/icingaweb2/roles.ini | 0 .../monitoring/icingaweb2}/files/hosts | 0 .../monitoring/icingaweb2}/files/php-fpm.conf | 0 .../monitoring/icingaweb2}/handlers/main.yml | 0 .../monitoring/icingaweb2}/tasks/main.yml | 0 .../monitoring/icingaweb2}/tasks/openbsd.yml | 0 .../monitoring/icingaweb2}/tasks/ubuntu.yml | 0 .../templates/commandtransports.ini | 0 .../icingaweb2}/templates/httpd.conf | 0 .../icingaweb2}/templates/icingaweb-admin.sql | 0 .../icingaweb2}/templates/relayd.conf | 0 .../icingaweb2}/templates/resources.ini | 0 .../monitoring/icingaweb2}/vars/main.yml | 0 {mysql => common/mysql}/defaults/main.yml | 0 {mysql => common/mysql}/tasks/main.yml | 0 {mysql => common/mysql}/tasks/openbsd.yml | 0 {mysql => common/mysql}/tasks/ubuntu.yml | 0 {mysql => common/mysql}/vars/main.yml | 0 .../wireguard}/defaults/main.yaml | 0 .../wireguard}/handlers/main.yaml | 0 .../wireguard}/tasks/arch.yml | 0 .../wireguard}/tasks/main.yml | 0 .../wireguard}/tasks/openbsd.yml | 0 .../wireguard}/tasks/systemd_linux.yml | 0 .../wireguard}/tasks/ubuntu.yml | 0 .../wireguard}/templates/30-wg0.netdev.jinja2 | 0 .../templates/30-wg0.network.jinja2 | 0 .../wireguard}/templates/hostname.wg0.j2 | 0 .../wireguard}/templates/wg0.conf | 0 {nginx => linux/nginx}/defaults/main.yml | 0 {nginx => linux/nginx}/tasks/main.yml | 0 .../dns_server}/defaults/main.yml | 0 .../dns_server}/handlers/main.yml | 0 .../dns_server}/tasks/main.yml | 0 .../dns_server}/tasks/openbsd.yml | 0 .../dns_server}/templates/nsd.conf | 0 .../dns_server}/templates/unbound.conf | 0 .../dns_server}/templates/zonefile.forward | 0 .../dns_server}/templates/zonefile.reverse | 0 .../firewall}/defaults/main.yml | 0 .../files/facts.d-openbsd/tcp_services.fact | 0 .../files/facts.d-openbsd/udp_services.fact | 0 .../firewall}/files/tcp_services.fact | 0 .../firewall}/handlers/main.yml | 0 {firewall => openbsd/firewall}/tasks/main.yml | 0 .../firewall}/tasks/openbsd.yml | 0 .../firewall}/templates/pf.conf | 0 {firewall => openbsd/firewall}/vars/main.yml | 0 .../install_from_rescue}/defaults/main.yml | 0 .../install_from_rescue}/tasks/main.yml | 0 .../tasks/openbsd_install.yml | 0 .../mailserver}/defaults/main.yml | 0 .../mailserver}/handlers/main.yml | 0 .../mailserver}/tasks/common.yml | 0 .../mailserver}/tasks/main.yml | 0 .../templates/dkim_signing.conf.j2 | 0 .../mailserver}/templates/smtpd.conf.j2 | 0 .../mailserver}/vars/main.yml | 0 .../mirror}/defaults/main.yml | 0 .../mirror}/handlers/main.yml | 0 .../mirror}/tasks/main.yml | 0 .../sysupgrade}/defaults/main.yml | 0 .../sysupgrade}/tasks/main.yml | 0 .../sysupgrade}/tasks/openbsd.yml | 0 .../webserver}/defaults/main.yml | 0 .../webserver}/handlers/main.yml | 0 .../webserver}/tasks/common.yml | 0 .../webserver}/tasks/main.yml | 0 .../webserver}/tasks/openbsd.yml | 0 .../webserver}/templates/acme-client.conf | 0 .../webserver}/templates/httpd.conf | 0 .../webserver}/vars/main.yml | 0 167 files changed, 92 deletions(-) delete mode 100644 ansible_runner/defaults/main.yml delete mode 100644 ansible_runner/handlers/main.yml delete mode 100644 ansible_runner/tasks/main.yml delete mode 100644 ansible_runner/templates/run_deployment.sh rename {backup => common/backup/client}/defaults/main.yml (100%) rename {backup => common/backup/client}/filter_plugins/backup_config.py (100%) rename {backup => common/backup/client}/tasks/main.yml (100%) rename {backup => common/backup/client}/templates/backup.sh (100%) rename {backup => common/backup/client}/vars/main.yml (100%) rename {backup_server => common/backup/server}/defaults/main.yml (100%) rename {backup_server => common/backup/server}/tasks/main.yml (100%) rename {bootstrap => common/bootstrap}/defaults/main.yml (100%) rename {bootstrap => common/bootstrap}/handlers/main.yml (100%) rename {bootstrap => common/bootstrap}/tasks/alpine.yml (100%) rename {bootstrap => common/bootstrap}/tasks/archlinux.yml (100%) rename {bootstrap => common/bootstrap}/tasks/common.yml (100%) rename {bootstrap => common/bootstrap}/tasks/main.yml (100%) rename {bootstrap => common/bootstrap}/tasks/openbsd.yml (100%) rename {bootstrap => common/bootstrap}/tasks/ubuntu.yml (100%) rename {bootstrap => common/bootstrap}/vars/main.yml (100%) rename {cronjobs => common/cronjobs}/defaults/main.yml (100%) rename {cronjobs => common/cronjobs}/tasks/main.yml (100%) rename {data_sync => common/data_sync}/defaults/main.yml (100%) rename {data_sync => common/data_sync}/tasks/main.yml (100%) rename {data_sync => common/data_sync}/vars/main.yml (100%) rename {gitea => common/gitea}/defaults/main.yml (100%) rename {gitea => common/gitea}/handlers/main.yml (100%) rename {gitea => common/gitea}/tasks/common.yml (100%) rename {gitea => common/gitea}/tasks/main.yml (100%) rename {gitea => common/gitea}/templates/dkim_signing.conf.j2 (100%) rename {gitea => common/gitea}/templates/httpd.conf.gitea.j2 (100%) rename {gitea => common/gitea}/templates/smtpd.conf.j2 (100%) rename {gitea => common/gitea}/vars/main.yml (100%) rename {keydisk => common/keydisk}/restore/tasks/main.yml (100%) rename {keydisk => common/keydisk}/wipe/tasks/main.yml (100%) rename {mailrelay => common/mailrelay}/defaults/main.yml (100%) rename {mailrelay => common/mailrelay}/handlers/main.yml (100%) rename {mailrelay => common/mailrelay}/tasks/main.yml (100%) rename {mailrelay => common/mailrelay}/tasks/openbsd.yml (100%) rename {mailrelay => common/mailrelay}/tasks/ubuntu.yml (100%) rename {mailrelay => common/mailrelay}/templates/postfix_secrets (100%) rename {mailrelay => common/mailrelay}/templates/secrets (100%) rename {mailrelay => common/mailrelay}/templates/smtpd.conf (100%) rename {add_to_icinga2 => common/monitoring/add_to_icinga2}/defaults/main.yml (100%) rename {add_to_icinga2 => common/monitoring/add_to_icinga2}/files/check_services_openbsd.sh (100%) rename {add_to_icinga2 => common/monitoring/add_to_icinga2}/files/listening_tcp_openbsd.sh (100%) rename {add_to_icinga2 => common/monitoring/add_to_icinga2}/tasks/common.yml (100%) rename {add_to_icinga2 => common/monitoring/add_to_icinga2}/tasks/main.yml (100%) rename {add_to_icinga2 => common/monitoring/add_to_icinga2}/tasks/openbsd.yml (100%) rename {add_to_icinga2 => common/monitoring/add_to_icinga2}/tasks/ubuntu.yml (100%) rename {add_to_icinga2 => common/monitoring/add_to_icinga2}/vars/main.yml (100%) rename {icinga2 => common/monitoring/icinga2}/defaults/main.yml (100%) rename {icinga2 => common/monitoring/icinga2}/files/commands/openbsd.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/downtimes.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/notifications.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/services/haproxy_services.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/services/http_services.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/services/tcp_services.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/services/unix_services.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/services/windows_services.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/ssh_config (100%) rename {icinga2 => common/monitoring/icinga2}/files/templates/byssh.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/templates/common.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/templates/linux.conf (100%) rename {icinga2 => common/monitoring/icinga2}/files/templates/openbsd.conf (100%) rename {icinga2 => common/monitoring/icinga2}/handlers/main.yml (100%) rename {icinga2 => common/monitoring/icinga2}/tasks/main.yml (100%) rename {icinga2 => common/monitoring/icinga2}/tasks/openbsd.yml (100%) rename {icinga2 => common/monitoring/icinga2}/tasks/ubuntu.yml (100%) rename {icinga2 => common/monitoring/icinga2}/templates/api-users.conf (100%) rename {icinga2 => common/monitoring/icinga2}/templates/ido-mysql.conf (100%) rename {icinga2 => common/monitoring/icinga2}/templates/users.conf (100%) rename {icinga2 => common/monitoring/icinga2}/vars/main.yml (100%) rename {icinga_director => common/monitoring/icinga_director}/defaults/main.yml (100%) rename {icinga_director => common/monitoring/icinga_director}/files/config.ini (100%) rename {icinga_director => common/monitoring/icinga_director}/files/icinga-director.service (100%) rename {icinga_director => common/monitoring/icinga_director}/tasks/main.yml (100%) rename {icinga_director => common/monitoring/icinga_director}/tasks/openbsd.yml (100%) rename {icinga_director => common/monitoring/icinga_director}/tasks/ubuntu.yml (100%) rename {icinga_director => common/monitoring/icinga_director}/vars/main.yml (100%) rename {icingaweb2-grafana => common/monitoring/icingaweb2-grafana}/handlers/main.yml (100%) rename {icingaweb2-grafana => common/monitoring/icingaweb2-grafana}/tasks/main.yml (100%) rename {icingaweb2-grafana => common/monitoring/icingaweb2-grafana}/tasks/openbsd.yml (100%) rename {icingaweb2-grafana => common/monitoring/icingaweb2-grafana}/tasks/ubuntu.yml (100%) rename {icingaweb2-grafana => common/monitoring/icingaweb2-grafana}/templates/influxdb.conf (100%) rename {icingaweb2-grafana => common/monitoring/icingaweb2-grafana}/vars/main.yml (100%) rename {icingaweb2-theme => common/monitoring/icingaweb2-theme}/defaults/main.yml (100%) rename {icingaweb2-theme => common/monitoring/icingaweb2-theme}/files/icinga-director.service (100%) rename {icingaweb2-theme => common/monitoring/icingaweb2-theme}/tasks/main.yml (100%) rename {icingaweb2-theme => common/monitoring/icingaweb2-theme}/tasks/ubuntu.yml (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/defaults/main.yml (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/files/etc/icingaweb2/authentication.ini (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/files/etc/icingaweb2/config.ini (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/files/etc/icingaweb2/groups.ini (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/files/etc/icingaweb2/modules/monitoring/backends.ini (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/files/etc/icingaweb2/roles.ini (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/files/hosts (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/files/php-fpm.conf (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/handlers/main.yml (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/tasks/main.yml (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/tasks/openbsd.yml (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/tasks/ubuntu.yml (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/templates/commandtransports.ini (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/templates/httpd.conf (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/templates/icingaweb-admin.sql (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/templates/relayd.conf (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/templates/resources.ini (100%) rename {icingaweb2 => common/monitoring/icingaweb2}/vars/main.yml (100%) rename {mysql => common/mysql}/defaults/main.yml (100%) rename {mysql => common/mysql}/tasks/main.yml (100%) rename {mysql => common/mysql}/tasks/openbsd.yml (100%) rename {mysql => common/mysql}/tasks/ubuntu.yml (100%) rename {mysql => common/mysql}/vars/main.yml (100%) rename {wireguard => common/wireguard}/defaults/main.yaml (100%) rename {wireguard => common/wireguard}/handlers/main.yaml (100%) rename {wireguard => common/wireguard}/tasks/arch.yml (100%) rename {wireguard => common/wireguard}/tasks/main.yml (100%) rename {wireguard => common/wireguard}/tasks/openbsd.yml (100%) rename {wireguard => common/wireguard}/tasks/systemd_linux.yml (100%) rename {wireguard => common/wireguard}/tasks/ubuntu.yml (100%) rename {wireguard => common/wireguard}/templates/30-wg0.netdev.jinja2 (100%) rename {wireguard => common/wireguard}/templates/30-wg0.network.jinja2 (100%) rename {wireguard => common/wireguard}/templates/hostname.wg0.j2 (100%) rename {wireguard => common/wireguard}/templates/wg0.conf (100%) rename {nginx => linux/nginx}/defaults/main.yml (100%) rename {nginx => linux/nginx}/tasks/main.yml (100%) rename {dns_server => openbsd/dns_server}/defaults/main.yml (100%) rename {dns_server => openbsd/dns_server}/handlers/main.yml (100%) rename {dns_server => openbsd/dns_server}/tasks/main.yml (100%) rename {dns_server => openbsd/dns_server}/tasks/openbsd.yml (100%) rename {dns_server => openbsd/dns_server}/templates/nsd.conf (100%) rename {dns_server => openbsd/dns_server}/templates/unbound.conf (100%) rename {dns_server => openbsd/dns_server}/templates/zonefile.forward (100%) rename {dns_server => openbsd/dns_server}/templates/zonefile.reverse (100%) rename {firewall => openbsd/firewall}/defaults/main.yml (100%) rename {firewall => openbsd/firewall}/files/facts.d-openbsd/tcp_services.fact (100%) rename {firewall => openbsd/firewall}/files/facts.d-openbsd/udp_services.fact (100%) rename {firewall => openbsd/firewall}/files/tcp_services.fact (100%) rename {firewall => openbsd/firewall}/handlers/main.yml (100%) rename {firewall => openbsd/firewall}/tasks/main.yml (100%) rename {firewall => openbsd/firewall}/tasks/openbsd.yml (100%) rename {firewall => openbsd/firewall}/templates/pf.conf (100%) rename {firewall => openbsd/firewall}/vars/main.yml (100%) rename {openbsd_install_from_rescue => openbsd/install_from_rescue}/defaults/main.yml (100%) rename {openbsd_install_from_rescue => openbsd/install_from_rescue}/tasks/main.yml (100%) rename {openbsd_install_from_rescue => openbsd/install_from_rescue}/tasks/openbsd_install.yml (100%) rename {mailserver => openbsd/mailserver}/defaults/main.yml (100%) rename {mailserver => openbsd/mailserver}/handlers/main.yml (100%) rename {mailserver => openbsd/mailserver}/tasks/common.yml (100%) rename {mailserver => openbsd/mailserver}/tasks/main.yml (100%) rename {mailserver => openbsd/mailserver}/templates/dkim_signing.conf.j2 (100%) rename {mailserver => openbsd/mailserver}/templates/smtpd.conf.j2 (100%) rename {mailserver => openbsd/mailserver}/vars/main.yml (100%) rename {openbsd_mirror => openbsd/mirror}/defaults/main.yml (100%) rename {openbsd_mirror => openbsd/mirror}/handlers/main.yml (100%) rename {openbsd_mirror => openbsd/mirror}/tasks/main.yml (100%) rename {sysupgrade => openbsd/sysupgrade}/defaults/main.yml (100%) rename {sysupgrade => openbsd/sysupgrade}/tasks/main.yml (100%) rename {sysupgrade => openbsd/sysupgrade}/tasks/openbsd.yml (100%) rename {webserver => openbsd/webserver}/defaults/main.yml (100%) rename {webserver => openbsd/webserver}/handlers/main.yml (100%) rename {webserver => openbsd/webserver}/tasks/common.yml (100%) rename {webserver => openbsd/webserver}/tasks/main.yml (100%) rename {webserver => openbsd/webserver}/tasks/openbsd.yml (100%) rename {webserver => openbsd/webserver}/templates/acme-client.conf (100%) rename {webserver => openbsd/webserver}/templates/httpd.conf (100%) rename {webserver => openbsd/webserver}/vars/main.yml (100%) diff --git a/ansible_runner/defaults/main.yml b/ansible_runner/defaults/main.yml deleted file mode 100644 index 1a872ef..0000000 --- a/ansible_runner/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ -ansible_runner_mailto: root@localhost -ansible_runner_command: "ansible-playbook playbook.yml -e do_backup=true" -ansible_runner_user: _runner -ansible_runner_home: /home/_runner -ansible_runner_schedule: - - name: my-deployment - repo: git@gitserver:user/my-deployment - minute: "~" - hour: "1~5" - weekday: "*" diff --git a/ansible_runner/handlers/main.yml b/ansible_runner/handlers/main.yml deleted file mode 100644 index e945211..0000000 --- a/ansible_runner/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: update_aliases - become: yes - command: smtpctl update table aliases diff --git a/ansible_runner/tasks/main.yml b/ansible_runner/tasks/main.yml deleted file mode 100644 index 68d65fe..0000000 --- a/ansible_runner/tasks/main.yml +++ /dev/null @@ -1,72 +0,0 @@ -- name: create user - become: yes - user: - name: "{{ ansible_runner_user }}" - shell: "/sbin/nologin" - home: "{{ ansible_runner_home }}" - -- name: install packages - become: yes - community.general.openbsd_pkg: - name: [ "git", "ansible" ] - state: present - snapshot: "{{ force_openbsd_snapshot | default(false) }}" - -- name: create ssh key - become: yes - openssh_keypair: - path: "{{ ansible_runner_home }}/.ssh/id_rsa" - owner: "{{ ansible_runner_user }}" - -- name: clone deployments - become: yes - git: - key_file: "{{ ansible_runner_home }}/.ssh/id_rsa" - accept_hostkey: yes - repo: "{{ deployment.repo }}" - dest: "{{ ansible_runner_home }}/{{ deployment.name }}" - loop: "{{ ansible_runner_schedule }}" - loop_control: - loop_var: deployment - -- name: set permissions - become: yes - file: - path: "{{ ansible_runner_home }}/{{ deployment.name }}" - owner: "{{ ansible_runner_user }}" - recurse: yes - loop: "{{ ansible_runner_schedule }}" - loop_control: - loop_var: deployment - -- name: setup run scripts - become: yes - template: - src: run_deployment.sh - dest: "{{ ansible_runner_home }}/{{ deployment.name }}/run_deployment.sh" - mode: '0750' - owner: "{{ ansible_runner_user }}" - loop: "{{ ansible_runner_schedule }}" - loop_control: - loop_var: deployment - -- name: setup cron jobs - become: yes - cron: - user: "{{ ansible_runner_user }}" - name: "{{ deployment.name }}" - job: "{{ ansible_runner_home }}/{{ deployment.name }}/run_deployment.sh" - minute: "{{ deployment.minute }}" - hour: "{{ deployment.hour }}" - weekday: "{{ deployment.weekday }}" - loop: "{{ ansible_runner_schedule }}" - loop_control: - loop_var: deployment - -- name: setup mail alias - become: yes - lineinfile: - path: /etc/mail/aliases - line: "{{ ansible_runner_user }}: {{ ansible_runner_mailto }}" - regexp: "^.*{{ ansible_runner_user }}.*$" - notify: update_aliases diff --git a/ansible_runner/templates/run_deployment.sh b/ansible_runner/templates/run_deployment.sh deleted file mode 100644 index b2d9c61..0000000 --- a/ansible_runner/templates/run_deployment.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/ksh -HOME={{ ansible_runner_home }} -DEPLOYMENT_DIR=$HOME/{{ deployment.name }} - -cd $DEPLOYMENT_DIR && \ - git pull && \ - {{ ansible_runner_command }} diff --git a/backup/defaults/main.yml b/common/backup/client/defaults/main.yml similarity index 100% rename from backup/defaults/main.yml rename to common/backup/client/defaults/main.yml diff --git a/backup/filter_plugins/backup_config.py b/common/backup/client/filter_plugins/backup_config.py similarity index 100% rename from backup/filter_plugins/backup_config.py rename to common/backup/client/filter_plugins/backup_config.py diff --git a/backup/tasks/main.yml b/common/backup/client/tasks/main.yml similarity index 100% rename from backup/tasks/main.yml rename to common/backup/client/tasks/main.yml diff --git a/backup/templates/backup.sh b/common/backup/client/templates/backup.sh similarity index 100% rename from backup/templates/backup.sh rename to common/backup/client/templates/backup.sh diff --git a/backup/vars/main.yml b/common/backup/client/vars/main.yml similarity index 100% rename from backup/vars/main.yml rename to common/backup/client/vars/main.yml diff --git a/backup_server/defaults/main.yml b/common/backup/server/defaults/main.yml similarity index 100% rename from backup_server/defaults/main.yml rename to common/backup/server/defaults/main.yml diff --git a/backup_server/tasks/main.yml b/common/backup/server/tasks/main.yml similarity index 100% rename from backup_server/tasks/main.yml rename to common/backup/server/tasks/main.yml diff --git a/bootstrap/defaults/main.yml b/common/bootstrap/defaults/main.yml similarity index 100% rename from bootstrap/defaults/main.yml rename to common/bootstrap/defaults/main.yml diff --git a/bootstrap/handlers/main.yml b/common/bootstrap/handlers/main.yml similarity index 100% rename from bootstrap/handlers/main.yml rename to common/bootstrap/handlers/main.yml diff --git a/bootstrap/tasks/alpine.yml b/common/bootstrap/tasks/alpine.yml similarity index 100% rename from bootstrap/tasks/alpine.yml rename to common/bootstrap/tasks/alpine.yml diff --git a/bootstrap/tasks/archlinux.yml b/common/bootstrap/tasks/archlinux.yml similarity index 100% rename from bootstrap/tasks/archlinux.yml rename to common/bootstrap/tasks/archlinux.yml diff --git a/bootstrap/tasks/common.yml b/common/bootstrap/tasks/common.yml similarity index 100% rename from bootstrap/tasks/common.yml rename to common/bootstrap/tasks/common.yml diff --git a/bootstrap/tasks/main.yml b/common/bootstrap/tasks/main.yml similarity index 100% rename from bootstrap/tasks/main.yml rename to common/bootstrap/tasks/main.yml diff --git a/bootstrap/tasks/openbsd.yml b/common/bootstrap/tasks/openbsd.yml similarity index 100% rename from bootstrap/tasks/openbsd.yml rename to common/bootstrap/tasks/openbsd.yml diff --git a/bootstrap/tasks/ubuntu.yml b/common/bootstrap/tasks/ubuntu.yml similarity index 100% rename from bootstrap/tasks/ubuntu.yml rename to common/bootstrap/tasks/ubuntu.yml diff --git a/bootstrap/vars/main.yml b/common/bootstrap/vars/main.yml similarity index 100% rename from bootstrap/vars/main.yml rename to common/bootstrap/vars/main.yml diff --git a/cronjobs/defaults/main.yml b/common/cronjobs/defaults/main.yml similarity index 100% rename from cronjobs/defaults/main.yml rename to common/cronjobs/defaults/main.yml diff --git a/cronjobs/tasks/main.yml b/common/cronjobs/tasks/main.yml similarity index 100% rename from cronjobs/tasks/main.yml rename to common/cronjobs/tasks/main.yml diff --git a/data_sync/defaults/main.yml b/common/data_sync/defaults/main.yml similarity index 100% rename from data_sync/defaults/main.yml rename to common/data_sync/defaults/main.yml diff --git a/data_sync/tasks/main.yml b/common/data_sync/tasks/main.yml similarity index 100% rename from data_sync/tasks/main.yml rename to common/data_sync/tasks/main.yml diff --git a/data_sync/vars/main.yml b/common/data_sync/vars/main.yml similarity index 100% rename from data_sync/vars/main.yml rename to common/data_sync/vars/main.yml diff --git a/gitea/defaults/main.yml b/common/gitea/defaults/main.yml similarity index 100% rename from gitea/defaults/main.yml rename to common/gitea/defaults/main.yml diff --git a/gitea/handlers/main.yml b/common/gitea/handlers/main.yml similarity index 100% rename from gitea/handlers/main.yml rename to common/gitea/handlers/main.yml diff --git a/gitea/tasks/common.yml b/common/gitea/tasks/common.yml similarity index 100% rename from gitea/tasks/common.yml rename to common/gitea/tasks/common.yml diff --git a/gitea/tasks/main.yml b/common/gitea/tasks/main.yml similarity index 100% rename from gitea/tasks/main.yml rename to common/gitea/tasks/main.yml diff --git a/gitea/templates/dkim_signing.conf.j2 b/common/gitea/templates/dkim_signing.conf.j2 similarity index 100% rename from gitea/templates/dkim_signing.conf.j2 rename to common/gitea/templates/dkim_signing.conf.j2 diff --git a/gitea/templates/httpd.conf.gitea.j2 b/common/gitea/templates/httpd.conf.gitea.j2 similarity index 100% rename from gitea/templates/httpd.conf.gitea.j2 rename to common/gitea/templates/httpd.conf.gitea.j2 diff --git a/gitea/templates/smtpd.conf.j2 b/common/gitea/templates/smtpd.conf.j2 similarity index 100% rename from gitea/templates/smtpd.conf.j2 rename to common/gitea/templates/smtpd.conf.j2 diff --git a/gitea/vars/main.yml b/common/gitea/vars/main.yml similarity index 100% rename from gitea/vars/main.yml rename to common/gitea/vars/main.yml diff --git a/keydisk/restore/tasks/main.yml b/common/keydisk/restore/tasks/main.yml similarity index 100% rename from keydisk/restore/tasks/main.yml rename to common/keydisk/restore/tasks/main.yml diff --git a/keydisk/wipe/tasks/main.yml b/common/keydisk/wipe/tasks/main.yml similarity index 100% rename from keydisk/wipe/tasks/main.yml rename to common/keydisk/wipe/tasks/main.yml diff --git a/mailrelay/defaults/main.yml b/common/mailrelay/defaults/main.yml similarity index 100% rename from mailrelay/defaults/main.yml rename to common/mailrelay/defaults/main.yml diff --git a/mailrelay/handlers/main.yml b/common/mailrelay/handlers/main.yml similarity index 100% rename from mailrelay/handlers/main.yml rename to common/mailrelay/handlers/main.yml diff --git a/mailrelay/tasks/main.yml b/common/mailrelay/tasks/main.yml similarity index 100% rename from mailrelay/tasks/main.yml rename to common/mailrelay/tasks/main.yml diff --git a/mailrelay/tasks/openbsd.yml b/common/mailrelay/tasks/openbsd.yml similarity index 100% rename from mailrelay/tasks/openbsd.yml rename to common/mailrelay/tasks/openbsd.yml diff --git a/mailrelay/tasks/ubuntu.yml b/common/mailrelay/tasks/ubuntu.yml similarity index 100% rename from mailrelay/tasks/ubuntu.yml rename to common/mailrelay/tasks/ubuntu.yml diff --git a/mailrelay/templates/postfix_secrets b/common/mailrelay/templates/postfix_secrets similarity index 100% rename from mailrelay/templates/postfix_secrets rename to common/mailrelay/templates/postfix_secrets diff --git a/mailrelay/templates/secrets b/common/mailrelay/templates/secrets similarity index 100% rename from mailrelay/templates/secrets rename to common/mailrelay/templates/secrets diff --git a/mailrelay/templates/smtpd.conf b/common/mailrelay/templates/smtpd.conf similarity index 100% rename from mailrelay/templates/smtpd.conf rename to common/mailrelay/templates/smtpd.conf diff --git a/add_to_icinga2/defaults/main.yml b/common/monitoring/add_to_icinga2/defaults/main.yml similarity index 100% rename from add_to_icinga2/defaults/main.yml rename to common/monitoring/add_to_icinga2/defaults/main.yml diff --git a/add_to_icinga2/files/check_services_openbsd.sh b/common/monitoring/add_to_icinga2/files/check_services_openbsd.sh similarity index 100% rename from add_to_icinga2/files/check_services_openbsd.sh rename to common/monitoring/add_to_icinga2/files/check_services_openbsd.sh diff --git a/add_to_icinga2/files/listening_tcp_openbsd.sh b/common/monitoring/add_to_icinga2/files/listening_tcp_openbsd.sh similarity index 100% rename from add_to_icinga2/files/listening_tcp_openbsd.sh rename to common/monitoring/add_to_icinga2/files/listening_tcp_openbsd.sh diff --git a/add_to_icinga2/tasks/common.yml b/common/monitoring/add_to_icinga2/tasks/common.yml similarity index 100% rename from add_to_icinga2/tasks/common.yml rename to common/monitoring/add_to_icinga2/tasks/common.yml diff --git a/add_to_icinga2/tasks/main.yml b/common/monitoring/add_to_icinga2/tasks/main.yml similarity index 100% rename from add_to_icinga2/tasks/main.yml rename to common/monitoring/add_to_icinga2/tasks/main.yml diff --git a/add_to_icinga2/tasks/openbsd.yml b/common/monitoring/add_to_icinga2/tasks/openbsd.yml similarity index 100% rename from add_to_icinga2/tasks/openbsd.yml rename to common/monitoring/add_to_icinga2/tasks/openbsd.yml diff --git a/add_to_icinga2/tasks/ubuntu.yml b/common/monitoring/add_to_icinga2/tasks/ubuntu.yml similarity index 100% rename from add_to_icinga2/tasks/ubuntu.yml rename to common/monitoring/add_to_icinga2/tasks/ubuntu.yml diff --git a/add_to_icinga2/vars/main.yml b/common/monitoring/add_to_icinga2/vars/main.yml similarity index 100% rename from add_to_icinga2/vars/main.yml rename to common/monitoring/add_to_icinga2/vars/main.yml diff --git a/icinga2/defaults/main.yml b/common/monitoring/icinga2/defaults/main.yml similarity index 100% rename from icinga2/defaults/main.yml rename to common/monitoring/icinga2/defaults/main.yml diff --git a/icinga2/files/commands/openbsd.conf b/common/monitoring/icinga2/files/commands/openbsd.conf similarity index 100% rename from icinga2/files/commands/openbsd.conf rename to common/monitoring/icinga2/files/commands/openbsd.conf diff --git a/icinga2/files/downtimes.conf b/common/monitoring/icinga2/files/downtimes.conf similarity index 100% rename from icinga2/files/downtimes.conf rename to common/monitoring/icinga2/files/downtimes.conf diff --git a/icinga2/files/notifications.conf b/common/monitoring/icinga2/files/notifications.conf similarity index 100% rename from icinga2/files/notifications.conf rename to common/monitoring/icinga2/files/notifications.conf diff --git a/icinga2/files/services/haproxy_services.conf b/common/monitoring/icinga2/files/services/haproxy_services.conf similarity index 100% rename from icinga2/files/services/haproxy_services.conf rename to common/monitoring/icinga2/files/services/haproxy_services.conf diff --git a/icinga2/files/services/http_services.conf b/common/monitoring/icinga2/files/services/http_services.conf similarity index 100% rename from icinga2/files/services/http_services.conf rename to common/monitoring/icinga2/files/services/http_services.conf diff --git a/icinga2/files/services/tcp_services.conf b/common/monitoring/icinga2/files/services/tcp_services.conf similarity index 100% rename from icinga2/files/services/tcp_services.conf rename to common/monitoring/icinga2/files/services/tcp_services.conf diff --git a/icinga2/files/services/unix_services.conf b/common/monitoring/icinga2/files/services/unix_services.conf similarity index 100% rename from icinga2/files/services/unix_services.conf rename to common/monitoring/icinga2/files/services/unix_services.conf diff --git a/icinga2/files/services/windows_services.conf b/common/monitoring/icinga2/files/services/windows_services.conf similarity index 100% rename from icinga2/files/services/windows_services.conf rename to common/monitoring/icinga2/files/services/windows_services.conf diff --git a/icinga2/files/ssh_config b/common/monitoring/icinga2/files/ssh_config similarity index 100% rename from icinga2/files/ssh_config rename to common/monitoring/icinga2/files/ssh_config diff --git a/icinga2/files/templates/byssh.conf b/common/monitoring/icinga2/files/templates/byssh.conf similarity index 100% rename from icinga2/files/templates/byssh.conf rename to common/monitoring/icinga2/files/templates/byssh.conf diff --git a/icinga2/files/templates/common.conf b/common/monitoring/icinga2/files/templates/common.conf similarity index 100% rename from icinga2/files/templates/common.conf rename to common/monitoring/icinga2/files/templates/common.conf diff --git a/icinga2/files/templates/linux.conf b/common/monitoring/icinga2/files/templates/linux.conf similarity index 100% rename from icinga2/files/templates/linux.conf rename to common/monitoring/icinga2/files/templates/linux.conf diff --git a/icinga2/files/templates/openbsd.conf b/common/monitoring/icinga2/files/templates/openbsd.conf similarity index 100% rename from icinga2/files/templates/openbsd.conf rename to common/monitoring/icinga2/files/templates/openbsd.conf diff --git a/icinga2/handlers/main.yml b/common/monitoring/icinga2/handlers/main.yml similarity index 100% rename from icinga2/handlers/main.yml rename to common/monitoring/icinga2/handlers/main.yml diff --git a/icinga2/tasks/main.yml b/common/monitoring/icinga2/tasks/main.yml similarity index 100% rename from icinga2/tasks/main.yml rename to common/monitoring/icinga2/tasks/main.yml diff --git a/icinga2/tasks/openbsd.yml b/common/monitoring/icinga2/tasks/openbsd.yml similarity index 100% rename from icinga2/tasks/openbsd.yml rename to common/monitoring/icinga2/tasks/openbsd.yml diff --git a/icinga2/tasks/ubuntu.yml b/common/monitoring/icinga2/tasks/ubuntu.yml similarity index 100% rename from icinga2/tasks/ubuntu.yml rename to common/monitoring/icinga2/tasks/ubuntu.yml diff --git a/icinga2/templates/api-users.conf b/common/monitoring/icinga2/templates/api-users.conf similarity index 100% rename from icinga2/templates/api-users.conf rename to common/monitoring/icinga2/templates/api-users.conf diff --git a/icinga2/templates/ido-mysql.conf b/common/monitoring/icinga2/templates/ido-mysql.conf similarity index 100% rename from icinga2/templates/ido-mysql.conf rename to common/monitoring/icinga2/templates/ido-mysql.conf diff --git a/icinga2/templates/users.conf b/common/monitoring/icinga2/templates/users.conf similarity index 100% rename from icinga2/templates/users.conf rename to common/monitoring/icinga2/templates/users.conf diff --git a/icinga2/vars/main.yml b/common/monitoring/icinga2/vars/main.yml similarity index 100% rename from icinga2/vars/main.yml rename to common/monitoring/icinga2/vars/main.yml diff --git a/icinga_director/defaults/main.yml b/common/monitoring/icinga_director/defaults/main.yml similarity index 100% rename from icinga_director/defaults/main.yml rename to common/monitoring/icinga_director/defaults/main.yml diff --git a/icinga_director/files/config.ini b/common/monitoring/icinga_director/files/config.ini similarity index 100% rename from icinga_director/files/config.ini rename to common/monitoring/icinga_director/files/config.ini diff --git a/icinga_director/files/icinga-director.service b/common/monitoring/icinga_director/files/icinga-director.service similarity index 100% rename from icinga_director/files/icinga-director.service rename to common/monitoring/icinga_director/files/icinga-director.service diff --git a/icinga_director/tasks/main.yml b/common/monitoring/icinga_director/tasks/main.yml similarity index 100% rename from icinga_director/tasks/main.yml rename to common/monitoring/icinga_director/tasks/main.yml diff --git a/icinga_director/tasks/openbsd.yml b/common/monitoring/icinga_director/tasks/openbsd.yml similarity index 100% rename from icinga_director/tasks/openbsd.yml rename to common/monitoring/icinga_director/tasks/openbsd.yml diff --git a/icinga_director/tasks/ubuntu.yml b/common/monitoring/icinga_director/tasks/ubuntu.yml similarity index 100% rename from icinga_director/tasks/ubuntu.yml rename to common/monitoring/icinga_director/tasks/ubuntu.yml diff --git a/icinga_director/vars/main.yml b/common/monitoring/icinga_director/vars/main.yml similarity index 100% rename from icinga_director/vars/main.yml rename to common/monitoring/icinga_director/vars/main.yml diff --git a/icingaweb2-grafana/handlers/main.yml b/common/monitoring/icingaweb2-grafana/handlers/main.yml similarity index 100% rename from icingaweb2-grafana/handlers/main.yml rename to common/monitoring/icingaweb2-grafana/handlers/main.yml diff --git a/icingaweb2-grafana/tasks/main.yml b/common/monitoring/icingaweb2-grafana/tasks/main.yml similarity index 100% rename from icingaweb2-grafana/tasks/main.yml rename to common/monitoring/icingaweb2-grafana/tasks/main.yml diff --git a/icingaweb2-grafana/tasks/openbsd.yml b/common/monitoring/icingaweb2-grafana/tasks/openbsd.yml similarity index 100% rename from icingaweb2-grafana/tasks/openbsd.yml rename to common/monitoring/icingaweb2-grafana/tasks/openbsd.yml diff --git a/icingaweb2-grafana/tasks/ubuntu.yml b/common/monitoring/icingaweb2-grafana/tasks/ubuntu.yml similarity index 100% rename from icingaweb2-grafana/tasks/ubuntu.yml rename to common/monitoring/icingaweb2-grafana/tasks/ubuntu.yml diff --git a/icingaweb2-grafana/templates/influxdb.conf b/common/monitoring/icingaweb2-grafana/templates/influxdb.conf similarity index 100% rename from icingaweb2-grafana/templates/influxdb.conf rename to common/monitoring/icingaweb2-grafana/templates/influxdb.conf diff --git a/icingaweb2-grafana/vars/main.yml b/common/monitoring/icingaweb2-grafana/vars/main.yml similarity index 100% rename from icingaweb2-grafana/vars/main.yml rename to common/monitoring/icingaweb2-grafana/vars/main.yml diff --git a/icingaweb2-theme/defaults/main.yml b/common/monitoring/icingaweb2-theme/defaults/main.yml similarity index 100% rename from icingaweb2-theme/defaults/main.yml rename to common/monitoring/icingaweb2-theme/defaults/main.yml diff --git a/icingaweb2-theme/files/icinga-director.service b/common/monitoring/icingaweb2-theme/files/icinga-director.service similarity index 100% rename from icingaweb2-theme/files/icinga-director.service rename to common/monitoring/icingaweb2-theme/files/icinga-director.service diff --git a/icingaweb2-theme/tasks/main.yml b/common/monitoring/icingaweb2-theme/tasks/main.yml similarity index 100% rename from icingaweb2-theme/tasks/main.yml rename to common/monitoring/icingaweb2-theme/tasks/main.yml diff --git a/icingaweb2-theme/tasks/ubuntu.yml b/common/monitoring/icingaweb2-theme/tasks/ubuntu.yml similarity index 100% rename from icingaweb2-theme/tasks/ubuntu.yml rename to common/monitoring/icingaweb2-theme/tasks/ubuntu.yml diff --git a/icingaweb2/defaults/main.yml b/common/monitoring/icingaweb2/defaults/main.yml similarity index 100% rename from icingaweb2/defaults/main.yml rename to common/monitoring/icingaweb2/defaults/main.yml diff --git a/icingaweb2/files/etc/icingaweb2/authentication.ini b/common/monitoring/icingaweb2/files/etc/icingaweb2/authentication.ini similarity index 100% rename from icingaweb2/files/etc/icingaweb2/authentication.ini rename to common/monitoring/icingaweb2/files/etc/icingaweb2/authentication.ini diff --git a/icingaweb2/files/etc/icingaweb2/config.ini b/common/monitoring/icingaweb2/files/etc/icingaweb2/config.ini similarity index 100% rename from icingaweb2/files/etc/icingaweb2/config.ini rename to common/monitoring/icingaweb2/files/etc/icingaweb2/config.ini diff --git a/icingaweb2/files/etc/icingaweb2/groups.ini b/common/monitoring/icingaweb2/files/etc/icingaweb2/groups.ini similarity index 100% rename from icingaweb2/files/etc/icingaweb2/groups.ini rename to common/monitoring/icingaweb2/files/etc/icingaweb2/groups.ini diff --git a/icingaweb2/files/etc/icingaweb2/modules/monitoring/backends.ini b/common/monitoring/icingaweb2/files/etc/icingaweb2/modules/monitoring/backends.ini similarity index 100% rename from icingaweb2/files/etc/icingaweb2/modules/monitoring/backends.ini rename to common/monitoring/icingaweb2/files/etc/icingaweb2/modules/monitoring/backends.ini diff --git a/icingaweb2/files/etc/icingaweb2/roles.ini b/common/monitoring/icingaweb2/files/etc/icingaweb2/roles.ini similarity index 100% rename from icingaweb2/files/etc/icingaweb2/roles.ini rename to common/monitoring/icingaweb2/files/etc/icingaweb2/roles.ini diff --git a/icingaweb2/files/hosts b/common/monitoring/icingaweb2/files/hosts similarity index 100% rename from icingaweb2/files/hosts rename to common/monitoring/icingaweb2/files/hosts diff --git a/icingaweb2/files/php-fpm.conf b/common/monitoring/icingaweb2/files/php-fpm.conf similarity index 100% rename from icingaweb2/files/php-fpm.conf rename to common/monitoring/icingaweb2/files/php-fpm.conf diff --git a/icingaweb2/handlers/main.yml b/common/monitoring/icingaweb2/handlers/main.yml similarity index 100% rename from icingaweb2/handlers/main.yml rename to common/monitoring/icingaweb2/handlers/main.yml diff --git a/icingaweb2/tasks/main.yml b/common/monitoring/icingaweb2/tasks/main.yml similarity index 100% rename from icingaweb2/tasks/main.yml rename to common/monitoring/icingaweb2/tasks/main.yml diff --git a/icingaweb2/tasks/openbsd.yml b/common/monitoring/icingaweb2/tasks/openbsd.yml similarity index 100% rename from icingaweb2/tasks/openbsd.yml rename to common/monitoring/icingaweb2/tasks/openbsd.yml diff --git a/icingaweb2/tasks/ubuntu.yml b/common/monitoring/icingaweb2/tasks/ubuntu.yml similarity index 100% rename from icingaweb2/tasks/ubuntu.yml rename to common/monitoring/icingaweb2/tasks/ubuntu.yml diff --git a/icingaweb2/templates/commandtransports.ini b/common/monitoring/icingaweb2/templates/commandtransports.ini similarity index 100% rename from icingaweb2/templates/commandtransports.ini rename to common/monitoring/icingaweb2/templates/commandtransports.ini diff --git a/icingaweb2/templates/httpd.conf b/common/monitoring/icingaweb2/templates/httpd.conf similarity index 100% rename from icingaweb2/templates/httpd.conf rename to common/monitoring/icingaweb2/templates/httpd.conf diff --git a/icingaweb2/templates/icingaweb-admin.sql b/common/monitoring/icingaweb2/templates/icingaweb-admin.sql similarity index 100% rename from icingaweb2/templates/icingaweb-admin.sql rename to common/monitoring/icingaweb2/templates/icingaweb-admin.sql diff --git a/icingaweb2/templates/relayd.conf b/common/monitoring/icingaweb2/templates/relayd.conf similarity index 100% rename from icingaweb2/templates/relayd.conf rename to common/monitoring/icingaweb2/templates/relayd.conf diff --git a/icingaweb2/templates/resources.ini b/common/monitoring/icingaweb2/templates/resources.ini similarity index 100% rename from icingaweb2/templates/resources.ini rename to common/monitoring/icingaweb2/templates/resources.ini diff --git a/icingaweb2/vars/main.yml b/common/monitoring/icingaweb2/vars/main.yml similarity index 100% rename from icingaweb2/vars/main.yml rename to common/monitoring/icingaweb2/vars/main.yml diff --git a/mysql/defaults/main.yml b/common/mysql/defaults/main.yml similarity index 100% rename from mysql/defaults/main.yml rename to common/mysql/defaults/main.yml diff --git a/mysql/tasks/main.yml b/common/mysql/tasks/main.yml similarity index 100% rename from mysql/tasks/main.yml rename to common/mysql/tasks/main.yml diff --git a/mysql/tasks/openbsd.yml b/common/mysql/tasks/openbsd.yml similarity index 100% rename from mysql/tasks/openbsd.yml rename to common/mysql/tasks/openbsd.yml diff --git a/mysql/tasks/ubuntu.yml b/common/mysql/tasks/ubuntu.yml similarity index 100% rename from mysql/tasks/ubuntu.yml rename to common/mysql/tasks/ubuntu.yml diff --git a/mysql/vars/main.yml b/common/mysql/vars/main.yml similarity index 100% rename from mysql/vars/main.yml rename to common/mysql/vars/main.yml diff --git a/wireguard/defaults/main.yaml b/common/wireguard/defaults/main.yaml similarity index 100% rename from wireguard/defaults/main.yaml rename to common/wireguard/defaults/main.yaml diff --git a/wireguard/handlers/main.yaml b/common/wireguard/handlers/main.yaml similarity index 100% rename from wireguard/handlers/main.yaml rename to common/wireguard/handlers/main.yaml diff --git a/wireguard/tasks/arch.yml b/common/wireguard/tasks/arch.yml similarity index 100% rename from wireguard/tasks/arch.yml rename to common/wireguard/tasks/arch.yml diff --git a/wireguard/tasks/main.yml b/common/wireguard/tasks/main.yml similarity index 100% rename from wireguard/tasks/main.yml rename to common/wireguard/tasks/main.yml diff --git a/wireguard/tasks/openbsd.yml b/common/wireguard/tasks/openbsd.yml similarity index 100% rename from wireguard/tasks/openbsd.yml rename to common/wireguard/tasks/openbsd.yml diff --git a/wireguard/tasks/systemd_linux.yml b/common/wireguard/tasks/systemd_linux.yml similarity index 100% rename from wireguard/tasks/systemd_linux.yml rename to common/wireguard/tasks/systemd_linux.yml diff --git a/wireguard/tasks/ubuntu.yml b/common/wireguard/tasks/ubuntu.yml similarity index 100% rename from wireguard/tasks/ubuntu.yml rename to common/wireguard/tasks/ubuntu.yml diff --git a/wireguard/templates/30-wg0.netdev.jinja2 b/common/wireguard/templates/30-wg0.netdev.jinja2 similarity index 100% rename from wireguard/templates/30-wg0.netdev.jinja2 rename to common/wireguard/templates/30-wg0.netdev.jinja2 diff --git a/wireguard/templates/30-wg0.network.jinja2 b/common/wireguard/templates/30-wg0.network.jinja2 similarity index 100% rename from wireguard/templates/30-wg0.network.jinja2 rename to common/wireguard/templates/30-wg0.network.jinja2 diff --git a/wireguard/templates/hostname.wg0.j2 b/common/wireguard/templates/hostname.wg0.j2 similarity index 100% rename from wireguard/templates/hostname.wg0.j2 rename to common/wireguard/templates/hostname.wg0.j2 diff --git a/wireguard/templates/wg0.conf b/common/wireguard/templates/wg0.conf similarity index 100% rename from wireguard/templates/wg0.conf rename to common/wireguard/templates/wg0.conf diff --git a/nginx/defaults/main.yml b/linux/nginx/defaults/main.yml similarity index 100% rename from nginx/defaults/main.yml rename to linux/nginx/defaults/main.yml diff --git a/nginx/tasks/main.yml b/linux/nginx/tasks/main.yml similarity index 100% rename from nginx/tasks/main.yml rename to linux/nginx/tasks/main.yml diff --git a/dns_server/defaults/main.yml b/openbsd/dns_server/defaults/main.yml similarity index 100% rename from dns_server/defaults/main.yml rename to openbsd/dns_server/defaults/main.yml diff --git a/dns_server/handlers/main.yml b/openbsd/dns_server/handlers/main.yml similarity index 100% rename from dns_server/handlers/main.yml rename to openbsd/dns_server/handlers/main.yml diff --git a/dns_server/tasks/main.yml b/openbsd/dns_server/tasks/main.yml similarity index 100% rename from dns_server/tasks/main.yml rename to openbsd/dns_server/tasks/main.yml diff --git a/dns_server/tasks/openbsd.yml b/openbsd/dns_server/tasks/openbsd.yml similarity index 100% rename from dns_server/tasks/openbsd.yml rename to openbsd/dns_server/tasks/openbsd.yml diff --git a/dns_server/templates/nsd.conf b/openbsd/dns_server/templates/nsd.conf similarity index 100% rename from dns_server/templates/nsd.conf rename to openbsd/dns_server/templates/nsd.conf diff --git a/dns_server/templates/unbound.conf b/openbsd/dns_server/templates/unbound.conf similarity index 100% rename from dns_server/templates/unbound.conf rename to openbsd/dns_server/templates/unbound.conf diff --git a/dns_server/templates/zonefile.forward b/openbsd/dns_server/templates/zonefile.forward similarity index 100% rename from dns_server/templates/zonefile.forward rename to openbsd/dns_server/templates/zonefile.forward diff --git a/dns_server/templates/zonefile.reverse b/openbsd/dns_server/templates/zonefile.reverse similarity index 100% rename from dns_server/templates/zonefile.reverse rename to openbsd/dns_server/templates/zonefile.reverse diff --git a/firewall/defaults/main.yml b/openbsd/firewall/defaults/main.yml similarity index 100% rename from firewall/defaults/main.yml rename to openbsd/firewall/defaults/main.yml diff --git a/firewall/files/facts.d-openbsd/tcp_services.fact b/openbsd/firewall/files/facts.d-openbsd/tcp_services.fact similarity index 100% rename from firewall/files/facts.d-openbsd/tcp_services.fact rename to openbsd/firewall/files/facts.d-openbsd/tcp_services.fact diff --git a/firewall/files/facts.d-openbsd/udp_services.fact b/openbsd/firewall/files/facts.d-openbsd/udp_services.fact similarity index 100% rename from firewall/files/facts.d-openbsd/udp_services.fact rename to openbsd/firewall/files/facts.d-openbsd/udp_services.fact diff --git a/firewall/files/tcp_services.fact b/openbsd/firewall/files/tcp_services.fact similarity index 100% rename from firewall/files/tcp_services.fact rename to openbsd/firewall/files/tcp_services.fact diff --git a/firewall/handlers/main.yml b/openbsd/firewall/handlers/main.yml similarity index 100% rename from firewall/handlers/main.yml rename to openbsd/firewall/handlers/main.yml diff --git a/firewall/tasks/main.yml b/openbsd/firewall/tasks/main.yml similarity index 100% rename from firewall/tasks/main.yml rename to openbsd/firewall/tasks/main.yml diff --git a/firewall/tasks/openbsd.yml b/openbsd/firewall/tasks/openbsd.yml similarity index 100% rename from firewall/tasks/openbsd.yml rename to openbsd/firewall/tasks/openbsd.yml diff --git a/firewall/templates/pf.conf b/openbsd/firewall/templates/pf.conf similarity index 100% rename from firewall/templates/pf.conf rename to openbsd/firewall/templates/pf.conf diff --git a/firewall/vars/main.yml b/openbsd/firewall/vars/main.yml similarity index 100% rename from firewall/vars/main.yml rename to openbsd/firewall/vars/main.yml diff --git a/openbsd_install_from_rescue/defaults/main.yml b/openbsd/install_from_rescue/defaults/main.yml similarity index 100% rename from openbsd_install_from_rescue/defaults/main.yml rename to openbsd/install_from_rescue/defaults/main.yml diff --git a/openbsd_install_from_rescue/tasks/main.yml b/openbsd/install_from_rescue/tasks/main.yml similarity index 100% rename from openbsd_install_from_rescue/tasks/main.yml rename to openbsd/install_from_rescue/tasks/main.yml diff --git a/openbsd_install_from_rescue/tasks/openbsd_install.yml b/openbsd/install_from_rescue/tasks/openbsd_install.yml similarity index 100% rename from openbsd_install_from_rescue/tasks/openbsd_install.yml rename to openbsd/install_from_rescue/tasks/openbsd_install.yml diff --git a/mailserver/defaults/main.yml b/openbsd/mailserver/defaults/main.yml similarity index 100% rename from mailserver/defaults/main.yml rename to openbsd/mailserver/defaults/main.yml diff --git a/mailserver/handlers/main.yml b/openbsd/mailserver/handlers/main.yml similarity index 100% rename from mailserver/handlers/main.yml rename to openbsd/mailserver/handlers/main.yml diff --git a/mailserver/tasks/common.yml b/openbsd/mailserver/tasks/common.yml similarity index 100% rename from mailserver/tasks/common.yml rename to openbsd/mailserver/tasks/common.yml diff --git a/mailserver/tasks/main.yml b/openbsd/mailserver/tasks/main.yml similarity index 100% rename from mailserver/tasks/main.yml rename to openbsd/mailserver/tasks/main.yml diff --git a/mailserver/templates/dkim_signing.conf.j2 b/openbsd/mailserver/templates/dkim_signing.conf.j2 similarity index 100% rename from mailserver/templates/dkim_signing.conf.j2 rename to openbsd/mailserver/templates/dkim_signing.conf.j2 diff --git a/mailserver/templates/smtpd.conf.j2 b/openbsd/mailserver/templates/smtpd.conf.j2 similarity index 100% rename from mailserver/templates/smtpd.conf.j2 rename to openbsd/mailserver/templates/smtpd.conf.j2 diff --git a/mailserver/vars/main.yml b/openbsd/mailserver/vars/main.yml similarity index 100% rename from mailserver/vars/main.yml rename to openbsd/mailserver/vars/main.yml diff --git a/openbsd_mirror/defaults/main.yml b/openbsd/mirror/defaults/main.yml similarity index 100% rename from openbsd_mirror/defaults/main.yml rename to openbsd/mirror/defaults/main.yml diff --git a/openbsd_mirror/handlers/main.yml b/openbsd/mirror/handlers/main.yml similarity index 100% rename from openbsd_mirror/handlers/main.yml rename to openbsd/mirror/handlers/main.yml diff --git a/openbsd_mirror/tasks/main.yml b/openbsd/mirror/tasks/main.yml similarity index 100% rename from openbsd_mirror/tasks/main.yml rename to openbsd/mirror/tasks/main.yml diff --git a/sysupgrade/defaults/main.yml b/openbsd/sysupgrade/defaults/main.yml similarity index 100% rename from sysupgrade/defaults/main.yml rename to openbsd/sysupgrade/defaults/main.yml diff --git a/sysupgrade/tasks/main.yml b/openbsd/sysupgrade/tasks/main.yml similarity index 100% rename from sysupgrade/tasks/main.yml rename to openbsd/sysupgrade/tasks/main.yml diff --git a/sysupgrade/tasks/openbsd.yml b/openbsd/sysupgrade/tasks/openbsd.yml similarity index 100% rename from sysupgrade/tasks/openbsd.yml rename to openbsd/sysupgrade/tasks/openbsd.yml diff --git a/webserver/defaults/main.yml b/openbsd/webserver/defaults/main.yml similarity index 100% rename from webserver/defaults/main.yml rename to openbsd/webserver/defaults/main.yml diff --git a/webserver/handlers/main.yml b/openbsd/webserver/handlers/main.yml similarity index 100% rename from webserver/handlers/main.yml rename to openbsd/webserver/handlers/main.yml diff --git a/webserver/tasks/common.yml b/openbsd/webserver/tasks/common.yml similarity index 100% rename from webserver/tasks/common.yml rename to openbsd/webserver/tasks/common.yml diff --git a/webserver/tasks/main.yml b/openbsd/webserver/tasks/main.yml similarity index 100% rename from webserver/tasks/main.yml rename to openbsd/webserver/tasks/main.yml diff --git a/webserver/tasks/openbsd.yml b/openbsd/webserver/tasks/openbsd.yml similarity index 100% rename from webserver/tasks/openbsd.yml rename to openbsd/webserver/tasks/openbsd.yml diff --git a/webserver/templates/acme-client.conf b/openbsd/webserver/templates/acme-client.conf similarity index 100% rename from webserver/templates/acme-client.conf rename to openbsd/webserver/templates/acme-client.conf diff --git a/webserver/templates/httpd.conf b/openbsd/webserver/templates/httpd.conf similarity index 100% rename from webserver/templates/httpd.conf rename to openbsd/webserver/templates/httpd.conf diff --git a/webserver/vars/main.yml b/openbsd/webserver/vars/main.yml similarity index 100% rename from webserver/vars/main.yml rename to openbsd/webserver/vars/main.yml