diff --git a/.drone.yml b/.drone.yml index 3c87aef..5520b23 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,7 +37,7 @@ steps: image: registry.tobiasmanske.de/ansible-runner:latest pull: always commands: - - cd coreos-config + - cd ansible - mkdir $ANSIBLE_HOME - ansible-galaxy install -r requirements.yaml - ansible-playbook --private-key ../ssh_key --inventory=inventory.yaml runner-pre.yaml @@ -45,7 +45,7 @@ steps: image: registry.tobiasmanske.de/ansible-runner:latest pull: always commands: - - cd coreos-config + - cd ansible - ansible-playbook --private-key ../ssh_key --inventory=inventory.yaml playbook.yaml - name: Validate Ansible image: registry.tobiasmanske.de/ansible-runner:latest @@ -54,7 +54,7 @@ steps: ANSIBLE_VAULT_PASSWORD_FILE: "/drone/src/vault_pass" ANSIBLE_FORCE_COLOR: "true" commands: - - cd coreos-config + - cd ansible - ansible-galaxy install -r requirements.yaml - ansible-playbook --check --private-key ../ssh_key --inventory=inventory.yaml playbook.yaml diff --git a/coreos-config/.gitignore b/ansible/.gitignore similarity index 100% rename from coreos-config/.gitignore rename to ansible/.gitignore diff --git a/coreos-config/ansible.cfg b/ansible/ansible.cfg similarity index 100% rename from coreos-config/ansible.cfg rename to ansible/ansible.cfg diff --git a/coreos-config/group_vars/all/main.yaml b/ansible/group_vars/all/main.yaml similarity index 100% rename from coreos-config/group_vars/all/main.yaml rename to ansible/group_vars/all/main.yaml diff --git a/coreos-config/group_vars/all/networks.yaml b/ansible/group_vars/all/networks.yaml similarity index 100% rename from coreos-config/group_vars/all/networks.yaml rename to ansible/group_vars/all/networks.yaml diff --git a/coreos-config/group_vars/all/vault.yaml b/ansible/group_vars/all/vault.yaml similarity index 100% rename from coreos-config/group_vars/all/vault.yaml rename to ansible/group_vars/all/vault.yaml diff --git a/coreos-config/host_vars/host.nc.chaoswg.org/vault.yaml b/ansible/host_vars/host.nc.chaoswg.org/vault.yaml similarity index 100% rename from coreos-config/host_vars/host.nc.chaoswg.org/vault.yaml rename to ansible/host_vars/host.nc.chaoswg.org/vault.yaml diff --git a/coreos-config/host_vars/host.nc.chaoswg.org/wireguard-peers.yaml b/ansible/host_vars/host.nc.chaoswg.org/wireguard-peers.yaml similarity index 100% rename from coreos-config/host_vars/host.nc.chaoswg.org/wireguard-peers.yaml rename to ansible/host_vars/host.nc.chaoswg.org/wireguard-peers.yaml diff --git a/coreos-config/host_vars/infra.unruhig.eu/vault.yaml b/ansible/host_vars/infra.unruhig.eu/vault.yaml similarity index 100% rename from coreos-config/host_vars/infra.unruhig.eu/vault.yaml rename to ansible/host_vars/infra.unruhig.eu/vault.yaml diff --git a/coreos-config/host_vars/mon1.hel1.chaoswg.org/vault.yaml b/ansible/host_vars/mon1.hel1.chaoswg.org/vault.yaml similarity index 100% rename from coreos-config/host_vars/mon1.hel1.chaoswg.org/vault.yaml rename to ansible/host_vars/mon1.hel1.chaoswg.org/vault.yaml diff --git a/coreos-config/host_vars/thonkpad.ka.chaoswg.org/vault.yaml b/ansible/host_vars/thonkpad.ka.chaoswg.org/vault.yaml similarity index 100% rename from coreos-config/host_vars/thonkpad.ka.chaoswg.org/vault.yaml rename to ansible/host_vars/thonkpad.ka.chaoswg.org/vault.yaml diff --git a/coreos-config/host_vars/thonkpad.ka.chaoswg.org/wireguard-peers.yaml b/ansible/host_vars/thonkpad.ka.chaoswg.org/wireguard-peers.yaml similarity index 100% rename from coreos-config/host_vars/thonkpad.ka.chaoswg.org/wireguard-peers.yaml rename to ansible/host_vars/thonkpad.ka.chaoswg.org/wireguard-peers.yaml diff --git a/coreos-config/inventory.yaml b/ansible/inventory.yaml similarity index 100% rename from coreos-config/inventory.yaml rename to ansible/inventory.yaml diff --git a/coreos-config/known_hosts b/ansible/known_hosts similarity index 100% rename from coreos-config/known_hosts rename to ansible/known_hosts diff --git a/coreos-config/playbook.yaml b/ansible/playbook.yaml similarity index 100% rename from coreos-config/playbook.yaml rename to ansible/playbook.yaml diff --git a/coreos-config/plays/common.yaml b/ansible/plays/common.yaml similarity index 100% rename from coreos-config/plays/common.yaml rename to ansible/plays/common.yaml diff --git a/coreos-config/plays/infra.yaml b/ansible/plays/infra.yaml similarity index 100% rename from coreos-config/plays/infra.yaml rename to ansible/plays/infra.yaml diff --git a/coreos-config/plays/monitoring.yaml b/ansible/plays/monitoring.yaml similarity index 100% rename from coreos-config/plays/monitoring.yaml rename to ansible/plays/monitoring.yaml diff --git a/coreos-config/plays/services/ba-gitlab-runner/.env b/ansible/plays/services/ba-gitlab-runner/.env similarity index 100% rename from coreos-config/plays/services/ba-gitlab-runner/.env rename to ansible/plays/services/ba-gitlab-runner/.env diff --git a/coreos-config/plays/services/ba-gitlab-runner/docker-compose.yaml b/ansible/plays/services/ba-gitlab-runner/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/ba-gitlab-runner/docker-compose.yaml rename to ansible/plays/services/ba-gitlab-runner/docker-compose.yaml diff --git a/coreos-config/plays/services/blog/.env b/ansible/plays/services/blog/.env similarity index 100% rename from coreos-config/plays/services/blog/.env rename to ansible/plays/services/blog/.env diff --git a/coreos-config/plays/services/blog/docker-compose.yaml b/ansible/plays/services/blog/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/blog/docker-compose.yaml rename to ansible/plays/services/blog/docker-compose.yaml diff --git a/coreos-config/plays/services/caddy/.env b/ansible/plays/services/caddy/.env similarity index 100% rename from coreos-config/plays/services/caddy/.env rename to ansible/plays/services/caddy/.env diff --git a/coreos-config/plays/services/caddy/Caddyfile b/ansible/plays/services/caddy/Caddyfile similarity index 100% rename from coreos-config/plays/services/caddy/Caddyfile rename to ansible/plays/services/caddy/Caddyfile diff --git a/coreos-config/plays/services/caddy/docker-compose.yaml b/ansible/plays/services/caddy/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/caddy/docker-compose.yaml rename to ansible/plays/services/caddy/docker-compose.yaml diff --git a/coreos-config/plays/services/diun/.env b/ansible/plays/services/diun/.env similarity index 100% rename from coreos-config/plays/services/diun/.env rename to ansible/plays/services/diun/.env diff --git a/coreos-config/plays/services/diun/diun.yml b/ansible/plays/services/diun/diun.yml similarity index 100% rename from coreos-config/plays/services/diun/diun.yml rename to ansible/plays/services/diun/diun.yml diff --git a/coreos-config/plays/services/diun/docker-compose.yaml b/ansible/plays/services/diun/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/diun/docker-compose.yaml rename to ansible/plays/services/diun/docker-compose.yaml diff --git a/coreos-config/plays/services/diun/watch.yml b/ansible/plays/services/diun/watch.yml similarity index 100% rename from coreos-config/plays/services/diun/watch.yml rename to ansible/plays/services/diun/watch.yml diff --git a/coreos-config/plays/services/gitea-runner/.env b/ansible/plays/services/gitea-runner/.env similarity index 100% rename from coreos-config/plays/services/gitea-runner/.env rename to ansible/plays/services/gitea-runner/.env diff --git a/coreos-config/plays/services/gitea-runner/docker-compose.yaml b/ansible/plays/services/gitea-runner/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/gitea-runner/docker-compose.yaml rename to ansible/plays/services/gitea-runner/docker-compose.yaml diff --git a/coreos-config/plays/services/gitea/.env b/ansible/plays/services/gitea/.env similarity index 100% rename from coreos-config/plays/services/gitea/.env rename to ansible/plays/services/gitea/.env diff --git a/coreos-config/plays/services/gitea/docker-compose.yaml b/ansible/plays/services/gitea/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/gitea/docker-compose.yaml rename to ansible/plays/services/gitea/docker-compose.yaml diff --git a/coreos-config/plays/services/hedgedoc/.env b/ansible/plays/services/hedgedoc/.env similarity index 100% rename from coreos-config/plays/services/hedgedoc/.env rename to ansible/plays/services/hedgedoc/.env diff --git a/coreos-config/plays/services/hedgedoc/docker-compose.yaml b/ansible/plays/services/hedgedoc/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/hedgedoc/docker-compose.yaml rename to ansible/plays/services/hedgedoc/docker-compose.yaml diff --git a/coreos-config/plays/services/keycloak/.env b/ansible/plays/services/keycloak/.env similarity index 100% rename from coreos-config/plays/services/keycloak/.env rename to ansible/plays/services/keycloak/.env diff --git a/coreos-config/plays/services/keycloak/docker-compose.yaml b/ansible/plays/services/keycloak/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/keycloak/docker-compose.yaml rename to ansible/plays/services/keycloak/docker-compose.yaml diff --git a/coreos-config/plays/services/kuma/.env b/ansible/plays/services/kuma/.env similarity index 100% rename from coreos-config/plays/services/kuma/.env rename to ansible/plays/services/kuma/.env diff --git a/coreos-config/plays/services/kuma/docker-compose.yaml b/ansible/plays/services/kuma/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/kuma/docker-compose.yaml rename to ansible/plays/services/kuma/docker-compose.yaml diff --git a/coreos-config/plays/services/linktree/.env b/ansible/plays/services/linktree/.env similarity index 100% rename from coreos-config/plays/services/linktree/.env rename to ansible/plays/services/linktree/.env diff --git a/coreos-config/plays/services/linktree/docker-compose.yaml b/ansible/plays/services/linktree/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/linktree/docker-compose.yaml rename to ansible/plays/services/linktree/docker-compose.yaml diff --git a/coreos-config/plays/services/matrix/.env b/ansible/plays/services/matrix/.env similarity index 100% rename from coreos-config/plays/services/matrix/.env rename to ansible/plays/services/matrix/.env diff --git a/coreos-config/plays/services/matrix/Caddyfile b/ansible/plays/services/matrix/Caddyfile similarity index 100% rename from coreos-config/plays/services/matrix/Caddyfile rename to ansible/plays/services/matrix/Caddyfile diff --git a/coreos-config/plays/services/matrix/cinny-config.json b/ansible/plays/services/matrix/cinny-config.json similarity index 100% rename from coreos-config/plays/services/matrix/cinny-config.json rename to ansible/plays/services/matrix/cinny-config.json diff --git a/coreos-config/plays/services/matrix/docker-compose.yaml b/ansible/plays/services/matrix/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/matrix/docker-compose.yaml rename to ansible/plays/services/matrix/docker-compose.yaml diff --git a/coreos-config/plays/services/matrix/mautrix-signal/config.yaml b/ansible/plays/services/matrix/mautrix-signal/config.yaml similarity index 100% rename from coreos-config/plays/services/matrix/mautrix-signal/config.yaml rename to ansible/plays/services/matrix/mautrix-signal/config.yaml diff --git a/coreos-config/plays/services/matrix/mautrix-signal/registration.yaml b/ansible/plays/services/matrix/mautrix-signal/registration.yaml similarity index 100% rename from coreos-config/plays/services/matrix/mautrix-signal/registration.yaml rename to ansible/plays/services/matrix/mautrix-signal/registration.yaml diff --git a/coreos-config/plays/services/matrix/mautrix-slack/config.yaml b/ansible/plays/services/matrix/mautrix-slack/config.yaml similarity index 100% rename from coreos-config/plays/services/matrix/mautrix-slack/config.yaml rename to ansible/plays/services/matrix/mautrix-slack/config.yaml diff --git a/coreos-config/plays/services/matrix/mautrix-slack/registration.yaml b/ansible/plays/services/matrix/mautrix-slack/registration.yaml similarity index 100% rename from coreos-config/plays/services/matrix/mautrix-slack/registration.yaml rename to ansible/plays/services/matrix/mautrix-slack/registration.yaml diff --git a/coreos-config/plays/services/matrix/mautrix-telegram/config.yaml b/ansible/plays/services/matrix/mautrix-telegram/config.yaml similarity index 100% rename from coreos-config/plays/services/matrix/mautrix-telegram/config.yaml rename to ansible/plays/services/matrix/mautrix-telegram/config.yaml diff --git a/coreos-config/plays/services/matrix/mautrix-telegram/registration.yaml b/ansible/plays/services/matrix/mautrix-telegram/registration.yaml similarity index 100% rename from coreos-config/plays/services/matrix/mautrix-telegram/registration.yaml rename to ansible/plays/services/matrix/mautrix-telegram/registration.yaml diff --git a/coreos-config/plays/services/matrix/synapse-config/homeserver.yaml b/ansible/plays/services/matrix/synapse-config/homeserver.yaml similarity index 100% rename from coreos-config/plays/services/matrix/synapse-config/homeserver.yaml rename to ansible/plays/services/matrix/synapse-config/homeserver.yaml diff --git a/coreos-config/plays/services/matrix/synapse-config/tobiasmanske.de.log.config b/ansible/plays/services/matrix/synapse-config/tobiasmanske.de.log.config similarity index 100% rename from coreos-config/plays/services/matrix/synapse-config/tobiasmanske.de.log.config rename to ansible/plays/services/matrix/synapse-config/tobiasmanske.de.log.config diff --git a/coreos-config/plays/services/matrix/synapse-config/tobiasmanske.de.signing.key b/ansible/plays/services/matrix/synapse-config/tobiasmanske.de.signing.key similarity index 100% rename from coreos-config/plays/services/matrix/synapse-config/tobiasmanske.de.signing.key rename to ansible/plays/services/matrix/synapse-config/tobiasmanske.de.signing.key diff --git a/coreos-config/plays/services/maubot/.env b/ansible/plays/services/maubot/.env similarity index 100% rename from coreos-config/plays/services/maubot/.env rename to ansible/plays/services/maubot/.env diff --git a/coreos-config/plays/services/maubot/docker-compose.yaml b/ansible/plays/services/maubot/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/maubot/docker-compose.yaml rename to ansible/plays/services/maubot/docker-compose.yaml diff --git a/coreos-config/plays/services/miniflux/.env b/ansible/plays/services/miniflux/.env similarity index 100% rename from coreos-config/plays/services/miniflux/.env rename to ansible/plays/services/miniflux/.env diff --git a/coreos-config/plays/services/miniflux/docker-compose.yaml b/ansible/plays/services/miniflux/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/miniflux/docker-compose.yaml rename to ansible/plays/services/miniflux/docker-compose.yaml diff --git a/coreos-config/plays/services/minio/.env b/ansible/plays/services/minio/.env similarity index 100% rename from coreos-config/plays/services/minio/.env rename to ansible/plays/services/minio/.env diff --git a/coreos-config/plays/services/minio/docker-compose.yaml b/ansible/plays/services/minio/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/minio/docker-compose.yaml rename to ansible/plays/services/minio/docker-compose.yaml diff --git a/coreos-config/plays/services/pantalaimon/.env b/ansible/plays/services/pantalaimon/.env similarity index 100% rename from coreos-config/plays/services/pantalaimon/.env rename to ansible/plays/services/pantalaimon/.env diff --git a/coreos-config/plays/services/pantalaimon/docker-compose.yaml b/ansible/plays/services/pantalaimon/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/pantalaimon/docker-compose.yaml rename to ansible/plays/services/pantalaimon/docker-compose.yaml diff --git a/coreos-config/plays/services/pantalaimon/pantalaimon.conf b/ansible/plays/services/pantalaimon/pantalaimon.conf similarity index 100% rename from coreos-config/plays/services/pantalaimon/pantalaimon.conf rename to ansible/plays/services/pantalaimon/pantalaimon.conf diff --git a/coreos-config/plays/services/prometheus/.env b/ansible/plays/services/prometheus/.env similarity index 100% rename from coreos-config/plays/services/prometheus/.env rename to ansible/plays/services/prometheus/.env diff --git a/coreos-config/plays/services/prometheus/alertmanager.yml b/ansible/plays/services/prometheus/alertmanager.yml similarity index 100% rename from coreos-config/plays/services/prometheus/alertmanager.yml rename to ansible/plays/services/prometheus/alertmanager.yml diff --git a/coreos-config/plays/services/prometheus/docker-compose.yaml b/ansible/plays/services/prometheus/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/prometheus/docker-compose.yaml rename to ansible/plays/services/prometheus/docker-compose.yaml diff --git a/coreos-config/plays/services/prometheus/grafana-dashboards/cadvisor.json b/ansible/plays/services/prometheus/grafana-dashboards/cadvisor.json similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-dashboards/cadvisor.json rename to ansible/plays/services/prometheus/grafana-dashboards/cadvisor.json diff --git a/coreos-config/plays/services/prometheus/grafana-dashboards/droneci.json b/ansible/plays/services/prometheus/grafana-dashboards/droneci.json similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-dashboards/droneci.json rename to ansible/plays/services/prometheus/grafana-dashboards/droneci.json diff --git a/coreos-config/plays/services/prometheus/grafana-dashboards/hedgedoc.json b/ansible/plays/services/prometheus/grafana-dashboards/hedgedoc.json similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-dashboards/hedgedoc.json rename to ansible/plays/services/prometheus/grafana-dashboards/hedgedoc.json diff --git a/coreos-config/plays/services/prometheus/grafana-dashboards/kuma.json b/ansible/plays/services/prometheus/grafana-dashboards/kuma.json similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-dashboards/kuma.json rename to ansible/plays/services/prometheus/grafana-dashboards/kuma.json diff --git a/coreos-config/plays/services/prometheus/grafana-dashboards/miniflux.json b/ansible/plays/services/prometheus/grafana-dashboards/miniflux.json similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-dashboards/miniflux.json rename to ansible/plays/services/prometheus/grafana-dashboards/miniflux.json diff --git a/coreos-config/plays/services/prometheus/grafana-dashboards/minio.json b/ansible/plays/services/prometheus/grafana-dashboards/minio.json similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-dashboards/minio.json rename to ansible/plays/services/prometheus/grafana-dashboards/minio.json diff --git a/coreos-config/plays/services/prometheus/grafana-dashboards/prometheus-stats.json b/ansible/plays/services/prometheus/grafana-dashboards/prometheus-stats.json similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-dashboards/prometheus-stats.json rename to ansible/plays/services/prometheus/grafana-dashboards/prometheus-stats.json diff --git a/coreos-config/plays/services/prometheus/grafana-dashboards/synapse.json b/ansible/plays/services/prometheus/grafana-dashboards/synapse.json similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-dashboards/synapse.json rename to ansible/plays/services/prometheus/grafana-dashboards/synapse.json diff --git a/coreos-config/plays/services/prometheus/grafana-dashboards/traefik2.json b/ansible/plays/services/prometheus/grafana-dashboards/traefik2.json similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-dashboards/traefik2.json rename to ansible/plays/services/prometheus/grafana-dashboards/traefik2.json diff --git a/coreos-config/plays/services/prometheus/grafana-db.yml b/ansible/plays/services/prometheus/grafana-db.yml similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-db.yml rename to ansible/plays/services/prometheus/grafana-db.yml diff --git a/coreos-config/plays/services/prometheus/grafana-ds.yml b/ansible/plays/services/prometheus/grafana-ds.yml similarity index 100% rename from coreos-config/plays/services/prometheus/grafana-ds.yml rename to ansible/plays/services/prometheus/grafana-ds.yml diff --git a/coreos-config/plays/services/prometheus/loki.yml b/ansible/plays/services/prometheus/loki.yml similarity index 100% rename from coreos-config/plays/services/prometheus/loki.yml rename to ansible/plays/services/prometheus/loki.yml diff --git a/coreos-config/plays/services/prometheus/mimir.yml b/ansible/plays/services/prometheus/mimir.yml similarity index 100% rename from coreos-config/plays/services/prometheus/mimir.yml rename to ansible/plays/services/prometheus/mimir.yml diff --git a/coreos-config/plays/services/prometheus/prometheus.yml b/ansible/plays/services/prometheus/prometheus.yml similarity index 100% rename from coreos-config/plays/services/prometheus/prometheus.yml rename to ansible/plays/services/prometheus/prometheus.yml diff --git a/coreos-config/plays/services/prometheus/promtail.yml b/ansible/plays/services/prometheus/promtail.yml similarity index 100% rename from coreos-config/plays/services/prometheus/promtail.yml rename to ansible/plays/services/prometheus/promtail.yml diff --git a/coreos-config/plays/services/prometheus/rules/cadvisor.yaml b/ansible/plays/services/prometheus/rules/cadvisor.yaml similarity index 100% rename from coreos-config/plays/services/prometheus/rules/cadvisor.yaml rename to ansible/plays/services/prometheus/rules/cadvisor.yaml diff --git a/coreos-config/plays/services/prometheus/rules/node.yaml b/ansible/plays/services/prometheus/rules/node.yaml similarity index 100% rename from coreos-config/plays/services/prometheus/rules/node.yaml rename to ansible/plays/services/prometheus/rules/node.yaml diff --git a/coreos-config/plays/services/prometheus/rules/prometheus.yaml b/ansible/plays/services/prometheus/rules/prometheus.yaml similarity index 100% rename from coreos-config/plays/services/prometheus/rules/prometheus.yaml rename to ansible/plays/services/prometheus/rules/prometheus.yaml diff --git a/coreos-config/plays/services/radicale/.env b/ansible/plays/services/radicale/.env similarity index 100% rename from coreos-config/plays/services/radicale/.env rename to ansible/plays/services/radicale/.env diff --git a/coreos-config/plays/services/radicale/config b/ansible/plays/services/radicale/config similarity index 100% rename from coreos-config/plays/services/radicale/config rename to ansible/plays/services/radicale/config diff --git a/coreos-config/plays/services/radicale/docker-compose.yaml b/ansible/plays/services/radicale/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/radicale/docker-compose.yaml rename to ansible/plays/services/radicale/docker-compose.yaml diff --git a/coreos-config/plays/services/radicale/users b/ansible/plays/services/radicale/users similarity index 100% rename from coreos-config/plays/services/radicale/users rename to ansible/plays/services/radicale/users diff --git a/coreos-config/plays/services/registry/.env b/ansible/plays/services/registry/.env similarity index 100% rename from coreos-config/plays/services/registry/.env rename to ansible/plays/services/registry/.env diff --git a/coreos-config/plays/services/registry/auth_config.yaml b/ansible/plays/services/registry/auth_config.yaml similarity index 100% rename from coreos-config/plays/services/registry/auth_config.yaml rename to ansible/plays/services/registry/auth_config.yaml diff --git a/coreos-config/plays/services/registry/config.yaml b/ansible/plays/services/registry/config.yaml similarity index 100% rename from coreos-config/plays/services/registry/config.yaml rename to ansible/plays/services/registry/config.yaml diff --git a/coreos-config/plays/services/registry/docker-compose.yaml b/ansible/plays/services/registry/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/registry/docker-compose.yaml rename to ansible/plays/services/registry/docker-compose.yaml diff --git a/coreos-config/plays/services/registry/server.key b/ansible/plays/services/registry/server.key similarity index 100% rename from coreos-config/plays/services/registry/server.key rename to ansible/plays/services/registry/server.key diff --git a/coreos-config/plays/services/registry/server.pem b/ansible/plays/services/registry/server.pem similarity index 100% rename from coreos-config/plays/services/registry/server.pem rename to ansible/plays/services/registry/server.pem diff --git a/coreos-config/plays/services/repo_proxy/.env b/ansible/plays/services/repo_proxy/.env similarity index 100% rename from coreos-config/plays/services/repo_proxy/.env rename to ansible/plays/services/repo_proxy/.env diff --git a/coreos-config/plays/services/repo_proxy/Caddyfile b/ansible/plays/services/repo_proxy/Caddyfile similarity index 100% rename from coreos-config/plays/services/repo_proxy/Caddyfile rename to ansible/plays/services/repo_proxy/Caddyfile diff --git a/coreos-config/plays/services/repo_proxy/docker-compose.yaml b/ansible/plays/services/repo_proxy/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/repo_proxy/docker-compose.yaml rename to ansible/plays/services/repo_proxy/docker-compose.yaml diff --git a/coreos-config/plays/services/repo_proxy/www/index.html b/ansible/plays/services/repo_proxy/www/index.html similarity index 100% rename from coreos-config/plays/services/repo_proxy/www/index.html rename to ansible/plays/services/repo_proxy/www/index.html diff --git a/coreos-config/plays/services/search/.env b/ansible/plays/services/search/.env similarity index 100% rename from coreos-config/plays/services/search/.env rename to ansible/plays/services/search/.env diff --git a/coreos-config/plays/services/search/docker-compose.yaml b/ansible/plays/services/search/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/search/docker-compose.yaml rename to ansible/plays/services/search/docker-compose.yaml diff --git a/coreos-config/plays/services/search/limiter.toml b/ansible/plays/services/search/limiter.toml similarity index 100% rename from coreos-config/plays/services/search/limiter.toml rename to ansible/plays/services/search/limiter.toml diff --git a/coreos-config/plays/services/search/settings.yml b/ansible/plays/services/search/settings.yml similarity index 100% rename from coreos-config/plays/services/search/settings.yml rename to ansible/plays/services/search/settings.yml diff --git a/coreos-config/plays/services/search/uwsgi.ini b/ansible/plays/services/search/uwsgi.ini similarity index 100% rename from coreos-config/plays/services/search/uwsgi.ini rename to ansible/plays/services/search/uwsgi.ini diff --git a/coreos-config/plays/services/syncthing/.env b/ansible/plays/services/syncthing/.env similarity index 100% rename from coreos-config/plays/services/syncthing/.env rename to ansible/plays/services/syncthing/.env diff --git a/coreos-config/plays/services/syncthing/config/cert.pem b/ansible/plays/services/syncthing/config/cert.pem similarity index 100% rename from coreos-config/plays/services/syncthing/config/cert.pem rename to ansible/plays/services/syncthing/config/cert.pem diff --git a/coreos-config/plays/services/syncthing/config/config.xml b/ansible/plays/services/syncthing/config/config.xml similarity index 100% rename from coreos-config/plays/services/syncthing/config/config.xml rename to ansible/plays/services/syncthing/config/config.xml diff --git a/coreos-config/plays/services/syncthing/config/key.pem b/ansible/plays/services/syncthing/config/key.pem similarity index 100% rename from coreos-config/plays/services/syncthing/config/key.pem rename to ansible/plays/services/syncthing/config/key.pem diff --git a/coreos-config/plays/services/syncthing/docker-compose.yaml b/ansible/plays/services/syncthing/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/syncthing/docker-compose.yaml rename to ansible/plays/services/syncthing/docker-compose.yaml diff --git a/coreos-config/plays/services/thelounge/.env b/ansible/plays/services/thelounge/.env similarity index 100% rename from coreos-config/plays/services/thelounge/.env rename to ansible/plays/services/thelounge/.env diff --git a/coreos-config/plays/services/thelounge/docker-compose.yaml b/ansible/plays/services/thelounge/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/thelounge/docker-compose.yaml rename to ansible/plays/services/thelounge/docker-compose.yaml diff --git a/coreos-config/plays/services/traefik/.env b/ansible/plays/services/traefik/.env similarity index 100% rename from coreos-config/plays/services/traefik/.env rename to ansible/plays/services/traefik/.env diff --git a/coreos-config/plays/services/traefik/docker-compose.yaml b/ansible/plays/services/traefik/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/traefik/docker-compose.yaml rename to ansible/plays/services/traefik/docker-compose.yaml diff --git a/coreos-config/plays/services/traefik/dynamic.yaml b/ansible/plays/services/traefik/dynamic.yaml similarity index 100% rename from coreos-config/plays/services/traefik/dynamic.yaml rename to ansible/plays/services/traefik/dynamic.yaml diff --git a/coreos-config/plays/services/traefik/traefik.yaml b/ansible/plays/services/traefik/traefik.yaml similarity index 100% rename from coreos-config/plays/services/traefik/traefik.yaml rename to ansible/plays/services/traefik/traefik.yaml diff --git a/coreos-config/plays/services/watchtower/.env b/ansible/plays/services/watchtower/.env similarity index 100% rename from coreos-config/plays/services/watchtower/.env rename to ansible/plays/services/watchtower/.env diff --git a/coreos-config/plays/services/watchtower/docker-compose.yaml b/ansible/plays/services/watchtower/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/watchtower/docker-compose.yaml rename to ansible/plays/services/watchtower/docker-compose.yaml diff --git a/coreos-config/plays/services/wireguard/.env b/ansible/plays/services/wireguard/.env similarity index 100% rename from coreos-config/plays/services/wireguard/.env rename to ansible/plays/services/wireguard/.env diff --git a/coreos-config/plays/services/wireguard/docker-compose.yaml b/ansible/plays/services/wireguard/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/wireguard/docker-compose.yaml rename to ansible/plays/services/wireguard/docker-compose.yaml diff --git a/coreos-config/plays/services/wireguard/wg0.conf b/ansible/plays/services/wireguard/wg0.conf similarity index 100% rename from coreos-config/plays/services/wireguard/wg0.conf rename to ansible/plays/services/wireguard/wg0.conf diff --git a/coreos-config/plays/services/wkd/.env b/ansible/plays/services/wkd/.env similarity index 100% rename from coreos-config/plays/services/wkd/.env rename to ansible/plays/services/wkd/.env diff --git a/coreos-config/plays/services/wkd/Caddyfile b/ansible/plays/services/wkd/Caddyfile similarity index 100% rename from coreos-config/plays/services/wkd/Caddyfile rename to ansible/plays/services/wkd/Caddyfile diff --git a/coreos-config/plays/services/wkd/data/tobiasmanske.de/dizb37aqa5h4skgu7jf1xjr4q71w4paq b/ansible/plays/services/wkd/data/tobiasmanske.de/dizb37aqa5h4skgu7jf1xjr4q71w4paq similarity index 100% rename from coreos-config/plays/services/wkd/data/tobiasmanske.de/dizb37aqa5h4skgu7jf1xjr4q71w4paq rename to ansible/plays/services/wkd/data/tobiasmanske.de/dizb37aqa5h4skgu7jf1xjr4q71w4paq diff --git a/coreos-config/plays/services/wkd/data/tobiasmanske.de/nfse4krpjzrwtbwmo7m9hujznmf79t15 b/ansible/plays/services/wkd/data/tobiasmanske.de/nfse4krpjzrwtbwmo7m9hujznmf79t15 similarity index 100% rename from coreos-config/plays/services/wkd/data/tobiasmanske.de/nfse4krpjzrwtbwmo7m9hujznmf79t15 rename to ansible/plays/services/wkd/data/tobiasmanske.de/nfse4krpjzrwtbwmo7m9hujznmf79t15 diff --git a/coreos-config/plays/services/wkd/docker-compose.yaml b/ansible/plays/services/wkd/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/wkd/docker-compose.yaml rename to ansible/plays/services/wkd/docker-compose.yaml diff --git a/coreos-config/plays/services/youtrack/.env b/ansible/plays/services/youtrack/.env similarity index 100% rename from coreos-config/plays/services/youtrack/.env rename to ansible/plays/services/youtrack/.env diff --git a/coreos-config/plays/services/youtrack/docker-compose.yaml b/ansible/plays/services/youtrack/docker-compose.yaml similarity index 100% rename from coreos-config/plays/services/youtrack/docker-compose.yaml rename to ansible/plays/services/youtrack/docker-compose.yaml diff --git a/coreos-config/plays/templates/backup.sh.j2 b/ansible/plays/templates/backup.sh.j2 similarity index 100% rename from coreos-config/plays/templates/backup.sh.j2 rename to ansible/plays/templates/backup.sh.j2 diff --git a/coreos-config/plays/templates/connection.nmconnection.j2 b/ansible/plays/templates/connection.nmconnection.j2 similarity index 100% rename from coreos-config/plays/templates/connection.nmconnection.j2 rename to ansible/plays/templates/connection.nmconnection.j2 diff --git a/coreos-config/plays/templates/docker-config.json.j2 b/ansible/plays/templates/docker-config.json.j2 similarity index 100% rename from coreos-config/plays/templates/docker-config.json.j2 rename to ansible/plays/templates/docker-config.json.j2 diff --git a/coreos-config/plays/templates/docker-daemon.json.j2 b/ansible/plays/templates/docker-daemon.json.j2 similarity index 100% rename from coreos-config/plays/templates/docker-daemon.json.j2 rename to ansible/plays/templates/docker-daemon.json.j2 diff --git a/coreos-config/plays/templates/heartbeat.service.j2 b/ansible/plays/templates/heartbeat.service.j2 similarity index 100% rename from coreos-config/plays/templates/heartbeat.service.j2 rename to ansible/plays/templates/heartbeat.service.j2 diff --git a/coreos-config/plays/templates/heartbeat.timer.j2 b/ansible/plays/templates/heartbeat.timer.j2 similarity index 100% rename from coreos-config/plays/templates/heartbeat.timer.j2 rename to ansible/plays/templates/heartbeat.timer.j2 diff --git a/coreos-config/plays/templates/restore.sh.j2 b/ansible/plays/templates/restore.sh.j2 similarity index 100% rename from coreos-config/plays/templates/restore.sh.j2 rename to ansible/plays/templates/restore.sh.j2 diff --git a/coreos-config/plays/templates/sshd_config.j2 b/ansible/plays/templates/sshd_config.j2 similarity index 100% rename from coreos-config/plays/templates/sshd_config.j2 rename to ansible/plays/templates/sshd_config.j2 diff --git a/coreos-config/plays/templates/storagebox.j2 b/ansible/plays/templates/storagebox.j2 similarity index 100% rename from coreos-config/plays/templates/storagebox.j2 rename to ansible/plays/templates/storagebox.j2 diff --git a/coreos-config/plays/templates/wg_infra.conf.j2 b/ansible/plays/templates/wg_infra.conf.j2 similarity index 100% rename from coreos-config/plays/templates/wg_infra.conf.j2 rename to ansible/plays/templates/wg_infra.conf.j2 diff --git a/coreos-config/plays/thonkpad.yaml b/ansible/plays/thonkpad.yaml similarity index 100% rename from coreos-config/plays/thonkpad.yaml rename to ansible/plays/thonkpad.yaml diff --git a/coreos-config/plays/vpn.yaml b/ansible/plays/vpn.yaml similarity index 100% rename from coreos-config/plays/vpn.yaml rename to ansible/plays/vpn.yaml diff --git a/coreos-config/plays/vps.yaml b/ansible/plays/vps.yaml similarity index 100% rename from coreos-config/plays/vps.yaml rename to ansible/plays/vps.yaml diff --git a/coreos-config/regenerate-known-hosts.yaml b/ansible/regenerate-known-hosts.yaml similarity index 100% rename from coreos-config/regenerate-known-hosts.yaml rename to ansible/regenerate-known-hosts.yaml diff --git a/coreos-config/requirements.yaml b/ansible/requirements.yaml similarity index 100% rename from coreos-config/requirements.yaml rename to ansible/requirements.yaml diff --git a/coreos-config/runner-pre.yaml b/ansible/runner-pre.yaml similarity index 100% rename from coreos-config/runner-pre.yaml rename to ansible/runner-pre.yaml diff --git a/coreos-config/vault-keyring-client b/ansible/vault-keyring-client similarity index 100% rename from coreos-config/vault-keyring-client rename to ansible/vault-keyring-client diff --git a/restore-tests/.gitignore b/tf-stage-0/.gitignore similarity index 100% rename from restore-tests/.gitignore rename to tf-stage-0/.gitignore diff --git a/restore-tests/ansible.tf b/tf-stage-0/ansible.tf similarity index 100% rename from restore-tests/ansible.tf rename to tf-stage-0/ansible.tf diff --git a/restore-tests/butane/host.nc.chaoswg.org.bu b/tf-stage-0/butane/host.nc.chaoswg.org.bu similarity index 100% rename from restore-tests/butane/host.nc.chaoswg.org.bu rename to tf-stage-0/butane/host.nc.chaoswg.org.bu diff --git a/restore-tests/butane/infra.unruhig.eu b/tf-stage-0/butane/infra.unruhig.eu similarity index 100% rename from restore-tests/butane/infra.unruhig.eu rename to tf-stage-0/butane/infra.unruhig.eu diff --git a/restore-tests/butane/mon1.hel1.chaoswg.org.bu b/tf-stage-0/butane/mon1.hel1.chaoswg.org.bu similarity index 100% rename from restore-tests/butane/mon1.hel1.chaoswg.org.bu rename to tf-stage-0/butane/mon1.hel1.chaoswg.org.bu diff --git a/restore-tests/butane/thonkpad.ka.chaoswg.org.bu b/tf-stage-0/butane/thonkpad.ka.chaoswg.org.bu similarity index 100% rename from restore-tests/butane/thonkpad.ka.chaoswg.org.bu rename to tf-stage-0/butane/thonkpad.ka.chaoswg.org.bu diff --git a/restore-tests/configure.bu b/tf-stage-0/configure.bu similarity index 100% rename from restore-tests/configure.bu rename to tf-stage-0/configure.bu diff --git a/restore-tests/ignition.tf b/tf-stage-0/ignition.tf similarity index 100% rename from restore-tests/ignition.tf rename to tf-stage-0/ignition.tf diff --git a/restore-tests/main.tf b/tf-stage-0/main.tf similarity index 100% rename from restore-tests/main.tf rename to tf-stage-0/main.tf diff --git a/restore-tests/outputs.tf b/tf-stage-0/outputs.tf similarity index 100% rename from restore-tests/outputs.tf rename to tf-stage-0/outputs.tf diff --git a/restore-tests/templates/ansible.ign.tpl b/tf-stage-0/templates/ansible.ign.tpl similarity index 100% rename from restore-tests/templates/ansible.ign.tpl rename to tf-stage-0/templates/ansible.ign.tpl diff --git a/restore-tests/templates/inventory.yaml.tpl b/tf-stage-0/templates/inventory.yaml.tpl similarity index 100% rename from restore-tests/templates/inventory.yaml.tpl rename to tf-stage-0/templates/inventory.yaml.tpl diff --git a/restore-tests/variables.tf b/tf-stage-0/variables.tf similarity index 100% rename from restore-tests/variables.tf rename to tf-stage-0/variables.tf diff --git a/restore-tests/versions.tf b/tf-stage-0/versions.tf similarity index 100% rename from restore-tests/versions.tf rename to tf-stage-0/versions.tf