diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index d41b619a2b..b5cb08334d 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -59,7 +59,7 @@ roles: - fedmsg/hub - - badges-backend + - badges/backend vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index ef970cc6c5..3cc32f3bed 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -37,7 +37,7 @@ - denyhosts - nagios_client - fas_client - - badges-frontend + - badges/frontend - fedmsg/base tasks: diff --git a/roles/badges-backend/files/award-badge b/roles/badges/backend/files/award-badge similarity index 100% rename from roles/badges-backend/files/award-badge rename to roles/badges/backend/files/award-badge diff --git a/roles/badges-backend/files/cron/award-badges-dev-badge b/roles/badges/backend/files/cron/award-badges-dev-badge similarity index 100% rename from roles/badges-backend/files/cron/award-badges-dev-badge rename to roles/badges/backend/files/cron/award-badges-dev-badge diff --git a/roles/badges-backend/files/cron/award-badges-dev-badge.cron b/roles/badges/backend/files/cron/award-badges-dev-badge.cron similarity index 100% rename from roles/badges-backend/files/cron/award-badges-dev-badge.cron rename to roles/badges/backend/files/cron/award-badges-dev-badge.cron diff --git a/roles/badges-backend/files/cron/award-flock-paparazzi-badge b/roles/badges/backend/files/cron/award-flock-paparazzi-badge similarity index 100% rename from roles/badges-backend/files/cron/award-flock-paparazzi-badge rename to roles/badges/backend/files/cron/award-flock-paparazzi-badge diff --git a/roles/badges-backend/files/cron/award-flock-paparazzi-badge.cron b/roles/badges/backend/files/cron/award-flock-paparazzi-badge.cron similarity index 100% rename from roles/badges-backend/files/cron/award-flock-paparazzi-badge.cron rename to roles/badges/backend/files/cron/award-flock-paparazzi-badge.cron diff --git a/roles/badges-backend/files/cron/award-libravatar-badge b/roles/badges/backend/files/cron/award-libravatar-badge similarity index 100% rename from roles/badges-backend/files/cron/award-libravatar-badge rename to roles/badges/backend/files/cron/award-libravatar-badge diff --git a/roles/badges-backend/files/cron/award-libravatar-badge.cron b/roles/badges/backend/files/cron/award-libravatar-badge.cron similarity index 100% rename from roles/badges-backend/files/cron/award-libravatar-badge.cron rename to roles/badges/backend/files/cron/award-libravatar-badge.cron diff --git a/roles/badges-backend/files/cron/award-lifecycle-badges b/roles/badges/backend/files/cron/award-lifecycle-badges similarity index 100% rename from roles/badges-backend/files/cron/award-lifecycle-badges rename to roles/badges/backend/files/cron/award-lifecycle-badges diff --git a/roles/badges-backend/files/cron/award-lifecycle-badges.cron b/roles/badges/backend/files/cron/award-lifecycle-badges.cron similarity index 100% rename from roles/badges-backend/files/cron/award-lifecycle-badges.cron rename to roles/badges/backend/files/cron/award-lifecycle-badges.cron diff --git a/roles/badges-backend/files/cron/award-mirror-badge b/roles/badges/backend/files/cron/award-mirror-badge similarity index 100% rename from roles/badges-backend/files/cron/award-mirror-badge rename to roles/badges/backend/files/cron/award-mirror-badge diff --git a/roles/badges-backend/files/cron/award-mirror-badge.cron b/roles/badges/backend/files/cron/award-mirror-badge.cron similarity index 100% rename from roles/badges-backend/files/cron/award-mirror-badge.cron rename to roles/badges/backend/files/cron/award-mirror-badge.cron diff --git a/roles/badges-backend/files/cron/award-oldschool-badges b/roles/badges/backend/files/cron/award-oldschool-badges similarity index 100% rename from roles/badges-backend/files/cron/award-oldschool-badges rename to roles/badges/backend/files/cron/award-oldschool-badges diff --git a/roles/badges-backend/files/cron/award-oldschool-badges.cron b/roles/badges/backend/files/cron/award-oldschool-badges.cron similarity index 100% rename from roles/badges-backend/files/cron/award-oldschool-badges.cron rename to roles/badges/backend/files/cron/award-oldschool-badges.cron diff --git a/roles/badges-backend/files/cron/cron-badges-logrotate b/roles/badges/backend/files/cron/cron-badges-logrotate similarity index 100% rename from roles/badges-backend/files/cron/cron-badges-logrotate rename to roles/badges/backend/files/cron/cron-badges-logrotate diff --git a/roles/badges-backend/files/get-badges-person-id b/roles/badges/backend/files/get-badges-person-id similarity index 100% rename from roles/badges-backend/files/get-badges-person-id rename to roles/badges/backend/files/get-badges-person-id diff --git a/roles/badges-backend/files/patched-fedmsg-hub b/roles/badges/backend/files/patched-fedmsg-hub similarity index 100% rename from roles/badges-backend/files/patched-fedmsg-hub rename to roles/badges/backend/files/patched-fedmsg-hub diff --git a/roles/badges-backend/tasks/main.yml b/roles/badges/backend/tasks/main.yml similarity index 100% rename from roles/badges-backend/tasks/main.yml rename to roles/badges/backend/tasks/main.yml diff --git a/roles/badges-backend/templates/badges-awarder.py b/roles/badges/backend/templates/badges-awarder.py similarity index 100% rename from roles/badges-backend/templates/badges-awarder.py rename to roles/badges/backend/templates/badges-awarder.py diff --git a/roles/badges-backend/templates/datanommer.py b/roles/badges/backend/templates/datanommer.py similarity index 100% rename from roles/badges-backend/templates/datanommer.py rename to roles/badges/backend/templates/datanommer.py diff --git a/roles/badges-backend/templates/flock-paparazzi.ini b/roles/badges/backend/templates/flock-paparazzi.ini similarity index 100% rename from roles/badges-backend/templates/flock-paparazzi.ini rename to roles/badges/backend/templates/flock-paparazzi.ini diff --git a/roles/badges-frontend/files/fedora-sitedocs/about.rst b/roles/badges/frontend/files/fedora-sitedocs/about.rst similarity index 100% rename from roles/badges-frontend/files/fedora-sitedocs/about.rst rename to roles/badges/frontend/files/fedora-sitedocs/about.rst diff --git a/roles/badges-frontend/files/fedora-sitedocs/footer.rst b/roles/badges/frontend/files/fedora-sitedocs/footer.rst similarity index 100% rename from roles/badges-frontend/files/fedora-sitedocs/footer.rst rename to roles/badges/frontend/files/fedora-sitedocs/footer.rst diff --git a/roles/badges-frontend/files/openid.py b/roles/badges/frontend/files/openid.py similarity index 100% rename from roles/badges-frontend/files/openid.py rename to roles/badges/frontend/files/openid.py diff --git a/roles/badges-frontend/files/tahrir.conf b/roles/badges/frontend/files/tahrir.conf similarity index 100% rename from roles/badges-frontend/files/tahrir.conf rename to roles/badges/frontend/files/tahrir.conf diff --git a/roles/badges-frontend/files/tahrir.wsgi b/roles/badges/frontend/files/tahrir.wsgi similarity index 100% rename from roles/badges-frontend/files/tahrir.wsgi rename to roles/badges/frontend/files/tahrir.wsgi diff --git a/roles/badges-frontend/tasks/main.yml b/roles/badges/frontend/tasks/main.yml similarity index 100% rename from roles/badges-frontend/tasks/main.yml rename to roles/badges/frontend/tasks/main.yml diff --git a/roles/badges-frontend/templates/tahrir.ini b/roles/badges/frontend/templates/tahrir.ini similarity index 100% rename from roles/badges-frontend/templates/tahrir.ini rename to roles/badges/frontend/templates/tahrir.ini