From a47fde9c9c00f07eff109b7f74d7afae5f344b44 Mon Sep 17 00:00:00 2001 From: saibotk Date: Sat, 26 Sep 2020 18:12:59 +0200 Subject: [PATCH] Rename roles to underscore This patch renames all roles with a `-` to `_`, to comply with the ansible-lint rule 106. As collection roles are now also limited to these symbols and this will make it easier to move them later. --- camo.yml | 4 ++-- codimd.yml | 4 ++-- docker-ipv6-nat.yml | 6 +++--- gitlab-runner.yml | 6 +++--- gitlab.yml | 4 ++-- keycloak.yml | 4 ++-- lvm-self-backup.yml | 2 +- mailcow.yml | 2 +- mastodon.yml | 4 ++-- minecraft-blockmap.yml | 6 +++--- minecraft.yml | 4 ++-- minio.yml | 4 ++-- monitoring.yml | 8 ++++---- roles/{docker-cleanup => docker_cleanup}/README.md | 2 +- roles/{docker-cleanup => docker_cleanup}/meta/main.yml | 0 roles/{docker-cleanup => docker_cleanup}/tasks/main.yml | 0 roles/{docker-compose => docker_compose}/README.md | 2 +- .../{docker-compose => docker_compose}/defaults/main.yml | 2 +- roles/{docker-compose => docker_compose}/meta/main.yml | 0 roles/{docker-compose => docker_compose}/tasks/main.yml | 0 .../templates/bin/docker-compose.j2 | 0 roles/{docker-ipv6-nat => docker_ipv6_nat}/README.md | 2 +- .../defaults/main.yml | 2 +- roles/{docker-ipv6-nat => docker_ipv6_nat}/meta/main.yml | 0 roles/{docker-ipv6-nat => docker_ipv6_nat}/tasks/main.yml | 2 +- .../templates/docker-compose.yml | 0 roles/{gitlab-runner => gitlab_runner}/README.md | 2 +- roles/{gitlab-runner => gitlab_runner}/defaults/main.yml | 2 +- roles/{gitlab-runner => gitlab_runner}/meta/main.yml | 0 roles/{gitlab-runner => gitlab_runner}/tasks/main.yml | 2 +- .../templates/config.toml | 0 .../templates/docker-compose.yml | 0 roles/{lvm-self-backup => lvm_self_backup}/README.md | 2 +- .../defaults/main.yml | 2 +- roles/{lvm-self-backup => lvm_self_backup}/meta/main.yml | 0 roles/{lvm-self-backup => lvm_self_backup}/tasks/main.yml | 2 +- .../templates/backup-lvm-ls.sh | 0 .../templates/backup-lvm.service | 0 .../templates/backup-lvm.sh | 0 .../templates/backup-lvm.timer | 0 .../{minecraft-blockmap => minecraft_blockmap}/README.md | 0 .../defaults/main.yml | 2 +- .../meta/main.yml | 0 .../tasks/main.yml | 2 +- .../templates/blockmap-render.service | 0 .../templates/blockmap-render.timer | 0 .../templates/blockmap.json | 0 .../templates/default.conf | 0 .../templates/docker-compose.yml | 0 .../templates/render.sh | 0 roles/{moby-engine => moby_engine}/README.md | 0 roles/{moby-engine => moby_engine}/defaults/main.yml | 2 +- roles/{moby-engine => moby_engine}/handlers/main.yml | 2 +- roles/{moby-engine => moby_engine}/meta/main.yml | 2 +- roles/{moby-engine => moby_engine}/tasks/Fedora-32.yml | 2 +- roles/{moby-engine => moby_engine}/tasks/main.yml | 2 +- roles/{unicorns-website => unicorns_website}/README.md | 0 .../defaults/main.yml | 2 +- .../{unicorns-website => unicorns_website}/meta/main.yml | 0 .../{unicorns-website => unicorns_website}/tasks/main.yml | 0 .../templates/.env.production | 0 .../templates/docker-compose.yml | 0 static_websites.yml => static-websites.yml | 4 ++-- teamspeak.yml | 4 ++-- unicorns_website.yml => unicorns-website.yml | 6 +++--- 65 files changed, 56 insertions(+), 56 deletions(-) rename roles/{docker-cleanup => docker_cleanup}/README.md (95%) rename roles/{docker-cleanup => docker_cleanup}/meta/main.yml (100%) rename roles/{docker-cleanup => docker_cleanup}/tasks/main.yml (100%) rename roles/{docker-compose => docker_compose}/README.md (98%) rename roles/{docker-compose => docker_compose}/defaults/main.yml (97%) rename roles/{docker-compose => docker_compose}/meta/main.yml (100%) rename roles/{docker-compose => docker_compose}/tasks/main.yml (100%) rename roles/{docker-compose => docker_compose}/templates/bin/docker-compose.j2 (100%) rename roles/{docker-ipv6-nat => docker_ipv6_nat}/README.md (98%) rename roles/{docker-ipv6-nat => docker_ipv6_nat}/defaults/main.yml (95%) rename roles/{docker-ipv6-nat => docker_ipv6_nat}/meta/main.yml (100%) rename roles/{docker-ipv6-nat => docker_ipv6_nat}/tasks/main.yml (97%) rename roles/{docker-ipv6-nat => docker_ipv6_nat}/templates/docker-compose.yml (100%) rename roles/{gitlab-runner => gitlab_runner}/README.md (99%) rename roles/{gitlab-runner => gitlab_runner}/defaults/main.yml (98%) rename roles/{gitlab-runner => gitlab_runner}/meta/main.yml (100%) rename roles/{gitlab-runner => gitlab_runner}/tasks/main.yml (98%) rename roles/{gitlab-runner => gitlab_runner}/templates/config.toml (100%) rename roles/{gitlab-runner => gitlab_runner}/templates/docker-compose.yml (100%) rename roles/{lvm-self-backup => lvm_self_backup}/README.md (98%) rename roles/{lvm-self-backup => lvm_self_backup}/defaults/main.yml (97%) rename roles/{lvm-self-backup => lvm_self_backup}/meta/main.yml (100%) rename roles/{lvm-self-backup => lvm_self_backup}/tasks/main.yml (97%) rename roles/{lvm-self-backup => lvm_self_backup}/templates/backup-lvm-ls.sh (100%) rename roles/{lvm-self-backup => lvm_self_backup}/templates/backup-lvm.service (100%) rename roles/{lvm-self-backup => lvm_self_backup}/templates/backup-lvm.sh (100%) rename roles/{lvm-self-backup => lvm_self_backup}/templates/backup-lvm.timer (100%) rename roles/{minecraft-blockmap => minecraft_blockmap}/README.md (100%) rename roles/{minecraft-blockmap => minecraft_blockmap}/defaults/main.yml (97%) rename roles/{minecraft-blockmap => minecraft_blockmap}/meta/main.yml (100%) rename roles/{minecraft-blockmap => minecraft_blockmap}/tasks/main.yml (98%) rename roles/{minecraft-blockmap => minecraft_blockmap}/templates/blockmap-render.service (100%) rename roles/{minecraft-blockmap => minecraft_blockmap}/templates/blockmap-render.timer (100%) rename roles/{minecraft-blockmap => minecraft_blockmap}/templates/blockmap.json (100%) rename roles/{minecraft-blockmap => minecraft_blockmap}/templates/default.conf (100%) rename roles/{minecraft-blockmap => minecraft_blockmap}/templates/docker-compose.yml (100%) rename roles/{minecraft-blockmap => minecraft_blockmap}/templates/render.sh (100%) rename roles/{moby-engine => moby_engine}/README.md (100%) rename roles/{moby-engine => moby_engine}/defaults/main.yml (94%) rename roles/{moby-engine => moby_engine}/handlers/main.yml (96%) rename roles/{moby-engine => moby_engine}/meta/main.yml (83%) rename roles/{moby-engine => moby_engine}/tasks/Fedora-32.yml (97%) rename roles/{moby-engine => moby_engine}/tasks/main.yml (96%) rename roles/{unicorns-website => unicorns_website}/README.md (100%) rename roles/{unicorns-website => unicorns_website}/defaults/main.yml (97%) rename roles/{unicorns-website => unicorns_website}/meta/main.yml (100%) rename roles/{unicorns-website => unicorns_website}/tasks/main.yml (100%) rename roles/{unicorns-website => unicorns_website}/templates/.env.production (100%) rename roles/{unicorns-website => unicorns_website}/templates/docker-compose.yml (100%) rename static_websites.yml => static-websites.yml (95%) rename unicorns_website.yml => unicorns-website.yml (94%) diff --git a/camo.yml b/camo.yml index 649d853..89884eb 100644 --- a/camo.yml +++ b/camo.yml @@ -20,8 +20,8 @@ - hosts: camo roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - camo environment: diff --git a/codimd.yml b/codimd.yml index c018b1d..fd49e70 100644 --- a/codimd.yml +++ b/codimd.yml @@ -19,8 +19,8 @@ - hosts: codimd roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - codimd environment: diff --git a/docker-ipv6-nat.yml b/docker-ipv6-nat.yml index 0ccd2cb..023a17a 100644 --- a/docker-ipv6-nat.yml +++ b/docker-ipv6-nat.yml @@ -19,8 +19,8 @@ - hosts: docker_ipv6_nat roles: - docker - - docker-compose - - docker-cleanup - - docker-ipv6-nat + - docker_compose + - docker_cleanup + - docker_ipv6_nat environment: PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages diff --git a/gitlab-runner.yml b/gitlab-runner.yml index 1402bd7..6772f48 100644 --- a/gitlab-runner.yml +++ b/gitlab-runner.yml @@ -20,8 +20,8 @@ - hosts: gitlab_runner roles: - docker - - docker-compose - - docker-cleanup - - gitlab-runner + - docker_compose + - docker_cleanup + - gitlab_runner environment: PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages diff --git a/gitlab.yml b/gitlab.yml index 551c6e1..8725082 100644 --- a/gitlab.yml +++ b/gitlab.yml @@ -20,8 +20,8 @@ - hosts: gitlab roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - gitlab environment: diff --git a/keycloak.yml b/keycloak.yml index fd63e34..a1e116a 100644 --- a/keycloak.yml +++ b/keycloak.yml @@ -20,8 +20,8 @@ - hosts: keycloak roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - keycloak environment: diff --git a/lvm-self-backup.yml b/lvm-self-backup.yml index d529322..7e282f5 100644 --- a/lvm-self-backup.yml +++ b/lvm-self-backup.yml @@ -19,6 +19,6 @@ - hosts: lvm_self_backup roles: - docker - - lvm-self-backup + - lvm_self_backup environment: PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages diff --git a/mailcow.yml b/mailcow.yml index deea73b..506b7f2 100644 --- a/mailcow.yml +++ b/mailcow.yml @@ -19,7 +19,7 @@ - hosts: mailcow roles: - docker - - docker-compose + - docker_compose environment: PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages diff --git a/mastodon.yml b/mastodon.yml index 75c89ae..a83d75b 100644 --- a/mastodon.yml +++ b/mastodon.yml @@ -20,8 +20,8 @@ - hosts: mastodon roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - mastodon environment: diff --git a/minecraft-blockmap.yml b/minecraft-blockmap.yml index 1f2e20c..314041e 100644 --- a/minecraft-blockmap.yml +++ b/minecraft-blockmap.yml @@ -19,9 +19,9 @@ - hosts: minecraft roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - - minecraft-blockmap + - minecraft_blockmap environment: PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages diff --git a/minecraft.yml b/minecraft.yml index 772eac9..593337b 100644 --- a/minecraft.yml +++ b/minecraft.yml @@ -20,8 +20,8 @@ - hosts: minecraft roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - minecraft environment: PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages diff --git a/minio.yml b/minio.yml index 742a4d8..53f4b5d 100644 --- a/minio.yml +++ b/minio.yml @@ -20,8 +20,8 @@ - hosts: minio roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - minio environment: diff --git a/monitoring.yml b/monitoring.yml index 7fa1f76..3e53dd8 100644 --- a/monitoring.yml +++ b/monitoring.yml @@ -20,8 +20,8 @@ - hosts: monitoring roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - monitoring environment: @@ -30,8 +30,8 @@ - hosts: all roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - telegraf environment: PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages diff --git a/roles/docker-cleanup/README.md b/roles/docker_cleanup/README.md similarity index 95% rename from roles/docker-cleanup/README.md rename to roles/docker_cleanup/README.md index b0338d2..b0d383a 100644 --- a/roles/docker-cleanup/README.md +++ b/roles/docker_cleanup/README.md @@ -1,4 +1,4 @@ -docker-cleanup +docker_cleanup ========= This will prune unused docker images older than 3 days, to keep the system clean. diff --git a/roles/docker-cleanup/meta/main.yml b/roles/docker_cleanup/meta/main.yml similarity index 100% rename from roles/docker-cleanup/meta/main.yml rename to roles/docker_cleanup/meta/main.yml diff --git a/roles/docker-cleanup/tasks/main.yml b/roles/docker_cleanup/tasks/main.yml similarity index 100% rename from roles/docker-cleanup/tasks/main.yml rename to roles/docker_cleanup/tasks/main.yml diff --git a/roles/docker-compose/README.md b/roles/docker_compose/README.md similarity index 98% rename from roles/docker-compose/README.md rename to roles/docker_compose/README.md index 95e4e63..e6b76df 100644 --- a/roles/docker-compose/README.md +++ b/roles/docker_compose/README.md @@ -1,4 +1,4 @@ -docker-compose +docker_compose ========= This will install the [docker-compose](https://docs.docker.com/compose/) python library via pip and by default choose another install location, diff --git a/roles/docker-compose/defaults/main.yml b/roles/docker_compose/defaults/main.yml similarity index 97% rename from roles/docker-compose/defaults/main.yml rename to roles/docker_compose/defaults/main.yml index ada0ff1..339d5bb 100644 --- a/roles/docker-compose/defaults/main.yml +++ b/roles/docker_compose/defaults/main.yml @@ -1,5 +1,5 @@ --- -# Default variables for the docker-compose role +# Default variables for the docker_compose role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/docker-compose/meta/main.yml b/roles/docker_compose/meta/main.yml similarity index 100% rename from roles/docker-compose/meta/main.yml rename to roles/docker_compose/meta/main.yml diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker_compose/tasks/main.yml similarity index 100% rename from roles/docker-compose/tasks/main.yml rename to roles/docker_compose/tasks/main.yml diff --git a/roles/docker-compose/templates/bin/docker-compose.j2 b/roles/docker_compose/templates/bin/docker-compose.j2 similarity index 100% rename from roles/docker-compose/templates/bin/docker-compose.j2 rename to roles/docker_compose/templates/bin/docker-compose.j2 diff --git a/roles/docker-ipv6-nat/README.md b/roles/docker_ipv6_nat/README.md similarity index 98% rename from roles/docker-ipv6-nat/README.md rename to roles/docker_ipv6_nat/README.md index bfc4003..7516b59 100644 --- a/roles/docker-ipv6-nat/README.md +++ b/roles/docker_ipv6_nat/README.md @@ -1,4 +1,4 @@ -Docker-IPv6-NAT +docker_ipv6_nat =============== This will install the [docker-ipv6nat](https://github.com/robbertkl/docker-ipv6nat) container to manage IPv6 with ease on a single IP. diff --git a/roles/docker-ipv6-nat/defaults/main.yml b/roles/docker_ipv6_nat/defaults/main.yml similarity index 95% rename from roles/docker-ipv6-nat/defaults/main.yml rename to roles/docker_ipv6_nat/defaults/main.yml index 1ea1118..905d274 100644 --- a/roles/docker-ipv6-nat/defaults/main.yml +++ b/roles/docker_ipv6_nat/defaults/main.yml @@ -1,5 +1,5 @@ --- -# Default variables for the docker-ipv6-nat role +# Default variables for the docker_ipv6_nat role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/docker-ipv6-nat/meta/main.yml b/roles/docker_ipv6_nat/meta/main.yml similarity index 100% rename from roles/docker-ipv6-nat/meta/main.yml rename to roles/docker_ipv6_nat/meta/main.yml diff --git a/roles/docker-ipv6-nat/tasks/main.yml b/roles/docker_ipv6_nat/tasks/main.yml similarity index 97% rename from roles/docker-ipv6-nat/tasks/main.yml rename to roles/docker_ipv6_nat/tasks/main.yml index 128716a..590fa4c 100644 --- a/roles/docker-ipv6-nat/tasks/main.yml +++ b/roles/docker_ipv6_nat/tasks/main.yml @@ -1,5 +1,5 @@ --- -# Tasks file for the docker-ipv6-nat role +# Tasks file for the docker_ipv6_nat role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/docker-ipv6-nat/templates/docker-compose.yml b/roles/docker_ipv6_nat/templates/docker-compose.yml similarity index 100% rename from roles/docker-ipv6-nat/templates/docker-compose.yml rename to roles/docker_ipv6_nat/templates/docker-compose.yml diff --git a/roles/gitlab-runner/README.md b/roles/gitlab_runner/README.md similarity index 99% rename from roles/gitlab-runner/README.md rename to roles/gitlab_runner/README.md index 394a9e9..2f79525 100644 --- a/roles/gitlab-runner/README.md +++ b/roles/gitlab_runner/README.md @@ -1,4 +1,4 @@ -gitlab-runner +gitlab_runner ========= This will setup a [gitlab-runner](https://docs.gitlab.com/runner/) instance via Docker, that is used to run CI jobs from a Gitlab instance. diff --git a/roles/gitlab-runner/defaults/main.yml b/roles/gitlab_runner/defaults/main.yml similarity index 98% rename from roles/gitlab-runner/defaults/main.yml rename to roles/gitlab_runner/defaults/main.yml index e71213f..6f295eb 100644 --- a/roles/gitlab-runner/defaults/main.yml +++ b/roles/gitlab_runner/defaults/main.yml @@ -1,5 +1,5 @@ --- -# Default variables for the gitlab-runner role +# Default variables for the gitlab_runner role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/gitlab-runner/meta/main.yml b/roles/gitlab_runner/meta/main.yml similarity index 100% rename from roles/gitlab-runner/meta/main.yml rename to roles/gitlab_runner/meta/main.yml diff --git a/roles/gitlab-runner/tasks/main.yml b/roles/gitlab_runner/tasks/main.yml similarity index 98% rename from roles/gitlab-runner/tasks/main.yml rename to roles/gitlab_runner/tasks/main.yml index cb515a2..f0e56e8 100644 --- a/roles/gitlab-runner/tasks/main.yml +++ b/roles/gitlab_runner/tasks/main.yml @@ -1,5 +1,5 @@ --- -# Tasks file for the gitlab-runner role +# Tasks file for the gitlab_runner role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/gitlab-runner/templates/config.toml b/roles/gitlab_runner/templates/config.toml similarity index 100% rename from roles/gitlab-runner/templates/config.toml rename to roles/gitlab_runner/templates/config.toml diff --git a/roles/gitlab-runner/templates/docker-compose.yml b/roles/gitlab_runner/templates/docker-compose.yml similarity index 100% rename from roles/gitlab-runner/templates/docker-compose.yml rename to roles/gitlab_runner/templates/docker-compose.yml diff --git a/roles/lvm-self-backup/README.md b/roles/lvm_self_backup/README.md similarity index 98% rename from roles/lvm-self-backup/README.md rename to roles/lvm_self_backup/README.md index bb4f202..e8c0ec1 100644 --- a/roles/lvm-self-backup/README.md +++ b/roles/lvm_self_backup/README.md @@ -1,4 +1,4 @@ -lvm-self-backup +lvm_self_backup ========= This will deploy a `backup-lvm` and `backup-lvm-ls` script to backup configured LVM volumes encrypted with GPG using duplicity and list the remote content for verification. A systemd timer is also deployed to schedule automatic backups daily at 4 AM. diff --git a/roles/lvm-self-backup/defaults/main.yml b/roles/lvm_self_backup/defaults/main.yml similarity index 97% rename from roles/lvm-self-backup/defaults/main.yml rename to roles/lvm_self_backup/defaults/main.yml index a0bd687..140d613 100644 --- a/roles/lvm-self-backup/defaults/main.yml +++ b/roles/lvm_self_backup/defaults/main.yml @@ -1,5 +1,5 @@ --- -# Default variables for the lvm-self-backup role +# Default variables for the lvm_self_backup role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/lvm-self-backup/meta/main.yml b/roles/lvm_self_backup/meta/main.yml similarity index 100% rename from roles/lvm-self-backup/meta/main.yml rename to roles/lvm_self_backup/meta/main.yml diff --git a/roles/lvm-self-backup/tasks/main.yml b/roles/lvm_self_backup/tasks/main.yml similarity index 97% rename from roles/lvm-self-backup/tasks/main.yml rename to roles/lvm_self_backup/tasks/main.yml index 1d36e9c..b400bcd 100644 --- a/roles/lvm-self-backup/tasks/main.yml +++ b/roles/lvm_self_backup/tasks/main.yml @@ -1,5 +1,5 @@ --- -# Tasks file for the lvm-self-backup role +# Tasks file for the lvm_self_backup role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/lvm-self-backup/templates/backup-lvm-ls.sh b/roles/lvm_self_backup/templates/backup-lvm-ls.sh similarity index 100% rename from roles/lvm-self-backup/templates/backup-lvm-ls.sh rename to roles/lvm_self_backup/templates/backup-lvm-ls.sh diff --git a/roles/lvm-self-backup/templates/backup-lvm.service b/roles/lvm_self_backup/templates/backup-lvm.service similarity index 100% rename from roles/lvm-self-backup/templates/backup-lvm.service rename to roles/lvm_self_backup/templates/backup-lvm.service diff --git a/roles/lvm-self-backup/templates/backup-lvm.sh b/roles/lvm_self_backup/templates/backup-lvm.sh similarity index 100% rename from roles/lvm-self-backup/templates/backup-lvm.sh rename to roles/lvm_self_backup/templates/backup-lvm.sh diff --git a/roles/lvm-self-backup/templates/backup-lvm.timer b/roles/lvm_self_backup/templates/backup-lvm.timer similarity index 100% rename from roles/lvm-self-backup/templates/backup-lvm.timer rename to roles/lvm_self_backup/templates/backup-lvm.timer diff --git a/roles/minecraft-blockmap/README.md b/roles/minecraft_blockmap/README.md similarity index 100% rename from roles/minecraft-blockmap/README.md rename to roles/minecraft_blockmap/README.md diff --git a/roles/minecraft-blockmap/defaults/main.yml b/roles/minecraft_blockmap/defaults/main.yml similarity index 97% rename from roles/minecraft-blockmap/defaults/main.yml rename to roles/minecraft_blockmap/defaults/main.yml index 2c45654..88613c1 100644 --- a/roles/minecraft-blockmap/defaults/main.yml +++ b/roles/minecraft_blockmap/defaults/main.yml @@ -1,5 +1,5 @@ --- -# Default variables for the minecraft-blockmap role +# Default variables for the minecraft_blockmap role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/minecraft-blockmap/meta/main.yml b/roles/minecraft_blockmap/meta/main.yml similarity index 100% rename from roles/minecraft-blockmap/meta/main.yml rename to roles/minecraft_blockmap/meta/main.yml diff --git a/roles/minecraft-blockmap/tasks/main.yml b/roles/minecraft_blockmap/tasks/main.yml similarity index 98% rename from roles/minecraft-blockmap/tasks/main.yml rename to roles/minecraft_blockmap/tasks/main.yml index 791e3f8..09c6aab 100644 --- a/roles/minecraft-blockmap/tasks/main.yml +++ b/roles/minecraft_blockmap/tasks/main.yml @@ -1,5 +1,5 @@ --- -# Tasks file for the minecraft-blockmap roles +# Tasks file for the minecraft_blockmap roles # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/minecraft-blockmap/templates/blockmap-render.service b/roles/minecraft_blockmap/templates/blockmap-render.service similarity index 100% rename from roles/minecraft-blockmap/templates/blockmap-render.service rename to roles/minecraft_blockmap/templates/blockmap-render.service diff --git a/roles/minecraft-blockmap/templates/blockmap-render.timer b/roles/minecraft_blockmap/templates/blockmap-render.timer similarity index 100% rename from roles/minecraft-blockmap/templates/blockmap-render.timer rename to roles/minecraft_blockmap/templates/blockmap-render.timer diff --git a/roles/minecraft-blockmap/templates/blockmap.json b/roles/minecraft_blockmap/templates/blockmap.json similarity index 100% rename from roles/minecraft-blockmap/templates/blockmap.json rename to roles/minecraft_blockmap/templates/blockmap.json diff --git a/roles/minecraft-blockmap/templates/default.conf b/roles/minecraft_blockmap/templates/default.conf similarity index 100% rename from roles/minecraft-blockmap/templates/default.conf rename to roles/minecraft_blockmap/templates/default.conf diff --git a/roles/minecraft-blockmap/templates/docker-compose.yml b/roles/minecraft_blockmap/templates/docker-compose.yml similarity index 100% rename from roles/minecraft-blockmap/templates/docker-compose.yml rename to roles/minecraft_blockmap/templates/docker-compose.yml diff --git a/roles/minecraft-blockmap/templates/render.sh b/roles/minecraft_blockmap/templates/render.sh similarity index 100% rename from roles/minecraft-blockmap/templates/render.sh rename to roles/minecraft_blockmap/templates/render.sh diff --git a/roles/moby-engine/README.md b/roles/moby_engine/README.md similarity index 100% rename from roles/moby-engine/README.md rename to roles/moby_engine/README.md diff --git a/roles/moby-engine/defaults/main.yml b/roles/moby_engine/defaults/main.yml similarity index 94% rename from roles/moby-engine/defaults/main.yml rename to roles/moby_engine/defaults/main.yml index 906d7a9..801dde1 100644 --- a/roles/moby-engine/defaults/main.yml +++ b/roles/moby_engine/defaults/main.yml @@ -1,5 +1,5 @@ --- -# Default variables for the moby-engine role +# Default variables for the moby_engine role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/moby-engine/handlers/main.yml b/roles/moby_engine/handlers/main.yml similarity index 96% rename from roles/moby-engine/handlers/main.yml rename to roles/moby_engine/handlers/main.yml index 2868aff..15a8aa9 100644 --- a/roles/moby-engine/handlers/main.yml +++ b/roles/moby_engine/handlers/main.yml @@ -1,5 +1,5 @@ --- -# Handlers file for the moby-engine role +# Handlers file for the moby_engine role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/moby-engine/meta/main.yml b/roles/moby_engine/meta/main.yml similarity index 83% rename from roles/moby-engine/meta/main.yml rename to roles/moby_engine/meta/main.yml index 71dd5ed..43868e6 100644 --- a/roles/moby-engine/meta/main.yml +++ b/roles/moby_engine/meta/main.yml @@ -1,6 +1,6 @@ galaxy_info: author: saibotk - description: Install moby-engine. + description: Installs moby-engine. license: GPL-3.0-only min_ansible_version: 2.9 diff --git a/roles/moby-engine/tasks/Fedora-32.yml b/roles/moby_engine/tasks/Fedora-32.yml similarity index 97% rename from roles/moby-engine/tasks/Fedora-32.yml rename to roles/moby_engine/tasks/Fedora-32.yml index d90e15a..3a355f5 100644 --- a/roles/moby-engine/tasks/Fedora-32.yml +++ b/roles/moby_engine/tasks/Fedora-32.yml @@ -1,5 +1,5 @@ --- -# Tasks for the moby-engine role on Fedora 32 +# Tasks for the moby_engine role on Fedora 32 # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/moby-engine/tasks/main.yml b/roles/moby_engine/tasks/main.yml similarity index 96% rename from roles/moby-engine/tasks/main.yml rename to roles/moby_engine/tasks/main.yml index 9ac0b0a..74b57c0 100644 --- a/roles/moby-engine/tasks/main.yml +++ b/roles/moby_engine/tasks/main.yml @@ -1,5 +1,5 @@ --- -# Tasks file for the moby-engine role +# Tasks file for the moby_engine role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/unicorns-website/README.md b/roles/unicorns_website/README.md similarity index 100% rename from roles/unicorns-website/README.md rename to roles/unicorns_website/README.md diff --git a/roles/unicorns-website/defaults/main.yml b/roles/unicorns_website/defaults/main.yml similarity index 97% rename from roles/unicorns-website/defaults/main.yml rename to roles/unicorns_website/defaults/main.yml index 357ec1e..612b7f1 100644 --- a/roles/unicorns-website/defaults/main.yml +++ b/roles/unicorns_website/defaults/main.yml @@ -1,5 +1,5 @@ --- -# Default variables for the unicorns-website role +# Default variables for the unicorns_website role # Infrastructure # Ansible instructions to deploy the infrastructure diff --git a/roles/unicorns-website/meta/main.yml b/roles/unicorns_website/meta/main.yml similarity index 100% rename from roles/unicorns-website/meta/main.yml rename to roles/unicorns_website/meta/main.yml diff --git a/roles/unicorns-website/tasks/main.yml b/roles/unicorns_website/tasks/main.yml similarity index 100% rename from roles/unicorns-website/tasks/main.yml rename to roles/unicorns_website/tasks/main.yml diff --git a/roles/unicorns-website/templates/.env.production b/roles/unicorns_website/templates/.env.production similarity index 100% rename from roles/unicorns-website/templates/.env.production rename to roles/unicorns_website/templates/.env.production diff --git a/roles/unicorns-website/templates/docker-compose.yml b/roles/unicorns_website/templates/docker-compose.yml similarity index 100% rename from roles/unicorns-website/templates/docker-compose.yml rename to roles/unicorns_website/templates/docker-compose.yml diff --git a/static_websites.yml b/static-websites.yml similarity index 95% rename from static_websites.yml rename to static-websites.yml index 90bc16b..3643f42 100644 --- a/static_websites.yml +++ b/static-websites.yml @@ -21,8 +21,8 @@ serial: 1 roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - static_websites environment: diff --git a/teamspeak.yml b/teamspeak.yml index e182c63..7c6afca 100644 --- a/teamspeak.yml +++ b/teamspeak.yml @@ -19,8 +19,8 @@ - hosts: teamspeak roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik - teamspeak - ts3audiobot diff --git a/unicorns_website.yml b/unicorns-website.yml similarity index 94% rename from unicorns_website.yml rename to unicorns-website.yml index b73fc05..39ef13a 100644 --- a/unicorns_website.yml +++ b/unicorns-website.yml @@ -19,8 +19,8 @@ - hosts: unicorns_website roles: - docker - - docker-compose - - docker-cleanup + - docker_compose + - docker_cleanup - traefik environment: PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages @@ -35,4 +35,4 @@ become: true - include_role: - name: unicorns-website + name: unicorns_website