From c0a5a866c452457285bfdb760c124ee4ccaa0d10 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 29 Oct 2020 21:02:02 -0500
Subject: [PATCH] Rename roles

---
 roles/{geerlingguy.apache => apache}/.gitignore             | 0
 roles/{geerlingguy.apache => apache}/.travis.yml            | 0
 roles/{geerlingguy.apache => apache}/LICENSE                | 0
 roles/{geerlingguy.apache => apache}/README.md              | 0
 roles/{geerlingguy.apache => apache}/defaults/main.yml      | 0
 roles/{geerlingguy.apache => apache}/handlers/main.yml      | 0
 .../meta/.galaxy_install_info                               | 0
 roles/{geerlingguy.apache => apache}/meta/main.yml          | 0
 .../molecule/default/molecule.yml                           | 0
 .../molecule/default/playbook.yml                           | 0
 .../molecule/default/yaml-lint.yml                          | 0
 .../tasks/configure-Debian.yml                              | 0
 .../tasks/configure-RedHat.yml                              | 0
 .../tasks/configure-Solaris.yml                             | 0
 .../{geerlingguy.apache => apache}/tasks/configure-Suse.yml | 0
 roles/{geerlingguy.apache => apache}/tasks/main.yml         | 0
 roles/{geerlingguy.apache => apache}/tasks/setup-Debian.yml | 0
 roles/{geerlingguy.apache => apache}/tasks/setup-RedHat.yml | 0
 .../{geerlingguy.apache => apache}/tasks/setup-Solaris.yml  | 0
 roles/{geerlingguy.apache => apache}/tasks/setup-Suse.yml   | 0
 .../{geerlingguy.apache => apache}/templates/vhosts.conf.j2 | 0
 roles/{geerlingguy.apache => apache}/vars/AmazonLinux.yml   | 0
 roles/{geerlingguy.apache => apache}/vars/Debian.yml        | 0
 roles/{geerlingguy.apache => apache}/vars/RedHat.yml        | 0
 roles/{geerlingguy.apache => apache}/vars/Solaris.yml       | 0
 roles/{geerlingguy.apache => apache}/vars/Suse.yml          | 0
 roles/{geerlingguy.apache => apache}/vars/apache-22.yml     | 0
 roles/{geerlingguy.apache => apache}/vars/apache-24.yml     | 0
 roles/{geerlingguy.php => php}/.ansible-lint                | 0
 roles/{geerlingguy.php => php}/.github/FUNDING.yml          | 0
 roles/{geerlingguy.php => php}/.github/stale.yml            | 0
 roles/{geerlingguy.php => php}/.gitignore                   | 0
 roles/{geerlingguy.php => php}/.travis.yml                  | 0
 roles/{geerlingguy.php => php}/.yamllint                    | 0
 roles/{geerlingguy.php => php}/LICENSE                      | 0
 roles/{geerlingguy.php => php}/README.md                    | 0
 roles/{geerlingguy.php => php}/defaults/main.yml            | 0
 roles/{geerlingguy.php => php}/handlers/main.yml            | 0
 roles/{geerlingguy.php => php}/meta/.galaxy_install_info    | 0
 roles/{geerlingguy.php => php}/meta/main.yml                | 0
 .../{geerlingguy.php => php}/molecule/default/converge.yml  | 0
 .../{geerlingguy.php => php}/molecule/default/molecule.yml  | 0
 .../molecule/default/playbook-source.yml                    | 0
 .../molecule/default/requirements.yml                       | 0
 roles/{geerlingguy.php => php}/tasks/configure-apcu.yml     | 0
 roles/{geerlingguy.php => php}/tasks/configure-fpm.yml      | 0
 roles/{geerlingguy.php => php}/tasks/configure-opcache.yml  | 0
 roles/{geerlingguy.php => php}/tasks/configure.yml          | 0
 .../{geerlingguy.php => php}/tasks/install-from-source.yml  | 0
 roles/{geerlingguy.php => php}/tasks/main.yml               | 0
 roles/{geerlingguy.php => php}/tasks/setup-Debian.yml       | 0
 roles/{geerlingguy.php => php}/tasks/setup-RedHat.yml       | 0
 roles/{geerlingguy.php => php}/templates/apc.ini.j2         | 0
 roles/{geerlingguy.php => php}/templates/fpm-init.j2        | 0
 roles/{geerlingguy.php => php}/templates/opcache.ini.j2     | 0
 roles/{geerlingguy.php => php}/templates/php-fpm.conf.j2    | 0
 roles/{geerlingguy.php => php}/templates/php.ini.j2         | 0
 roles/{geerlingguy.php => php}/templates/www.conf.j2        | 0
 roles/{geerlingguy.php => php}/vars/Debian-10.yml           | 0
 roles/{geerlingguy.php => php}/vars/Debian-9.yml            | 0
 roles/{geerlingguy.php => php}/vars/Debian.yml              | 0
 roles/{geerlingguy.php => php}/vars/RedHat.yml              | 0
 roles/{geerlingguy.php => php}/vars/Ubuntu-16.yml           | 0
 roles/{geerlingguy.php => php}/vars/Ubuntu-18.yml           | 0
 roles/{geerlingguy.php => php}/vars/Ubuntu-20.yml           | 0
 roles/{geerlingguy.postgresql => postgresql}/.ansible-lint  | 0
 .../.github/FUNDING.yml                                     | 0
 .../.github/stale.yml                                       | 0
 roles/{geerlingguy.postgresql => postgresql}/.gitignore     | 0
 roles/{geerlingguy.postgresql => postgresql}/.travis.yml    | 0
 roles/{geerlingguy.postgresql => postgresql}/.yamllint      | 0
 roles/{geerlingguy.postgresql => postgresql}/LICENSE        | 0
 roles/{geerlingguy.postgresql => postgresql}/README.md      | 0
 .../defaults/main.yml                                       | 0
 .../handlers/main.yml                                       | 0
 .../meta/.galaxy_install_info                               | 0
 roles/{geerlingguy.postgresql => postgresql}/meta/main.yml  | 0
 .../molecule/default/converge.yml                           | 0
 .../molecule/default/molecule.yml                           | 0
 .../tasks/configure.yml                                     | 0
 .../tasks/databases.yml                                     | 0
 .../tasks/initialize.yml                                    | 0
 roles/{geerlingguy.postgresql => postgresql}/tasks/main.yml | 0
 .../tasks/setup-Debian.yml                                  | 0
 .../tasks/setup-RedHat.yml                                  | 0
 .../{geerlingguy.postgresql => postgresql}/tasks/users.yml  | 0
 .../tasks/variables.yml                                     | 0
 .../templates/pg_hba.conf.j2                                | 0
 .../templates/postgres.sh.j2                                | 0
 .../vars/Debian-10.yml                                      | 0
 .../vars/Debian-7.yml                                       | 0
 .../vars/Debian-8.yml                                       | 0
 .../vars/Debian-9.yml                                       | 0
 .../vars/Fedora-29.yml                                      | 0
 .../vars/Fedora-30.yml                                      | 0
 .../vars/Fedora-31.yml                                      | 0
 .../vars/Fedora-32.yml                                      | 0
 .../vars/RedHat-6.yml                                       | 0
 .../vars/RedHat-7.yml                                       | 0
 .../vars/RedHat-8.yml                                       | 0
 .../vars/Ubuntu-16.yml                                      | 0
 .../vars/Ubuntu-18.yml                                      | 0
 .../vars/Ubuntu-20.yml                                      | 0
 roles/requirements.yml                                      | 3 +++
 site.yml                                                    | 6 +++---
 105 files changed, 6 insertions(+), 3 deletions(-)
 rename roles/{geerlingguy.apache => apache}/.gitignore (100%)
 rename roles/{geerlingguy.apache => apache}/.travis.yml (100%)
 rename roles/{geerlingguy.apache => apache}/LICENSE (100%)
 rename roles/{geerlingguy.apache => apache}/README.md (100%)
 rename roles/{geerlingguy.apache => apache}/defaults/main.yml (100%)
 rename roles/{geerlingguy.apache => apache}/handlers/main.yml (100%)
 rename roles/{geerlingguy.apache => apache}/meta/.galaxy_install_info (100%)
 rename roles/{geerlingguy.apache => apache}/meta/main.yml (100%)
 rename roles/{geerlingguy.apache => apache}/molecule/default/molecule.yml (100%)
 rename roles/{geerlingguy.apache => apache}/molecule/default/playbook.yml (100%)
 rename roles/{geerlingguy.apache => apache}/molecule/default/yaml-lint.yml (100%)
 rename roles/{geerlingguy.apache => apache}/tasks/configure-Debian.yml (100%)
 rename roles/{geerlingguy.apache => apache}/tasks/configure-RedHat.yml (100%)
 rename roles/{geerlingguy.apache => apache}/tasks/configure-Solaris.yml (100%)
 rename roles/{geerlingguy.apache => apache}/tasks/configure-Suse.yml (100%)
 rename roles/{geerlingguy.apache => apache}/tasks/main.yml (100%)
 rename roles/{geerlingguy.apache => apache}/tasks/setup-Debian.yml (100%)
 rename roles/{geerlingguy.apache => apache}/tasks/setup-RedHat.yml (100%)
 rename roles/{geerlingguy.apache => apache}/tasks/setup-Solaris.yml (100%)
 rename roles/{geerlingguy.apache => apache}/tasks/setup-Suse.yml (100%)
 rename roles/{geerlingguy.apache => apache}/templates/vhosts.conf.j2 (100%)
 rename roles/{geerlingguy.apache => apache}/vars/AmazonLinux.yml (100%)
 rename roles/{geerlingguy.apache => apache}/vars/Debian.yml (100%)
 rename roles/{geerlingguy.apache => apache}/vars/RedHat.yml (100%)
 rename roles/{geerlingguy.apache => apache}/vars/Solaris.yml (100%)
 rename roles/{geerlingguy.apache => apache}/vars/Suse.yml (100%)
 rename roles/{geerlingguy.apache => apache}/vars/apache-22.yml (100%)
 rename roles/{geerlingguy.apache => apache}/vars/apache-24.yml (100%)
 rename roles/{geerlingguy.php => php}/.ansible-lint (100%)
 rename roles/{geerlingguy.php => php}/.github/FUNDING.yml (100%)
 rename roles/{geerlingguy.php => php}/.github/stale.yml (100%)
 rename roles/{geerlingguy.php => php}/.gitignore (100%)
 rename roles/{geerlingguy.php => php}/.travis.yml (100%)
 rename roles/{geerlingguy.php => php}/.yamllint (100%)
 rename roles/{geerlingguy.php => php}/LICENSE (100%)
 rename roles/{geerlingguy.php => php}/README.md (100%)
 rename roles/{geerlingguy.php => php}/defaults/main.yml (100%)
 rename roles/{geerlingguy.php => php}/handlers/main.yml (100%)
 rename roles/{geerlingguy.php => php}/meta/.galaxy_install_info (100%)
 rename roles/{geerlingguy.php => php}/meta/main.yml (100%)
 rename roles/{geerlingguy.php => php}/molecule/default/converge.yml (100%)
 rename roles/{geerlingguy.php => php}/molecule/default/molecule.yml (100%)
 rename roles/{geerlingguy.php => php}/molecule/default/playbook-source.yml (100%)
 rename roles/{geerlingguy.php => php}/molecule/default/requirements.yml (100%)
 rename roles/{geerlingguy.php => php}/tasks/configure-apcu.yml (100%)
 rename roles/{geerlingguy.php => php}/tasks/configure-fpm.yml (100%)
 rename roles/{geerlingguy.php => php}/tasks/configure-opcache.yml (100%)
 rename roles/{geerlingguy.php => php}/tasks/configure.yml (100%)
 rename roles/{geerlingguy.php => php}/tasks/install-from-source.yml (100%)
 rename roles/{geerlingguy.php => php}/tasks/main.yml (100%)
 rename roles/{geerlingguy.php => php}/tasks/setup-Debian.yml (100%)
 rename roles/{geerlingguy.php => php}/tasks/setup-RedHat.yml (100%)
 rename roles/{geerlingguy.php => php}/templates/apc.ini.j2 (100%)
 rename roles/{geerlingguy.php => php}/templates/fpm-init.j2 (100%)
 rename roles/{geerlingguy.php => php}/templates/opcache.ini.j2 (100%)
 rename roles/{geerlingguy.php => php}/templates/php-fpm.conf.j2 (100%)
 rename roles/{geerlingguy.php => php}/templates/php.ini.j2 (100%)
 rename roles/{geerlingguy.php => php}/templates/www.conf.j2 (100%)
 rename roles/{geerlingguy.php => php}/vars/Debian-10.yml (100%)
 rename roles/{geerlingguy.php => php}/vars/Debian-9.yml (100%)
 rename roles/{geerlingguy.php => php}/vars/Debian.yml (100%)
 rename roles/{geerlingguy.php => php}/vars/RedHat.yml (100%)
 rename roles/{geerlingguy.php => php}/vars/Ubuntu-16.yml (100%)
 rename roles/{geerlingguy.php => php}/vars/Ubuntu-18.yml (100%)
 rename roles/{geerlingguy.php => php}/vars/Ubuntu-20.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/.ansible-lint (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/.github/FUNDING.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/.github/stale.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/.gitignore (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/.travis.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/.yamllint (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/LICENSE (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/README.md (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/defaults/main.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/handlers/main.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/meta/.galaxy_install_info (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/meta/main.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/molecule/default/converge.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/molecule/default/molecule.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/tasks/configure.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/tasks/databases.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/tasks/initialize.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/tasks/main.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/tasks/setup-Debian.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/tasks/setup-RedHat.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/tasks/users.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/tasks/variables.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/templates/pg_hba.conf.j2 (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/templates/postgres.sh.j2 (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Debian-10.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Debian-7.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Debian-8.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Debian-9.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Fedora-29.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Fedora-30.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Fedora-31.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Fedora-32.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/RedHat-6.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/RedHat-7.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/RedHat-8.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Ubuntu-16.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Ubuntu-18.yml (100%)
 rename roles/{geerlingguy.postgresql => postgresql}/vars/Ubuntu-20.yml (100%)

diff --git a/roles/geerlingguy.apache/.gitignore b/roles/apache/.gitignore
similarity index 100%
rename from roles/geerlingguy.apache/.gitignore
rename to roles/apache/.gitignore
diff --git a/roles/geerlingguy.apache/.travis.yml b/roles/apache/.travis.yml
similarity index 100%
rename from roles/geerlingguy.apache/.travis.yml
rename to roles/apache/.travis.yml
diff --git a/roles/geerlingguy.apache/LICENSE b/roles/apache/LICENSE
similarity index 100%
rename from roles/geerlingguy.apache/LICENSE
rename to roles/apache/LICENSE
diff --git a/roles/geerlingguy.apache/README.md b/roles/apache/README.md
similarity index 100%
rename from roles/geerlingguy.apache/README.md
rename to roles/apache/README.md
diff --git a/roles/geerlingguy.apache/defaults/main.yml b/roles/apache/defaults/main.yml
similarity index 100%
rename from roles/geerlingguy.apache/defaults/main.yml
rename to roles/apache/defaults/main.yml
diff --git a/roles/geerlingguy.apache/handlers/main.yml b/roles/apache/handlers/main.yml
similarity index 100%
rename from roles/geerlingguy.apache/handlers/main.yml
rename to roles/apache/handlers/main.yml
diff --git a/roles/geerlingguy.apache/meta/.galaxy_install_info b/roles/apache/meta/.galaxy_install_info
similarity index 100%
rename from roles/geerlingguy.apache/meta/.galaxy_install_info
rename to roles/apache/meta/.galaxy_install_info
diff --git a/roles/geerlingguy.apache/meta/main.yml b/roles/apache/meta/main.yml
similarity index 100%
rename from roles/geerlingguy.apache/meta/main.yml
rename to roles/apache/meta/main.yml
diff --git a/roles/geerlingguy.apache/molecule/default/molecule.yml b/roles/apache/molecule/default/molecule.yml
similarity index 100%
rename from roles/geerlingguy.apache/molecule/default/molecule.yml
rename to roles/apache/molecule/default/molecule.yml
diff --git a/roles/geerlingguy.apache/molecule/default/playbook.yml b/roles/apache/molecule/default/playbook.yml
similarity index 100%
rename from roles/geerlingguy.apache/molecule/default/playbook.yml
rename to roles/apache/molecule/default/playbook.yml
diff --git a/roles/geerlingguy.apache/molecule/default/yaml-lint.yml b/roles/apache/molecule/default/yaml-lint.yml
similarity index 100%
rename from roles/geerlingguy.apache/molecule/default/yaml-lint.yml
rename to roles/apache/molecule/default/yaml-lint.yml
diff --git a/roles/geerlingguy.apache/tasks/configure-Debian.yml b/roles/apache/tasks/configure-Debian.yml
similarity index 100%
rename from roles/geerlingguy.apache/tasks/configure-Debian.yml
rename to roles/apache/tasks/configure-Debian.yml
diff --git a/roles/geerlingguy.apache/tasks/configure-RedHat.yml b/roles/apache/tasks/configure-RedHat.yml
similarity index 100%
rename from roles/geerlingguy.apache/tasks/configure-RedHat.yml
rename to roles/apache/tasks/configure-RedHat.yml
diff --git a/roles/geerlingguy.apache/tasks/configure-Solaris.yml b/roles/apache/tasks/configure-Solaris.yml
similarity index 100%
rename from roles/geerlingguy.apache/tasks/configure-Solaris.yml
rename to roles/apache/tasks/configure-Solaris.yml
diff --git a/roles/geerlingguy.apache/tasks/configure-Suse.yml b/roles/apache/tasks/configure-Suse.yml
similarity index 100%
rename from roles/geerlingguy.apache/tasks/configure-Suse.yml
rename to roles/apache/tasks/configure-Suse.yml
diff --git a/roles/geerlingguy.apache/tasks/main.yml b/roles/apache/tasks/main.yml
similarity index 100%
rename from roles/geerlingguy.apache/tasks/main.yml
rename to roles/apache/tasks/main.yml
diff --git a/roles/geerlingguy.apache/tasks/setup-Debian.yml b/roles/apache/tasks/setup-Debian.yml
similarity index 100%
rename from roles/geerlingguy.apache/tasks/setup-Debian.yml
rename to roles/apache/tasks/setup-Debian.yml
diff --git a/roles/geerlingguy.apache/tasks/setup-RedHat.yml b/roles/apache/tasks/setup-RedHat.yml
similarity index 100%
rename from roles/geerlingguy.apache/tasks/setup-RedHat.yml
rename to roles/apache/tasks/setup-RedHat.yml
diff --git a/roles/geerlingguy.apache/tasks/setup-Solaris.yml b/roles/apache/tasks/setup-Solaris.yml
similarity index 100%
rename from roles/geerlingguy.apache/tasks/setup-Solaris.yml
rename to roles/apache/tasks/setup-Solaris.yml
diff --git a/roles/geerlingguy.apache/tasks/setup-Suse.yml b/roles/apache/tasks/setup-Suse.yml
similarity index 100%
rename from roles/geerlingguy.apache/tasks/setup-Suse.yml
rename to roles/apache/tasks/setup-Suse.yml
diff --git a/roles/geerlingguy.apache/templates/vhosts.conf.j2 b/roles/apache/templates/vhosts.conf.j2
similarity index 100%
rename from roles/geerlingguy.apache/templates/vhosts.conf.j2
rename to roles/apache/templates/vhosts.conf.j2
diff --git a/roles/geerlingguy.apache/vars/AmazonLinux.yml b/roles/apache/vars/AmazonLinux.yml
similarity index 100%
rename from roles/geerlingguy.apache/vars/AmazonLinux.yml
rename to roles/apache/vars/AmazonLinux.yml
diff --git a/roles/geerlingguy.apache/vars/Debian.yml b/roles/apache/vars/Debian.yml
similarity index 100%
rename from roles/geerlingguy.apache/vars/Debian.yml
rename to roles/apache/vars/Debian.yml
diff --git a/roles/geerlingguy.apache/vars/RedHat.yml b/roles/apache/vars/RedHat.yml
similarity index 100%
rename from roles/geerlingguy.apache/vars/RedHat.yml
rename to roles/apache/vars/RedHat.yml
diff --git a/roles/geerlingguy.apache/vars/Solaris.yml b/roles/apache/vars/Solaris.yml
similarity index 100%
rename from roles/geerlingguy.apache/vars/Solaris.yml
rename to roles/apache/vars/Solaris.yml
diff --git a/roles/geerlingguy.apache/vars/Suse.yml b/roles/apache/vars/Suse.yml
similarity index 100%
rename from roles/geerlingguy.apache/vars/Suse.yml
rename to roles/apache/vars/Suse.yml
diff --git a/roles/geerlingguy.apache/vars/apache-22.yml b/roles/apache/vars/apache-22.yml
similarity index 100%
rename from roles/geerlingguy.apache/vars/apache-22.yml
rename to roles/apache/vars/apache-22.yml
diff --git a/roles/geerlingguy.apache/vars/apache-24.yml b/roles/apache/vars/apache-24.yml
similarity index 100%
rename from roles/geerlingguy.apache/vars/apache-24.yml
rename to roles/apache/vars/apache-24.yml
diff --git a/roles/geerlingguy.php/.ansible-lint b/roles/php/.ansible-lint
similarity index 100%
rename from roles/geerlingguy.php/.ansible-lint
rename to roles/php/.ansible-lint
diff --git a/roles/geerlingguy.php/.github/FUNDING.yml b/roles/php/.github/FUNDING.yml
similarity index 100%
rename from roles/geerlingguy.php/.github/FUNDING.yml
rename to roles/php/.github/FUNDING.yml
diff --git a/roles/geerlingguy.php/.github/stale.yml b/roles/php/.github/stale.yml
similarity index 100%
rename from roles/geerlingguy.php/.github/stale.yml
rename to roles/php/.github/stale.yml
diff --git a/roles/geerlingguy.php/.gitignore b/roles/php/.gitignore
similarity index 100%
rename from roles/geerlingguy.php/.gitignore
rename to roles/php/.gitignore
diff --git a/roles/geerlingguy.php/.travis.yml b/roles/php/.travis.yml
similarity index 100%
rename from roles/geerlingguy.php/.travis.yml
rename to roles/php/.travis.yml
diff --git a/roles/geerlingguy.php/.yamllint b/roles/php/.yamllint
similarity index 100%
rename from roles/geerlingguy.php/.yamllint
rename to roles/php/.yamllint
diff --git a/roles/geerlingguy.php/LICENSE b/roles/php/LICENSE
similarity index 100%
rename from roles/geerlingguy.php/LICENSE
rename to roles/php/LICENSE
diff --git a/roles/geerlingguy.php/README.md b/roles/php/README.md
similarity index 100%
rename from roles/geerlingguy.php/README.md
rename to roles/php/README.md
diff --git a/roles/geerlingguy.php/defaults/main.yml b/roles/php/defaults/main.yml
similarity index 100%
rename from roles/geerlingguy.php/defaults/main.yml
rename to roles/php/defaults/main.yml
diff --git a/roles/geerlingguy.php/handlers/main.yml b/roles/php/handlers/main.yml
similarity index 100%
rename from roles/geerlingguy.php/handlers/main.yml
rename to roles/php/handlers/main.yml
diff --git a/roles/geerlingguy.php/meta/.galaxy_install_info b/roles/php/meta/.galaxy_install_info
similarity index 100%
rename from roles/geerlingguy.php/meta/.galaxy_install_info
rename to roles/php/meta/.galaxy_install_info
diff --git a/roles/geerlingguy.php/meta/main.yml b/roles/php/meta/main.yml
similarity index 100%
rename from roles/geerlingguy.php/meta/main.yml
rename to roles/php/meta/main.yml
diff --git a/roles/geerlingguy.php/molecule/default/converge.yml b/roles/php/molecule/default/converge.yml
similarity index 100%
rename from roles/geerlingguy.php/molecule/default/converge.yml
rename to roles/php/molecule/default/converge.yml
diff --git a/roles/geerlingguy.php/molecule/default/molecule.yml b/roles/php/molecule/default/molecule.yml
similarity index 100%
rename from roles/geerlingguy.php/molecule/default/molecule.yml
rename to roles/php/molecule/default/molecule.yml
diff --git a/roles/geerlingguy.php/molecule/default/playbook-source.yml b/roles/php/molecule/default/playbook-source.yml
similarity index 100%
rename from roles/geerlingguy.php/molecule/default/playbook-source.yml
rename to roles/php/molecule/default/playbook-source.yml
diff --git a/roles/geerlingguy.php/molecule/default/requirements.yml b/roles/php/molecule/default/requirements.yml
similarity index 100%
rename from roles/geerlingguy.php/molecule/default/requirements.yml
rename to roles/php/molecule/default/requirements.yml
diff --git a/roles/geerlingguy.php/tasks/configure-apcu.yml b/roles/php/tasks/configure-apcu.yml
similarity index 100%
rename from roles/geerlingguy.php/tasks/configure-apcu.yml
rename to roles/php/tasks/configure-apcu.yml
diff --git a/roles/geerlingguy.php/tasks/configure-fpm.yml b/roles/php/tasks/configure-fpm.yml
similarity index 100%
rename from roles/geerlingguy.php/tasks/configure-fpm.yml
rename to roles/php/tasks/configure-fpm.yml
diff --git a/roles/geerlingguy.php/tasks/configure-opcache.yml b/roles/php/tasks/configure-opcache.yml
similarity index 100%
rename from roles/geerlingguy.php/tasks/configure-opcache.yml
rename to roles/php/tasks/configure-opcache.yml
diff --git a/roles/geerlingguy.php/tasks/configure.yml b/roles/php/tasks/configure.yml
similarity index 100%
rename from roles/geerlingguy.php/tasks/configure.yml
rename to roles/php/tasks/configure.yml
diff --git a/roles/geerlingguy.php/tasks/install-from-source.yml b/roles/php/tasks/install-from-source.yml
similarity index 100%
rename from roles/geerlingguy.php/tasks/install-from-source.yml
rename to roles/php/tasks/install-from-source.yml
diff --git a/roles/geerlingguy.php/tasks/main.yml b/roles/php/tasks/main.yml
similarity index 100%
rename from roles/geerlingguy.php/tasks/main.yml
rename to roles/php/tasks/main.yml
diff --git a/roles/geerlingguy.php/tasks/setup-Debian.yml b/roles/php/tasks/setup-Debian.yml
similarity index 100%
rename from roles/geerlingguy.php/tasks/setup-Debian.yml
rename to roles/php/tasks/setup-Debian.yml
diff --git a/roles/geerlingguy.php/tasks/setup-RedHat.yml b/roles/php/tasks/setup-RedHat.yml
similarity index 100%
rename from roles/geerlingguy.php/tasks/setup-RedHat.yml
rename to roles/php/tasks/setup-RedHat.yml
diff --git a/roles/geerlingguy.php/templates/apc.ini.j2 b/roles/php/templates/apc.ini.j2
similarity index 100%
rename from roles/geerlingguy.php/templates/apc.ini.j2
rename to roles/php/templates/apc.ini.j2
diff --git a/roles/geerlingguy.php/templates/fpm-init.j2 b/roles/php/templates/fpm-init.j2
similarity index 100%
rename from roles/geerlingguy.php/templates/fpm-init.j2
rename to roles/php/templates/fpm-init.j2
diff --git a/roles/geerlingguy.php/templates/opcache.ini.j2 b/roles/php/templates/opcache.ini.j2
similarity index 100%
rename from roles/geerlingguy.php/templates/opcache.ini.j2
rename to roles/php/templates/opcache.ini.j2
diff --git a/roles/geerlingguy.php/templates/php-fpm.conf.j2 b/roles/php/templates/php-fpm.conf.j2
similarity index 100%
rename from roles/geerlingguy.php/templates/php-fpm.conf.j2
rename to roles/php/templates/php-fpm.conf.j2
diff --git a/roles/geerlingguy.php/templates/php.ini.j2 b/roles/php/templates/php.ini.j2
similarity index 100%
rename from roles/geerlingguy.php/templates/php.ini.j2
rename to roles/php/templates/php.ini.j2
diff --git a/roles/geerlingguy.php/templates/www.conf.j2 b/roles/php/templates/www.conf.j2
similarity index 100%
rename from roles/geerlingguy.php/templates/www.conf.j2
rename to roles/php/templates/www.conf.j2
diff --git a/roles/geerlingguy.php/vars/Debian-10.yml b/roles/php/vars/Debian-10.yml
similarity index 100%
rename from roles/geerlingguy.php/vars/Debian-10.yml
rename to roles/php/vars/Debian-10.yml
diff --git a/roles/geerlingguy.php/vars/Debian-9.yml b/roles/php/vars/Debian-9.yml
similarity index 100%
rename from roles/geerlingguy.php/vars/Debian-9.yml
rename to roles/php/vars/Debian-9.yml
diff --git a/roles/geerlingguy.php/vars/Debian.yml b/roles/php/vars/Debian.yml
similarity index 100%
rename from roles/geerlingguy.php/vars/Debian.yml
rename to roles/php/vars/Debian.yml
diff --git a/roles/geerlingguy.php/vars/RedHat.yml b/roles/php/vars/RedHat.yml
similarity index 100%
rename from roles/geerlingguy.php/vars/RedHat.yml
rename to roles/php/vars/RedHat.yml
diff --git a/roles/geerlingguy.php/vars/Ubuntu-16.yml b/roles/php/vars/Ubuntu-16.yml
similarity index 100%
rename from roles/geerlingguy.php/vars/Ubuntu-16.yml
rename to roles/php/vars/Ubuntu-16.yml
diff --git a/roles/geerlingguy.php/vars/Ubuntu-18.yml b/roles/php/vars/Ubuntu-18.yml
similarity index 100%
rename from roles/geerlingguy.php/vars/Ubuntu-18.yml
rename to roles/php/vars/Ubuntu-18.yml
diff --git a/roles/geerlingguy.php/vars/Ubuntu-20.yml b/roles/php/vars/Ubuntu-20.yml
similarity index 100%
rename from roles/geerlingguy.php/vars/Ubuntu-20.yml
rename to roles/php/vars/Ubuntu-20.yml
diff --git a/roles/geerlingguy.postgresql/.ansible-lint b/roles/postgresql/.ansible-lint
similarity index 100%
rename from roles/geerlingguy.postgresql/.ansible-lint
rename to roles/postgresql/.ansible-lint
diff --git a/roles/geerlingguy.postgresql/.github/FUNDING.yml b/roles/postgresql/.github/FUNDING.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/.github/FUNDING.yml
rename to roles/postgresql/.github/FUNDING.yml
diff --git a/roles/geerlingguy.postgresql/.github/stale.yml b/roles/postgresql/.github/stale.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/.github/stale.yml
rename to roles/postgresql/.github/stale.yml
diff --git a/roles/geerlingguy.postgresql/.gitignore b/roles/postgresql/.gitignore
similarity index 100%
rename from roles/geerlingguy.postgresql/.gitignore
rename to roles/postgresql/.gitignore
diff --git a/roles/geerlingguy.postgresql/.travis.yml b/roles/postgresql/.travis.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/.travis.yml
rename to roles/postgresql/.travis.yml
diff --git a/roles/geerlingguy.postgresql/.yamllint b/roles/postgresql/.yamllint
similarity index 100%
rename from roles/geerlingguy.postgresql/.yamllint
rename to roles/postgresql/.yamllint
diff --git a/roles/geerlingguy.postgresql/LICENSE b/roles/postgresql/LICENSE
similarity index 100%
rename from roles/geerlingguy.postgresql/LICENSE
rename to roles/postgresql/LICENSE
diff --git a/roles/geerlingguy.postgresql/README.md b/roles/postgresql/README.md
similarity index 100%
rename from roles/geerlingguy.postgresql/README.md
rename to roles/postgresql/README.md
diff --git a/roles/geerlingguy.postgresql/defaults/main.yml b/roles/postgresql/defaults/main.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/defaults/main.yml
rename to roles/postgresql/defaults/main.yml
diff --git a/roles/geerlingguy.postgresql/handlers/main.yml b/roles/postgresql/handlers/main.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/handlers/main.yml
rename to roles/postgresql/handlers/main.yml
diff --git a/roles/geerlingguy.postgresql/meta/.galaxy_install_info b/roles/postgresql/meta/.galaxy_install_info
similarity index 100%
rename from roles/geerlingguy.postgresql/meta/.galaxy_install_info
rename to roles/postgresql/meta/.galaxy_install_info
diff --git a/roles/geerlingguy.postgresql/meta/main.yml b/roles/postgresql/meta/main.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/meta/main.yml
rename to roles/postgresql/meta/main.yml
diff --git a/roles/geerlingguy.postgresql/molecule/default/converge.yml b/roles/postgresql/molecule/default/converge.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/molecule/default/converge.yml
rename to roles/postgresql/molecule/default/converge.yml
diff --git a/roles/geerlingguy.postgresql/molecule/default/molecule.yml b/roles/postgresql/molecule/default/molecule.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/molecule/default/molecule.yml
rename to roles/postgresql/molecule/default/molecule.yml
diff --git a/roles/geerlingguy.postgresql/tasks/configure.yml b/roles/postgresql/tasks/configure.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/tasks/configure.yml
rename to roles/postgresql/tasks/configure.yml
diff --git a/roles/geerlingguy.postgresql/tasks/databases.yml b/roles/postgresql/tasks/databases.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/tasks/databases.yml
rename to roles/postgresql/tasks/databases.yml
diff --git a/roles/geerlingguy.postgresql/tasks/initialize.yml b/roles/postgresql/tasks/initialize.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/tasks/initialize.yml
rename to roles/postgresql/tasks/initialize.yml
diff --git a/roles/geerlingguy.postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/tasks/main.yml
rename to roles/postgresql/tasks/main.yml
diff --git a/roles/geerlingguy.postgresql/tasks/setup-Debian.yml b/roles/postgresql/tasks/setup-Debian.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/tasks/setup-Debian.yml
rename to roles/postgresql/tasks/setup-Debian.yml
diff --git a/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml b/roles/postgresql/tasks/setup-RedHat.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
rename to roles/postgresql/tasks/setup-RedHat.yml
diff --git a/roles/geerlingguy.postgresql/tasks/users.yml b/roles/postgresql/tasks/users.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/tasks/users.yml
rename to roles/postgresql/tasks/users.yml
diff --git a/roles/geerlingguy.postgresql/tasks/variables.yml b/roles/postgresql/tasks/variables.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/tasks/variables.yml
rename to roles/postgresql/tasks/variables.yml
diff --git a/roles/geerlingguy.postgresql/templates/pg_hba.conf.j2 b/roles/postgresql/templates/pg_hba.conf.j2
similarity index 100%
rename from roles/geerlingguy.postgresql/templates/pg_hba.conf.j2
rename to roles/postgresql/templates/pg_hba.conf.j2
diff --git a/roles/geerlingguy.postgresql/templates/postgres.sh.j2 b/roles/postgresql/templates/postgres.sh.j2
similarity index 100%
rename from roles/geerlingguy.postgresql/templates/postgres.sh.j2
rename to roles/postgresql/templates/postgres.sh.j2
diff --git a/roles/geerlingguy.postgresql/vars/Debian-10.yml b/roles/postgresql/vars/Debian-10.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Debian-10.yml
rename to roles/postgresql/vars/Debian-10.yml
diff --git a/roles/geerlingguy.postgresql/vars/Debian-7.yml b/roles/postgresql/vars/Debian-7.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Debian-7.yml
rename to roles/postgresql/vars/Debian-7.yml
diff --git a/roles/geerlingguy.postgresql/vars/Debian-8.yml b/roles/postgresql/vars/Debian-8.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Debian-8.yml
rename to roles/postgresql/vars/Debian-8.yml
diff --git a/roles/geerlingguy.postgresql/vars/Debian-9.yml b/roles/postgresql/vars/Debian-9.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Debian-9.yml
rename to roles/postgresql/vars/Debian-9.yml
diff --git a/roles/geerlingguy.postgresql/vars/Fedora-29.yml b/roles/postgresql/vars/Fedora-29.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Fedora-29.yml
rename to roles/postgresql/vars/Fedora-29.yml
diff --git a/roles/geerlingguy.postgresql/vars/Fedora-30.yml b/roles/postgresql/vars/Fedora-30.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Fedora-30.yml
rename to roles/postgresql/vars/Fedora-30.yml
diff --git a/roles/geerlingguy.postgresql/vars/Fedora-31.yml b/roles/postgresql/vars/Fedora-31.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Fedora-31.yml
rename to roles/postgresql/vars/Fedora-31.yml
diff --git a/roles/geerlingguy.postgresql/vars/Fedora-32.yml b/roles/postgresql/vars/Fedora-32.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Fedora-32.yml
rename to roles/postgresql/vars/Fedora-32.yml
diff --git a/roles/geerlingguy.postgresql/vars/RedHat-6.yml b/roles/postgresql/vars/RedHat-6.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/RedHat-6.yml
rename to roles/postgresql/vars/RedHat-6.yml
diff --git a/roles/geerlingguy.postgresql/vars/RedHat-7.yml b/roles/postgresql/vars/RedHat-7.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/RedHat-7.yml
rename to roles/postgresql/vars/RedHat-7.yml
diff --git a/roles/geerlingguy.postgresql/vars/RedHat-8.yml b/roles/postgresql/vars/RedHat-8.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/RedHat-8.yml
rename to roles/postgresql/vars/RedHat-8.yml
diff --git a/roles/geerlingguy.postgresql/vars/Ubuntu-16.yml b/roles/postgresql/vars/Ubuntu-16.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Ubuntu-16.yml
rename to roles/postgresql/vars/Ubuntu-16.yml
diff --git a/roles/geerlingguy.postgresql/vars/Ubuntu-18.yml b/roles/postgresql/vars/Ubuntu-18.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Ubuntu-18.yml
rename to roles/postgresql/vars/Ubuntu-18.yml
diff --git a/roles/geerlingguy.postgresql/vars/Ubuntu-20.yml b/roles/postgresql/vars/Ubuntu-20.yml
similarity index 100%
rename from roles/geerlingguy.postgresql/vars/Ubuntu-20.yml
rename to roles/postgresql/vars/Ubuntu-20.yml
diff --git a/roles/requirements.yml b/roles/requirements.yml
index c14932a..f40c1b1 100644
--- a/roles/requirements.yml
+++ b/roles/requirements.yml
@@ -9,14 +9,17 @@
 # Docs: https://github.com/geerlingguy/ansible-role-postgresql
 - src: geerlingguy.postgresql
   version: 2.2.1
+  name: postgresql
 
 # Webserver stuff
 # Docs: https://github.com/geerlingguy/ansible-role-apache
 - src: geerlingguy.apache
   version: 3.1.0
+  name: apache
 # Docs: https://github.com/geerlingguy/ansible-role-php
 - src: geerlingguy.php
   version: 4.5.1
+  name: php
 
 # Web applications
 # Docs: https://github.com/thomas-maurice/ansible-role-gitea
diff --git a/site.yml b/site.yml
index 184fb16..75f8d6e 100755
--- a/site.yml
+++ b/site.yml
@@ -11,7 +11,7 @@
   # Database servers
 - hosts: db1.test.desu.ltd
   roles:
-    - role: geerlingguy.postgresql
+    - role: postgresql
       vars:
         postgresql_global_config_options:
           - option: listen_addresses
@@ -35,7 +35,7 @@
   # Webservers
 - hosts: web1.test.desu.ltd
   roles:
-    - role: geerlingguy.apache
+    - role: apache
       vars:
         apache_mods_enabled:
           - proxy.load
@@ -48,7 +48,7 @@
               ProxyPass / http://127.0.0.1:3000/ nocanon retry=1
       become: yes
       tags: [ web, apache ]
-    - role: geerlingguy.php
+    - role: php
       become: yes
       tags: [ web, php ]
     - role: gitea