From 46e1eb29a2bcf27b8b234f9d3ad4cd52fbf442bf Mon Sep 17 00:00:00 2001 From: Ivan Grynenko Date: Wed, 6 Jul 2016 07:38:28 +1000 Subject: [PATCH] Reorganised folders --- lemp-rhel7/LICENSE.md => LICENSE.md | 0 README.md | 157 +++--------------- {lemp-rhel7/group_vars => group_vars}/all.yml | 0 lemp-rhel7/hosts => hosts | 0 lemp-rhel7/README.md | 34 ---- .../roles/ansible-role-mysql/.travis.yml | 76 --------- .../ansible-role-mysql/defaults/main.yml | 95 ----------- .../ansible-role-mysql/handlers/main.yml | 3 - meta/main.yml | 22 --- .../ansible-role-apache/.travis.yml | 0 .../ansible-role-apache/README.md | 0 .../ansible-role-apache/defaults/main.yml | 0 .../ansible-role-apache/handlers/main.yml | 0 .../ansible-role-apache/meta/main.yml | 0 .../tasks/configure-Debian.yml | 0 .../tasks/configure-RedHat.yml | 0 .../tasks/configure-Solaris.yml | 0 .../tasks/configure-Suse.yml | 0 .../ansible-role-apache/tasks/main.yml | 0 .../tasks/setup-Debian.yml | 0 .../tasks/setup-RedHat.yml | 0 .../tasks/setup-Solaris.yml | 0 .../ansible-role-apache/tasks/setup-Suse.yml | 0 .../templates/vhosts.conf.j2 | 0 .../tests/Dockerfile.centos-6 | 0 .../tests/Dockerfile.centos-7 | 0 .../tests/Dockerfile.ubuntu-12.04 | 0 .../tests/Dockerfile.ubuntu-14.04 | 0 .../ansible-role-apache/tests/test.yml | 0 .../ansible-role-apache/vars/Debian.yml | 0 .../ansible-role-apache/vars/RedHat.yml | 0 .../ansible-role-apache/vars/Solaris.yml | 0 .../ansible-role-apache/vars/Suse.yml | 0 .../ansible-role-apache/vars/apache-22.yml | 0 .../ansible-role-apache/vars/apache-24.yml | 0 .../ansible-role-composer/.travis.yml | 0 .../ansible-role-composer/README.md | 0 .../ansible-role-composer/defaults/main.yml | 0 .../ansible-role-composer/meta/main.yml | 0 .../tasks/global-require.yml | 0 .../ansible-role-composer/tasks/main.yml | 0 .../templates/auth.json.j2 | 0 .../templates/composer.sh.j2 | 0 .../ansible-role-composer/tests/inventory | 0 .../tests/test-global-require.yml | 0 .../ansible-role-composer/tests/test.yml | 0 .../ansible-role-drupal-console/.travis.yml | 0 .../ansible-role-drupal-console/README.md | 0 .../defaults/main.yml | 0 .../ansible-role-drupal-console/meta/main.yml | 0 .../tasks/main.yml | 0 .../tests/inventory | 0 .../tests/test-self-update.yml | 0 .../tests/test.yml | 0 .../ansible-role-drush/.travis.yml | 0 .../ansible-role-drush/README.md | 0 .../ansible-role-drush/defaults/main.yml | 0 .../ansible-role-drush/meta/main.yml | 0 .../ansible-role-drush/tasks/main.yml | 0 .../ansible-role-drush/tests/inventory | 0 .../ansible-role-drush/tests/test.yml | 0 .../ansible-role-git/.gitignore | 0 .../ansible-role-git/.travis.yml | 0 .../ansible-role-git/README.md | 0 .../ansible-role-git/defaults/main.yml | 0 .../ansible-role-git/meta/main.yml | 0 .../tasks/install-from-source.yml | 0 .../ansible-role-git/tasks/main.yml | 0 .../tests/Dockerfile.centos-6 | 0 .../tests/Dockerfile.centos-7 | 0 .../tests/Dockerfile.ubuntu-12.04 | 0 .../tests/Dockerfile.ubuntu-14.04 | 0 .../ansible-role-git/tests/test-package.yml | 0 .../ansible-role-git/tests/test-source.yml | 0 .../ansible-role-git/vars/main.yml | 0 .../ansible-role-memcached/.gitignore | 0 .../ansible-role-memcached/.travis.yml | 0 .../ansible-role-memcached/README.md | 0 .../ansible-role-memcached/defaults/main.yml | 0 .../ansible-role-memcached/handlers/main.yml | 0 .../ansible-role-memcached/meta/main.yml | 0 .../ansible-role-memcached/tasks/main.yml | 0 .../tasks/setup-Debian.yml | 0 .../tasks/setup-RedHat.yml | 0 .../templates/memcached-Debian.conf.j2 | 0 .../templates/memcached-RedHat.conf.j2 | 0 .../ansible-role-memcached/tests/inventory | 0 .../ansible-role-memcached/tests/test.yml | 0 .../ansible-role-memcached/vars/Debian.yml | 0 .../ansible-role-memcached/vars/RedHat.yml | 0 .../ansible-role-mysql/.travis.yml | 0 .../ansible-role-mysql/README.md | 0 .../ansible-role-mysql/defaults}/main.yml | 0 .../ansible-role-mysql/handlers}/main.yml | 0 .../ansible-role-mysql/meta/main.yml | 0 .../ansible-role-mysql/tasks/configure.yml | 0 .../ansible-role-mysql/tasks/databases.yml | 0 .../ansible-role-mysql/tasks/main.yml | 0 .../ansible-role-mysql/tasks/replication.yml | 0 .../tasks/secure-installation.yml | 0 .../ansible-role-mysql/tasks/setup-Debian.yml | 0 .../ansible-role-mysql/tasks/setup-RedHat.yml | 0 .../ansible-role-mysql/tasks/users.yml | 0 .../ansible-role-mysql/templates/my.cnf.j2 | 0 .../templates/user-my.cnf.j2 | 0 .../tests/Dockerfile.centos-6 | 0 .../tests/Dockerfile.centos-7 | 0 .../tests/Dockerfile.ubuntu-12.04 | 0 .../tests/Dockerfile.ubuntu-14.04 | 0 .../tests/centos-7-test.yml | 0 .../ansible-role-mysql/tests/initctl_faker | 0 .../ansible-role-mysql/tests/inventory | 0 .../ansible-role-mysql/tests/test.yml | 0 .../ansible-role-mysql/vars/Debian.yml | 0 .../ansible-role-mysql/vars/RedHat-6.yml | 0 .../ansible-role-mysql/vars/RedHat-7.yml | 0 .../ansible-role-nginx/.travis.yml | 0 .../ansible-role-nginx/README.md | 0 .../ansible-role-nginx/defaults/main.yml | 0 .../ansible-role-nginx/handlers/main.yml | 0 .../ansible-role-nginx/meta/main.yml | 0 .../ansible-role-nginx/tasks/main.yml | 0 .../ansible-role-nginx/tasks/setup-Debian.yml | 0 .../tasks/setup-FreeBSD.yml | 0 .../ansible-role-nginx/tasks/setup-RedHat.yml | 0 .../ansible-role-nginx/tasks/setup-Ubuntu.yml | 0 .../ansible-role-nginx/tasks/vhosts.yml | 0 .../templates/headers.conf.j2 | 0 .../templates/nginx.conf.j2 | 0 .../templates/nginx.repo.j2 | 0 .../ansible-role-nginx/templates/vhosts.j2 | 0 .../ansible-role-nginx/tests/inventory | 0 .../ansible-role-nginx/tests/test.yml | 0 .../ansible-role-nginx/vars/Debian.yml | 0 .../ansible-role-nginx/vars/FreeBSD.yml | 0 .../ansible-role-nginx/vars/RedHat.yml | 0 .../ansible-role-php/.travis.yml | 0 .../ansible-role-php/README.md | 0 .../ansible-role-php/defaults/main.yml | 0 .../ansible-role-php/handlers/main.yml | 0 .../ansible-role-php/meta/main.yml | 0 .../ansible-role-php/tasks/configure-apcu.yml | 0 .../ansible-role-php/tasks/configure-fpm.yml | 0 .../tasks/configure-opcache.yml | 0 .../ansible-role-php/tasks/configure.yml | 0 .../tasks/install-from-source.yml | 0 .../ansible-role-php/tasks/main.yml | 0 .../ansible-role-php/tasks/setup-Debian.yml | 0 .../ansible-role-php/tasks/setup-RedHat.yml | 0 .../ansible-role-php/templates/apc.ini.j2 | 0 .../ansible-role-php/templates/fpm-init.j2 | 0 .../ansible-role-php/templates/opcache.ini.j2 | 0 .../templates/php-fpm.conf.j2 | 0 .../ansible-role-php/templates/php.ini.j2 | 0 .../ansible-role-php/templates/www.conf.j2 | 0 .../tests/Dockerfile.centos-7 | 0 .../tests/Dockerfile.ubuntu-12.04 | 0 .../tests/Dockerfile.ubuntu-14.04 | 0 .../ansible-role-php/tests/inventory | 0 .../ansible-role-php/tests/requirements.yml | 0 .../ansible-role-php/tests/test-package.yml | 0 .../ansible-role-php/tests/test-source.yml | 0 .../tests/test-vars-ubuntu1204.yml | 0 .../ansible-role-php/vars/Debian.yml | 0 .../ansible-role-php/vars/RedHat.yml | 0 .../ansible-role-postfix/.travis.yml | 0 .../ansible-role-postfix/README.md | 0 .../ansible-role-postfix/defaults/main.yml | 0 .../ansible-role-postfix/meta/main.yml | 0 .../ansible-role-postfix/tasks/main.yml | 0 .../ansible-role-postfix/tests/inventory | 0 .../ansible-role-postfix/tests/test.yml | 0 .../common/files/RPM-GPG-KEY-EPEL-7 | 0 .../common/files/RPM-GPG-KEY-NGINX | 0 .../roles => roles}/common/files/epel.repo | 0 .../roles => roles}/common/files/nginx.repo | 0 .../roles => roles}/common/tasks/main.yml | 0 .../common/tasks/setup-RedHat.yml | 0 .../roles => roles}/wordpress/tasks/main.yml | 0 .../wordpress/templates/wp-config.php | 0 lemp-rhel7/site.retry => site.retry | 0 lemp-rhel7/site.yml => site.yml | 0 tasks/configure.yml | 69 -------- tasks/databases.yml | 8 - tasks/main.yml | 42 ----- tasks/replication.yml | 51 ------ tasks/secure-installation.yml | 44 ----- tasks/setup-Debian.yml | 26 --- tasks/setup-RedHat.yml | 8 - tasks/users.yml | 11 -- templates/my.cnf.j2 | 105 ------------ templates/user-my.cnf.j2 | 3 - tests/Dockerfile.centos-6 | 15 -- tests/Dockerfile.centos-7 | 27 --- tests/Dockerfile.ubuntu-12.04 | 14 -- tests/Dockerfile.ubuntu-14.04 | 14 -- tests/centos-7-test.yml | 15 -- tests/initctl_faker | 23 --- tests/inventory | 1 - tests/test.yml | 4 - vars/Debian.yml | 9 - vars/RedHat-6.yml | 9 - vars/RedHat-7.yml | 15 -- 203 files changed, 24 insertions(+), 876 deletions(-) rename lemp-rhel7/LICENSE.md => LICENSE.md (100%) rename {lemp-rhel7/group_vars => group_vars}/all.yml (100%) rename lemp-rhel7/hosts => hosts (100%) delete mode 100644 lemp-rhel7/README.md delete mode 100644 lemp-rhel7/roles/ansible-role-mysql/.travis.yml delete mode 100755 lemp-rhel7/roles/ansible-role-mysql/defaults/main.yml delete mode 100755 lemp-rhel7/roles/ansible-role-mysql/handlers/main.yml delete mode 100644 meta/main.yml rename {lemp-rhel7/roles => roles}/ansible-role-apache/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/README.md (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/defaults/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/handlers/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tasks/configure-Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tasks/configure-RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tasks/configure-Solaris.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tasks/configure-Suse.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tasks/setup-Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tasks/setup-RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tasks/setup-Solaris.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tasks/setup-Suse.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/templates/vhosts.conf.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tests/Dockerfile.centos-6 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tests/Dockerfile.centos-7 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tests/Dockerfile.ubuntu-12.04 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tests/Dockerfile.ubuntu-14.04 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/tests/test.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/vars/Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/vars/RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/vars/Solaris.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/vars/Suse.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/vars/apache-22.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-apache/vars/apache-24.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/README.md (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/defaults/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/tasks/global-require.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/templates/auth.json.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/templates/composer.sh.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/tests/inventory (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/tests/test-global-require.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-composer/tests/test.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drupal-console/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drupal-console/README.md (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drupal-console/defaults/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drupal-console/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drupal-console/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drupal-console/tests/inventory (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drupal-console/tests/test-self-update.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drupal-console/tests/test.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drush/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drush/README.md (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drush/defaults/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drush/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drush/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drush/tests/inventory (100%) rename {lemp-rhel7/roles => roles}/ansible-role-drush/tests/test.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/.gitignore (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/README.md (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/defaults/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/tasks/install-from-source.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/tests/Dockerfile.centos-6 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/tests/Dockerfile.centos-7 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/tests/Dockerfile.ubuntu-12.04 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/tests/Dockerfile.ubuntu-14.04 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/tests/test-package.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/tests/test-source.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-git/vars/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/.gitignore (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/README.md (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/defaults/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/handlers/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/tasks/setup-Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/tasks/setup-RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/templates/memcached-Debian.conf.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/templates/memcached-RedHat.conf.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/tests/inventory (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/tests/test.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/vars/Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-memcached/vars/RedHat.yml (100%) rename .travis.yml => roles/ansible-role-mysql/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/README.md (100%) rename {defaults => roles/ansible-role-mysql/defaults}/main.yml (100%) mode change 100644 => 100755 rename {handlers => roles/ansible-role-mysql/handlers}/main.yml (100%) mode change 100644 => 100755 rename {lemp-rhel7/roles => roles}/ansible-role-mysql/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tasks/configure.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tasks/databases.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tasks/replication.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tasks/secure-installation.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tasks/setup-Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tasks/setup-RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tasks/users.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/templates/my.cnf.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/templates/user-my.cnf.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tests/Dockerfile.centos-6 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tests/Dockerfile.centos-7 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tests/Dockerfile.ubuntu-12.04 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tests/Dockerfile.ubuntu-14.04 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tests/centos-7-test.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tests/initctl_faker (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tests/inventory (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/tests/test.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/vars/Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/vars/RedHat-6.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-mysql/vars/RedHat-7.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/README.md (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/defaults/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/handlers/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/tasks/setup-Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/tasks/setup-FreeBSD.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/tasks/setup-RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/tasks/setup-Ubuntu.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/tasks/vhosts.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/templates/headers.conf.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/templates/nginx.conf.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/templates/nginx.repo.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/templates/vhosts.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/tests/inventory (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/tests/test.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/vars/Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/vars/FreeBSD.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-nginx/vars/RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/README.md (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/defaults/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/handlers/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tasks/configure-apcu.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tasks/configure-fpm.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tasks/configure-opcache.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tasks/configure.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tasks/install-from-source.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tasks/setup-Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tasks/setup-RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/templates/apc.ini.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/templates/fpm-init.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/templates/opcache.ini.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/templates/php-fpm.conf.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/templates/php.ini.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/templates/www.conf.j2 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tests/Dockerfile.centos-7 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tests/Dockerfile.ubuntu-12.04 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tests/Dockerfile.ubuntu-14.04 (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tests/inventory (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tests/requirements.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tests/test-package.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tests/test-source.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/tests/test-vars-ubuntu1204.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/vars/Debian.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-php/vars/RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-postfix/.travis.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-postfix/README.md (100%) rename {lemp-rhel7/roles => roles}/ansible-role-postfix/defaults/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-postfix/meta/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-postfix/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/ansible-role-postfix/tests/inventory (100%) rename {lemp-rhel7/roles => roles}/ansible-role-postfix/tests/test.yml (100%) rename {lemp-rhel7/roles => roles}/common/files/RPM-GPG-KEY-EPEL-7 (100%) rename {lemp-rhel7/roles => roles}/common/files/RPM-GPG-KEY-NGINX (100%) rename {lemp-rhel7/roles => roles}/common/files/epel.repo (100%) rename {lemp-rhel7/roles => roles}/common/files/nginx.repo (100%) rename {lemp-rhel7/roles => roles}/common/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/common/tasks/setup-RedHat.yml (100%) rename {lemp-rhel7/roles => roles}/wordpress/tasks/main.yml (100%) rename {lemp-rhel7/roles => roles}/wordpress/templates/wp-config.php (100%) rename lemp-rhel7/site.retry => site.retry (100%) rename lemp-rhel7/site.yml => site.yml (100%) delete mode 100644 tasks/configure.yml delete mode 100644 tasks/databases.yml delete mode 100644 tasks/main.yml delete mode 100644 tasks/replication.yml delete mode 100644 tasks/secure-installation.yml delete mode 100644 tasks/setup-Debian.yml delete mode 100644 tasks/setup-RedHat.yml delete mode 100644 tasks/users.yml delete mode 100644 templates/my.cnf.j2 delete mode 100644 templates/user-my.cnf.j2 delete mode 100644 tests/Dockerfile.centos-6 delete mode 100644 tests/Dockerfile.centos-7 delete mode 100644 tests/Dockerfile.ubuntu-12.04 delete mode 100644 tests/Dockerfile.ubuntu-14.04 delete mode 100644 tests/centos-7-test.yml delete mode 100644 tests/initctl_faker delete mode 100644 tests/inventory delete mode 100644 tests/test.yml delete mode 100644 vars/Debian.yml delete mode 100644 vars/RedHat-6.yml delete mode 100644 vars/RedHat-7.yml diff --git a/lemp-rhel7/LICENSE.md b/LICENSE.md similarity index 100% rename from lemp-rhel7/LICENSE.md rename to LICENSE.md diff --git a/README.md b/README.md index 2740c36..f4b8ae7 100644 --- a/README.md +++ b/README.md @@ -1,143 +1,34 @@ -# Ansible Role: MySQL +## WordPress+Nginx+PHP-FPM+MariaDB Deployment -[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-mysql.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-mysql) +- Requires Ansible 1.2 or newer +- Expects CentOS/RHEL 7.x host/s -Installs and configures MySQL or MariaDB server on RHEL/CentOS or Debian/Ubuntu servers. +RHEL7 version reflects changes in Red Hat Enterprise Linux and CentOS 7: +1. Network device naming scheme has changed +2. iptables is replaced with firewalld +3. MySQL is replaced with MariaDB -## Requirements +These playbooks deploy a simple all-in-one configuration of the popular +WordPress blogging platform and CMS, frontend by the Nginx web server and the +PHP-FPM process manager. To use, copy the `hosts.example` file to `hosts` and +edit the `hosts` inventory file to include the names or URLs of the servers +you want to deploy. -No special requirements; note that this role requires root access, so either run it in a playbook with a global `become: yes`, or invoke the role in your playbook like: +Then run the playbook, like this: - - hosts: database - roles: - - role: geerlingguy.mysql - become: yes + ansible-playbook -i hosts site.yml -## Role Variables +The playbooks will configure MariaDB, WordPress, Nginx, and PHP-FPM. When the run +is complete, you can hit access server to begin the WordPress configuration. -Available variables are listed below, along with default values (see `defaults/main.yml`): +### Ideas for Improvement - mysql_user_home: /root +Here are some ideas for ways that these playbooks could be extended: -The home directory inside which Python MySQL settings will be stored, which Ansible will use when connecting to MySQL. This should be the home directory of the user which runs this Ansible role. +- Parameterize the WordPress deployment to handle multi-site configurations. +- Separate the components (PHP-FPM, MySQL, Nginx) onto separate hosts and +handle the configuration appropriately. +- Handle WordPress upgrades automatically. - mysql_root_password: root - -The MySQL root user account password. - - mysql_root_password_update: no - -Whether to force update the MySQL root user's password. By default, this role will only change the root user's password when MySQL is first configured. You can force an update by setting this to `yes`. - -> Note: If you get an error like `ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)` after a failed or interrupted playbook run, this usually means the root password wasn't originally updated to begin with. Try either removing the `.my.cnf` file inside the configured `mysql_user_home` or updating it and setting `password=''` (the insecure default password). Run the playbook again, with `mysql_root_password_update` set to `yes`, and the setup should complete. - - mysql_enabled_on_startup: yes - -Whether MySQL should be enabled on startup. - - overwrite_global_mycnf: yes - -Whether the global my.cnf should be overwritten each time this role is run. Setting this to `no` tells Ansible to only create the `my.cnf` file if it doesn't exist. This should be left at its default value (`yes`) if you'd like to use this role's variables to configure MySQL. - - mysql_config_include_files: [] - -A list of files that should override the default global my.cnf. Each item in the array requires a "src" parameter which is a path to a file. An optional "force" parameter can force the file to be updated each time ansible runs. - - mysql_databases: [] - -The MySQL databases to create. A database has the values `name`, `encoding` (defaults to `utf8`), `collation` (defaults to `utf8_general_ci`) and `replicate` (defaults to `1`, only used if replication is configured). The formats of these are the same as in the `mysql_db` module. - - mysql_users: [] - -The MySQL users and their privileges. A user has the values `name`, `host` (defaults to `localhost`), `password`, `priv` (defaults to `*.*:USAGE`), `append_privs` (defaults to `no`), `state` (defaults to `present`). The formats of these are the same as in the `mysql_user` module. - - mysql_packages: - - mysql - - mysql-server - -(OS-specific, RedHat/CentOS defaults listed here) Packages to be installed. In some situations, you may need to add additional packages, like `mysql-devel`. - - mysql_enablerepo: "" - -(RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install later versions of MySQL. - - mysql_port: "3306" - mysql_bind_address: '0.0.0.0' - mysql_datadir: /var/lib/mysql - -Default MySQL connection configuration. - - mysql_log: "" - mysql_log_error: /var/log/mysqld.log - mysql_syslog_tag: mysqld - -MySQL logging configuration. Setting `mysql_log` (the general query log) or `mysql_log_error` to `syslog` will make MySQL log to syslog using the `mysql_syslog_tag`. - - mysql_slow_query_log_enabled: no - mysql_slow_query_log_file: /var/log/mysql-slow.log - mysql_slow_query_time: 2 - -Slow query log settings. Note that the log file will be created by this role, but if you're running on a server with SELinux or AppArmor, you may need to add this path to the allowed paths for MySQL, or disable the mysql profile. For example, on Debian/Ubuntu, you can run `sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/usr.sbin.mysqld && sudo service apparmor restart`. - - mysql_key_buffer_size: "256M" - mysql_max_allowed_packet: "64M" - mysql_table_open_cache: "256" - [...] - -The rest of the settings in `defaults/main.yml` control MySQL's memory usage. The default values are tuned for a server where MySQL can consume ~512 MB RAM, so you should consider adjusting them to suit your particular server better. - - mysql_server_id: "1" - mysql_max_binlog_size: "100M" - mysql_expire_logs_days: "10" - mysql_replication_role: '' - mysql_replication_master: '' - mysql_replication_user: [] - -Replication settings. Set `mysql_server_id` and `mysql_replication_role` by server (e.g. the master would be ID `1`, with the `mysql_replication_role` of `master`, and the slave would be ID `2`, with the `mysql_replication_role` of `slave`). The `mysql_replication_user` uses the same keys as `mysql_users`, and is created on master servers, and used to replicate on all the slaves. - -### MariaDB usage - -This role works with either MySQL or a compatible version of MariaDB. On RHEL/CentOS 7+, the mariadb database engine was substituted as the default MySQL replacement package. No modifications are necessary though all of the variables still reference 'mysql' instead of mariadb. - -#### Ubuntu 14.04 and 16.04 MariaDB configuration - -On Ubuntu, the package names are named differently, so the `mysql_package` variable needs to be altered. Set the following variables (at a minimum): - - mysql_packages: - - mariadb-client - - mariadb-server - - python-mysqldb - -## Dependencies - -None. - -## Example Playbook - - - hosts: db-servers - become: yes - vars_files: - - vars/main.yml - roles: - - { role: geerlingguy.mysql } - -*Inside `vars/main.yml`*: - - mysql_root_password: super-secure-password - mysql_databases: - - name: example_db - encoding: latin1 - collation: latin1_general_ci - mysql_users: - - name: example_user - host: "%" - password: similarly-secure-password - priv: "example_db.*:ALL" - -## License - -MIT / BSD - -## Author Information - -This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/). +We would love to see contributions and improvements, so please fork this +repository on GitHub and send us your changes via pull requests. \ No newline at end of file diff --git a/lemp-rhel7/group_vars/all.yml b/group_vars/all.yml similarity index 100% rename from lemp-rhel7/group_vars/all.yml rename to group_vars/all.yml diff --git a/lemp-rhel7/hosts b/hosts similarity index 100% rename from lemp-rhel7/hosts rename to hosts diff --git a/lemp-rhel7/README.md b/lemp-rhel7/README.md deleted file mode 100644 index f4b8ae7..0000000 --- a/lemp-rhel7/README.md +++ /dev/null @@ -1,34 +0,0 @@ -## WordPress+Nginx+PHP-FPM+MariaDB Deployment - -- Requires Ansible 1.2 or newer -- Expects CentOS/RHEL 7.x host/s - -RHEL7 version reflects changes in Red Hat Enterprise Linux and CentOS 7: -1. Network device naming scheme has changed -2. iptables is replaced with firewalld -3. MySQL is replaced with MariaDB - -These playbooks deploy a simple all-in-one configuration of the popular -WordPress blogging platform and CMS, frontend by the Nginx web server and the -PHP-FPM process manager. To use, copy the `hosts.example` file to `hosts` and -edit the `hosts` inventory file to include the names or URLs of the servers -you want to deploy. - -Then run the playbook, like this: - - ansible-playbook -i hosts site.yml - -The playbooks will configure MariaDB, WordPress, Nginx, and PHP-FPM. When the run -is complete, you can hit access server to begin the WordPress configuration. - -### Ideas for Improvement - -Here are some ideas for ways that these playbooks could be extended: - -- Parameterize the WordPress deployment to handle multi-site configurations. -- Separate the components (PHP-FPM, MySQL, Nginx) onto separate hosts and -handle the configuration appropriately. -- Handle WordPress upgrades automatically. - -We would love to see contributions and improvements, so please fork this -repository on GitHub and send us your changes via pull requests. \ No newline at end of file diff --git a/lemp-rhel7/roles/ansible-role-mysql/.travis.yml b/lemp-rhel7/roles/ansible-role-mysql/.travis.yml deleted file mode 100644 index 22cbfa4..0000000 --- a/lemp-rhel7/roles/ansible-role-mysql/.travis.yml +++ /dev/null @@ -1,76 +0,0 @@ ---- -sudo: required - -env: - - distribution: centos - version: 6 - init: /sbin/init - run_opts: "" - playbook: test.yml - - distribution: centos - version: 7 - init: /usr/lib/systemd/systemd - run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" - playbook: centos-7-test.yml - - distribution: ubuntu - version: 14.04 - init: /sbin/init - run_opts: "" - playbook: test.yml - # - distribution: ubuntu - # version: 12.04 - # init: /sbin/init - # run_opts: "" - # playbook: test.yml - -services: - - docker - -before_install: - # Pull container - - 'sudo docker pull ${distribution}:${version}' - # Customize container - - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests' - -script: - - container_id=$(mktemp) - # Run container in detached state - - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"' - - # Ansible syntax check. - - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check' - - # Test role. - - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}' - - # Test role idempotence. - - > - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} - | grep -q 'changed=0.*failed=0' - && (echo 'Idempotence test: pass' && exit 0) - || (echo 'Idempotence test: fail' && exit 1) - - # Some MySQL debugging (show all the logs). - - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /var/log - - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log || true - - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err || true - - # Check to make sure we can connect to MySQL via Unix socket. - - > - sudo docker exec "$(cat ${container_id})" mysql -u root -proot -e 'show databases;' - | grep -q 'information_schema' - && (echo 'MySQL running normally' && exit 0) - || (echo 'MySQL not running' && exit 1) - - # Check to make sure we can connect to MySQL via TCP. - - > - sudo docker exec "$(cat ${container_id})" mysql -u root -proot -h 127.0.0.1 -e 'show databases;' - | grep -q 'information_schema' - && (echo 'MySQL running normally' && exit 0) - || (echo 'MySQL not running' && exit 1) - - # Clean up - - sudo docker stop "$(cat ${container_id})" - -notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/lemp-rhel7/roles/ansible-role-mysql/defaults/main.yml b/lemp-rhel7/roles/ansible-role-mysql/defaults/main.yml deleted file mode 100755 index 0c7807d..0000000 --- a/lemp-rhel7/roles/ansible-role-mysql/defaults/main.yml +++ /dev/null @@ -1,95 +0,0 @@ ---- -mysql_user_home: /root -mysql_root_username: root -mysql_root_password: root - -# Set this to `yes` to forcibly update the root password. -mysql_root_password_update: no - -mysql_enabled_on_startup: yes - -# update my.cnf. each time role is run? yes | no -overwrite_global_mycnf: yes - -# Pass in a comma-separated list of repos to use (e.g. "remi,epel"). Used only -# for RedHat systems (and derivatives). -mysql_enablerepo: "" - -# Define a custom list of packages to install; if none provided, the default -# package list from vars/[OS-family].yml will be used. -# mysql_packages: -# - mysql -# - mysql-server -# - MySQL-python - -# MySQL connection settings. -mysql_port: "3306" -mysql_bind_address: '0.0.0.0' -mysql_datadir: /var/lib/mysql -mysql_pid_file: /var/run/mysqld/mysqld.pid -mysql_skip_name_resolve: no - -# Slow query log settings. -mysql_slow_query_log_enabled: no -mysql_slow_query_log_file: /var/log/mysql-slow.log -mysql_slow_query_time: 2 - -# Memory settings (default values optimized ~512MB RAM). -mysql_key_buffer_size: "256M" -mysql_max_allowed_packet: "64M" -mysql_table_open_cache: "256" -mysql_sort_buffer_size: "1M" -mysql_read_buffer_size: "1M" -mysql_read_rnd_buffer_size: "4M" -mysql_myisam_sort_buffer_size: "64M" -mysql_thread_cache_size: "8" -mysql_query_cache_size: "16M" -mysql_max_connections: 151 - -# Other settings. -mysql_wait_timeout: 28800 - -# InnoDB settings. -# Set .._buffer_pool_size up to 80% of RAM but beware of setting too high. -mysql_innodb_file_per_table: "1" -mysql_innodb_buffer_pool_size: "256M" -# Set .._log_file_size to 25% of buffer pool size. -mysql_innodb_log_file_size: "64M" -mysql_innodb_log_buffer_size: "8M" -mysql_innodb_flush_log_at_trx_commit: "1" -mysql_innodb_lock_wait_timeout: 50 - -# mysqldump settings. -mysql_mysqldump_max_allowed_packet: "64M" - -# Logging settings. -mysql_log: "" -mysql_log_error: /var/log/mysql.err -mysql_syslog_tag: mysql - -mysql_config_include_files: [] -# - src: path/relative/to/playbook/file.cnf -# - { src: path/relative/to/playbook/anotherfile.cnf, force: yes } - -# Databases. -mysql_databases: [] -# - name: example -# collation: utf8_general_ci -# encoding: utf8 -# replicate: 1 - -# Users. -mysql_users: [] -# - name: example -# host: 127.0.0.1 -# password: secret -# priv: *.*:USAGE - -# Replication settings (replication is only enabled if master/user have values). -mysql_server_id: "1" -mysql_max_binlog_size: "100M" -mysql_expire_logs_days: "10" -mysql_replication_role: '' -mysql_replication_master: '' -# Same keys as `mysql_users` above. -mysql_replication_user: [] diff --git a/lemp-rhel7/roles/ansible-role-mysql/handlers/main.yml b/lemp-rhel7/roles/ansible-role-mysql/handlers/main.yml deleted file mode 100755 index 429abe3..0000000 --- a/lemp-rhel7/roles/ansible-role-mysql/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: restart mysql - service: "name={{ mysql_daemon }} state=restarted sleep=5" diff --git a/meta/main.yml b/meta/main.yml deleted file mode 100644 index 0432274..0000000 --- a/meta/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -dependencies: [] - -galaxy_info: - author: geerlingguy - description: MySQL server for RHEL/CentOS and Debian/Ubuntu. - company: "Midwestern Mac, LLC" - license: "license (BSD, MIT)" - min_ansible_version: 1.9 - platforms: - - name: EL - versions: - - 6 - - 7 - - name: Ubuntu - versions: - - all - - name: Debian - versions: - - all - galaxy_tags: - - database diff --git a/lemp-rhel7/roles/ansible-role-apache/.travis.yml b/roles/ansible-role-apache/.travis.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/.travis.yml rename to roles/ansible-role-apache/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/README.md b/roles/ansible-role-apache/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/README.md rename to roles/ansible-role-apache/README.md diff --git a/lemp-rhel7/roles/ansible-role-apache/defaults/main.yml b/roles/ansible-role-apache/defaults/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/defaults/main.yml rename to roles/ansible-role-apache/defaults/main.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/handlers/main.yml b/roles/ansible-role-apache/handlers/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/handlers/main.yml rename to roles/ansible-role-apache/handlers/main.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/meta/main.yml b/roles/ansible-role-apache/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/meta/main.yml rename to roles/ansible-role-apache/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/tasks/configure-Debian.yml b/roles/ansible-role-apache/tasks/configure-Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tasks/configure-Debian.yml rename to roles/ansible-role-apache/tasks/configure-Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/tasks/configure-RedHat.yml b/roles/ansible-role-apache/tasks/configure-RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tasks/configure-RedHat.yml rename to roles/ansible-role-apache/tasks/configure-RedHat.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/tasks/configure-Solaris.yml b/roles/ansible-role-apache/tasks/configure-Solaris.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tasks/configure-Solaris.yml rename to roles/ansible-role-apache/tasks/configure-Solaris.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/tasks/configure-Suse.yml b/roles/ansible-role-apache/tasks/configure-Suse.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tasks/configure-Suse.yml rename to roles/ansible-role-apache/tasks/configure-Suse.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/tasks/main.yml b/roles/ansible-role-apache/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tasks/main.yml rename to roles/ansible-role-apache/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/tasks/setup-Debian.yml b/roles/ansible-role-apache/tasks/setup-Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tasks/setup-Debian.yml rename to roles/ansible-role-apache/tasks/setup-Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/tasks/setup-RedHat.yml b/roles/ansible-role-apache/tasks/setup-RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tasks/setup-RedHat.yml rename to roles/ansible-role-apache/tasks/setup-RedHat.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/tasks/setup-Solaris.yml b/roles/ansible-role-apache/tasks/setup-Solaris.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tasks/setup-Solaris.yml rename to roles/ansible-role-apache/tasks/setup-Solaris.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/tasks/setup-Suse.yml b/roles/ansible-role-apache/tasks/setup-Suse.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tasks/setup-Suse.yml rename to roles/ansible-role-apache/tasks/setup-Suse.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/templates/vhosts.conf.j2 b/roles/ansible-role-apache/templates/vhosts.conf.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/templates/vhosts.conf.j2 rename to roles/ansible-role-apache/templates/vhosts.conf.j2 diff --git a/lemp-rhel7/roles/ansible-role-apache/tests/Dockerfile.centos-6 b/roles/ansible-role-apache/tests/Dockerfile.centos-6 similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tests/Dockerfile.centos-6 rename to roles/ansible-role-apache/tests/Dockerfile.centos-6 diff --git a/lemp-rhel7/roles/ansible-role-apache/tests/Dockerfile.centos-7 b/roles/ansible-role-apache/tests/Dockerfile.centos-7 similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tests/Dockerfile.centos-7 rename to roles/ansible-role-apache/tests/Dockerfile.centos-7 diff --git a/lemp-rhel7/roles/ansible-role-apache/tests/Dockerfile.ubuntu-12.04 b/roles/ansible-role-apache/tests/Dockerfile.ubuntu-12.04 similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tests/Dockerfile.ubuntu-12.04 rename to roles/ansible-role-apache/tests/Dockerfile.ubuntu-12.04 diff --git a/lemp-rhel7/roles/ansible-role-apache/tests/Dockerfile.ubuntu-14.04 b/roles/ansible-role-apache/tests/Dockerfile.ubuntu-14.04 similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tests/Dockerfile.ubuntu-14.04 rename to roles/ansible-role-apache/tests/Dockerfile.ubuntu-14.04 diff --git a/lemp-rhel7/roles/ansible-role-apache/tests/test.yml b/roles/ansible-role-apache/tests/test.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/tests/test.yml rename to roles/ansible-role-apache/tests/test.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/vars/Debian.yml b/roles/ansible-role-apache/vars/Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/vars/Debian.yml rename to roles/ansible-role-apache/vars/Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/vars/RedHat.yml b/roles/ansible-role-apache/vars/RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/vars/RedHat.yml rename to roles/ansible-role-apache/vars/RedHat.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/vars/Solaris.yml b/roles/ansible-role-apache/vars/Solaris.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/vars/Solaris.yml rename to roles/ansible-role-apache/vars/Solaris.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/vars/Suse.yml b/roles/ansible-role-apache/vars/Suse.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/vars/Suse.yml rename to roles/ansible-role-apache/vars/Suse.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/vars/apache-22.yml b/roles/ansible-role-apache/vars/apache-22.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/vars/apache-22.yml rename to roles/ansible-role-apache/vars/apache-22.yml diff --git a/lemp-rhel7/roles/ansible-role-apache/vars/apache-24.yml b/roles/ansible-role-apache/vars/apache-24.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-apache/vars/apache-24.yml rename to roles/ansible-role-apache/vars/apache-24.yml diff --git a/lemp-rhel7/roles/ansible-role-composer/.travis.yml b/roles/ansible-role-composer/.travis.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/.travis.yml rename to roles/ansible-role-composer/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-composer/README.md b/roles/ansible-role-composer/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/README.md rename to roles/ansible-role-composer/README.md diff --git a/lemp-rhel7/roles/ansible-role-composer/defaults/main.yml b/roles/ansible-role-composer/defaults/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/defaults/main.yml rename to roles/ansible-role-composer/defaults/main.yml diff --git a/lemp-rhel7/roles/ansible-role-composer/meta/main.yml b/roles/ansible-role-composer/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/meta/main.yml rename to roles/ansible-role-composer/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-composer/tasks/global-require.yml b/roles/ansible-role-composer/tasks/global-require.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/tasks/global-require.yml rename to roles/ansible-role-composer/tasks/global-require.yml diff --git a/lemp-rhel7/roles/ansible-role-composer/tasks/main.yml b/roles/ansible-role-composer/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/tasks/main.yml rename to roles/ansible-role-composer/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-composer/templates/auth.json.j2 b/roles/ansible-role-composer/templates/auth.json.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/templates/auth.json.j2 rename to roles/ansible-role-composer/templates/auth.json.j2 diff --git a/lemp-rhel7/roles/ansible-role-composer/templates/composer.sh.j2 b/roles/ansible-role-composer/templates/composer.sh.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/templates/composer.sh.j2 rename to roles/ansible-role-composer/templates/composer.sh.j2 diff --git a/lemp-rhel7/roles/ansible-role-composer/tests/inventory b/roles/ansible-role-composer/tests/inventory similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/tests/inventory rename to roles/ansible-role-composer/tests/inventory diff --git a/lemp-rhel7/roles/ansible-role-composer/tests/test-global-require.yml b/roles/ansible-role-composer/tests/test-global-require.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/tests/test-global-require.yml rename to roles/ansible-role-composer/tests/test-global-require.yml diff --git a/lemp-rhel7/roles/ansible-role-composer/tests/test.yml b/roles/ansible-role-composer/tests/test.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-composer/tests/test.yml rename to roles/ansible-role-composer/tests/test.yml diff --git a/lemp-rhel7/roles/ansible-role-drupal-console/.travis.yml b/roles/ansible-role-drupal-console/.travis.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drupal-console/.travis.yml rename to roles/ansible-role-drupal-console/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-drupal-console/README.md b/roles/ansible-role-drupal-console/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-drupal-console/README.md rename to roles/ansible-role-drupal-console/README.md diff --git a/lemp-rhel7/roles/ansible-role-drupal-console/defaults/main.yml b/roles/ansible-role-drupal-console/defaults/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drupal-console/defaults/main.yml rename to roles/ansible-role-drupal-console/defaults/main.yml diff --git a/lemp-rhel7/roles/ansible-role-drupal-console/meta/main.yml b/roles/ansible-role-drupal-console/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drupal-console/meta/main.yml rename to roles/ansible-role-drupal-console/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-drupal-console/tasks/main.yml b/roles/ansible-role-drupal-console/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drupal-console/tasks/main.yml rename to roles/ansible-role-drupal-console/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-drupal-console/tests/inventory b/roles/ansible-role-drupal-console/tests/inventory similarity index 100% rename from lemp-rhel7/roles/ansible-role-drupal-console/tests/inventory rename to roles/ansible-role-drupal-console/tests/inventory diff --git a/lemp-rhel7/roles/ansible-role-drupal-console/tests/test-self-update.yml b/roles/ansible-role-drupal-console/tests/test-self-update.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drupal-console/tests/test-self-update.yml rename to roles/ansible-role-drupal-console/tests/test-self-update.yml diff --git a/lemp-rhel7/roles/ansible-role-drupal-console/tests/test.yml b/roles/ansible-role-drupal-console/tests/test.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drupal-console/tests/test.yml rename to roles/ansible-role-drupal-console/tests/test.yml diff --git a/lemp-rhel7/roles/ansible-role-drush/.travis.yml b/roles/ansible-role-drush/.travis.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drush/.travis.yml rename to roles/ansible-role-drush/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-drush/README.md b/roles/ansible-role-drush/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-drush/README.md rename to roles/ansible-role-drush/README.md diff --git a/lemp-rhel7/roles/ansible-role-drush/defaults/main.yml b/roles/ansible-role-drush/defaults/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drush/defaults/main.yml rename to roles/ansible-role-drush/defaults/main.yml diff --git a/lemp-rhel7/roles/ansible-role-drush/meta/main.yml b/roles/ansible-role-drush/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drush/meta/main.yml rename to roles/ansible-role-drush/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-drush/tasks/main.yml b/roles/ansible-role-drush/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drush/tasks/main.yml rename to roles/ansible-role-drush/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-drush/tests/inventory b/roles/ansible-role-drush/tests/inventory similarity index 100% rename from lemp-rhel7/roles/ansible-role-drush/tests/inventory rename to roles/ansible-role-drush/tests/inventory diff --git a/lemp-rhel7/roles/ansible-role-drush/tests/test.yml b/roles/ansible-role-drush/tests/test.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-drush/tests/test.yml rename to roles/ansible-role-drush/tests/test.yml diff --git a/lemp-rhel7/roles/ansible-role-git/.gitignore b/roles/ansible-role-git/.gitignore similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/.gitignore rename to roles/ansible-role-git/.gitignore diff --git a/lemp-rhel7/roles/ansible-role-git/.travis.yml b/roles/ansible-role-git/.travis.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/.travis.yml rename to roles/ansible-role-git/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-git/README.md b/roles/ansible-role-git/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/README.md rename to roles/ansible-role-git/README.md diff --git a/lemp-rhel7/roles/ansible-role-git/defaults/main.yml b/roles/ansible-role-git/defaults/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/defaults/main.yml rename to roles/ansible-role-git/defaults/main.yml diff --git a/lemp-rhel7/roles/ansible-role-git/meta/main.yml b/roles/ansible-role-git/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/meta/main.yml rename to roles/ansible-role-git/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-git/tasks/install-from-source.yml b/roles/ansible-role-git/tasks/install-from-source.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/tasks/install-from-source.yml rename to roles/ansible-role-git/tasks/install-from-source.yml diff --git a/lemp-rhel7/roles/ansible-role-git/tasks/main.yml b/roles/ansible-role-git/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/tasks/main.yml rename to roles/ansible-role-git/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-git/tests/Dockerfile.centos-6 b/roles/ansible-role-git/tests/Dockerfile.centos-6 similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/tests/Dockerfile.centos-6 rename to roles/ansible-role-git/tests/Dockerfile.centos-6 diff --git a/lemp-rhel7/roles/ansible-role-git/tests/Dockerfile.centos-7 b/roles/ansible-role-git/tests/Dockerfile.centos-7 similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/tests/Dockerfile.centos-7 rename to roles/ansible-role-git/tests/Dockerfile.centos-7 diff --git a/lemp-rhel7/roles/ansible-role-git/tests/Dockerfile.ubuntu-12.04 b/roles/ansible-role-git/tests/Dockerfile.ubuntu-12.04 similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/tests/Dockerfile.ubuntu-12.04 rename to roles/ansible-role-git/tests/Dockerfile.ubuntu-12.04 diff --git a/lemp-rhel7/roles/ansible-role-git/tests/Dockerfile.ubuntu-14.04 b/roles/ansible-role-git/tests/Dockerfile.ubuntu-14.04 similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/tests/Dockerfile.ubuntu-14.04 rename to roles/ansible-role-git/tests/Dockerfile.ubuntu-14.04 diff --git a/lemp-rhel7/roles/ansible-role-git/tests/test-package.yml b/roles/ansible-role-git/tests/test-package.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/tests/test-package.yml rename to roles/ansible-role-git/tests/test-package.yml diff --git a/lemp-rhel7/roles/ansible-role-git/tests/test-source.yml b/roles/ansible-role-git/tests/test-source.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/tests/test-source.yml rename to roles/ansible-role-git/tests/test-source.yml diff --git a/lemp-rhel7/roles/ansible-role-git/vars/main.yml b/roles/ansible-role-git/vars/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-git/vars/main.yml rename to roles/ansible-role-git/vars/main.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/.gitignore b/roles/ansible-role-memcached/.gitignore similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/.gitignore rename to roles/ansible-role-memcached/.gitignore diff --git a/lemp-rhel7/roles/ansible-role-memcached/.travis.yml b/roles/ansible-role-memcached/.travis.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/.travis.yml rename to roles/ansible-role-memcached/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/README.md b/roles/ansible-role-memcached/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/README.md rename to roles/ansible-role-memcached/README.md diff --git a/lemp-rhel7/roles/ansible-role-memcached/defaults/main.yml b/roles/ansible-role-memcached/defaults/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/defaults/main.yml rename to roles/ansible-role-memcached/defaults/main.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/handlers/main.yml b/roles/ansible-role-memcached/handlers/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/handlers/main.yml rename to roles/ansible-role-memcached/handlers/main.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/meta/main.yml b/roles/ansible-role-memcached/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/meta/main.yml rename to roles/ansible-role-memcached/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/tasks/main.yml b/roles/ansible-role-memcached/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/tasks/main.yml rename to roles/ansible-role-memcached/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/tasks/setup-Debian.yml b/roles/ansible-role-memcached/tasks/setup-Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/tasks/setup-Debian.yml rename to roles/ansible-role-memcached/tasks/setup-Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/tasks/setup-RedHat.yml b/roles/ansible-role-memcached/tasks/setup-RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/tasks/setup-RedHat.yml rename to roles/ansible-role-memcached/tasks/setup-RedHat.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/templates/memcached-Debian.conf.j2 b/roles/ansible-role-memcached/templates/memcached-Debian.conf.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/templates/memcached-Debian.conf.j2 rename to roles/ansible-role-memcached/templates/memcached-Debian.conf.j2 diff --git a/lemp-rhel7/roles/ansible-role-memcached/templates/memcached-RedHat.conf.j2 b/roles/ansible-role-memcached/templates/memcached-RedHat.conf.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/templates/memcached-RedHat.conf.j2 rename to roles/ansible-role-memcached/templates/memcached-RedHat.conf.j2 diff --git a/lemp-rhel7/roles/ansible-role-memcached/tests/inventory b/roles/ansible-role-memcached/tests/inventory similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/tests/inventory rename to roles/ansible-role-memcached/tests/inventory diff --git a/lemp-rhel7/roles/ansible-role-memcached/tests/test.yml b/roles/ansible-role-memcached/tests/test.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/tests/test.yml rename to roles/ansible-role-memcached/tests/test.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/vars/Debian.yml b/roles/ansible-role-memcached/vars/Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/vars/Debian.yml rename to roles/ansible-role-memcached/vars/Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-memcached/vars/RedHat.yml b/roles/ansible-role-memcached/vars/RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-memcached/vars/RedHat.yml rename to roles/ansible-role-memcached/vars/RedHat.yml diff --git a/.travis.yml b/roles/ansible-role-mysql/.travis.yml similarity index 100% rename from .travis.yml rename to roles/ansible-role-mysql/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/README.md b/roles/ansible-role-mysql/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/README.md rename to roles/ansible-role-mysql/README.md diff --git a/defaults/main.yml b/roles/ansible-role-mysql/defaults/main.yml old mode 100644 new mode 100755 similarity index 100% rename from defaults/main.yml rename to roles/ansible-role-mysql/defaults/main.yml diff --git a/handlers/main.yml b/roles/ansible-role-mysql/handlers/main.yml old mode 100644 new mode 100755 similarity index 100% rename from handlers/main.yml rename to roles/ansible-role-mysql/handlers/main.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/meta/main.yml b/roles/ansible-role-mysql/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/meta/main.yml rename to roles/ansible-role-mysql/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/configure.yml b/roles/ansible-role-mysql/tasks/configure.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tasks/configure.yml rename to roles/ansible-role-mysql/tasks/configure.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/databases.yml b/roles/ansible-role-mysql/tasks/databases.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tasks/databases.yml rename to roles/ansible-role-mysql/tasks/databases.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/main.yml b/roles/ansible-role-mysql/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tasks/main.yml rename to roles/ansible-role-mysql/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/replication.yml b/roles/ansible-role-mysql/tasks/replication.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tasks/replication.yml rename to roles/ansible-role-mysql/tasks/replication.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/secure-installation.yml b/roles/ansible-role-mysql/tasks/secure-installation.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tasks/secure-installation.yml rename to roles/ansible-role-mysql/tasks/secure-installation.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/setup-Debian.yml b/roles/ansible-role-mysql/tasks/setup-Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tasks/setup-Debian.yml rename to roles/ansible-role-mysql/tasks/setup-Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/setup-RedHat.yml b/roles/ansible-role-mysql/tasks/setup-RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tasks/setup-RedHat.yml rename to roles/ansible-role-mysql/tasks/setup-RedHat.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/users.yml b/roles/ansible-role-mysql/tasks/users.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tasks/users.yml rename to roles/ansible-role-mysql/tasks/users.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/templates/my.cnf.j2 b/roles/ansible-role-mysql/templates/my.cnf.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/templates/my.cnf.j2 rename to roles/ansible-role-mysql/templates/my.cnf.j2 diff --git a/lemp-rhel7/roles/ansible-role-mysql/templates/user-my.cnf.j2 b/roles/ansible-role-mysql/templates/user-my.cnf.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/templates/user-my.cnf.j2 rename to roles/ansible-role-mysql/templates/user-my.cnf.j2 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-6 b/roles/ansible-role-mysql/tests/Dockerfile.centos-6 similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-6 rename to roles/ansible-role-mysql/tests/Dockerfile.centos-6 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-7 b/roles/ansible-role-mysql/tests/Dockerfile.centos-7 similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-7 rename to roles/ansible-role-mysql/tests/Dockerfile.centos-7 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-12.04 b/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-12.04 similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-12.04 rename to roles/ansible-role-mysql/tests/Dockerfile.ubuntu-12.04 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-14.04 b/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-14.04 similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-14.04 rename to roles/ansible-role-mysql/tests/Dockerfile.ubuntu-14.04 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/centos-7-test.yml b/roles/ansible-role-mysql/tests/centos-7-test.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tests/centos-7-test.yml rename to roles/ansible-role-mysql/tests/centos-7-test.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/initctl_faker b/roles/ansible-role-mysql/tests/initctl_faker similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tests/initctl_faker rename to roles/ansible-role-mysql/tests/initctl_faker diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/inventory b/roles/ansible-role-mysql/tests/inventory similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tests/inventory rename to roles/ansible-role-mysql/tests/inventory diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/test.yml b/roles/ansible-role-mysql/tests/test.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/tests/test.yml rename to roles/ansible-role-mysql/tests/test.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/vars/Debian.yml b/roles/ansible-role-mysql/vars/Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/vars/Debian.yml rename to roles/ansible-role-mysql/vars/Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-6.yml b/roles/ansible-role-mysql/vars/RedHat-6.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-6.yml rename to roles/ansible-role-mysql/vars/RedHat-6.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-7.yml b/roles/ansible-role-mysql/vars/RedHat-7.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-7.yml rename to roles/ansible-role-mysql/vars/RedHat-7.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/.travis.yml b/roles/ansible-role-nginx/.travis.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/.travis.yml rename to roles/ansible-role-nginx/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/README.md b/roles/ansible-role-nginx/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/README.md rename to roles/ansible-role-nginx/README.md diff --git a/lemp-rhel7/roles/ansible-role-nginx/defaults/main.yml b/roles/ansible-role-nginx/defaults/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/defaults/main.yml rename to roles/ansible-role-nginx/defaults/main.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/handlers/main.yml b/roles/ansible-role-nginx/handlers/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/handlers/main.yml rename to roles/ansible-role-nginx/handlers/main.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/meta/main.yml b/roles/ansible-role-nginx/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/meta/main.yml rename to roles/ansible-role-nginx/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/tasks/main.yml b/roles/ansible-role-nginx/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/tasks/main.yml rename to roles/ansible-role-nginx/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/tasks/setup-Debian.yml b/roles/ansible-role-nginx/tasks/setup-Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/tasks/setup-Debian.yml rename to roles/ansible-role-nginx/tasks/setup-Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/tasks/setup-FreeBSD.yml b/roles/ansible-role-nginx/tasks/setup-FreeBSD.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/tasks/setup-FreeBSD.yml rename to roles/ansible-role-nginx/tasks/setup-FreeBSD.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/tasks/setup-RedHat.yml b/roles/ansible-role-nginx/tasks/setup-RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/tasks/setup-RedHat.yml rename to roles/ansible-role-nginx/tasks/setup-RedHat.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/tasks/setup-Ubuntu.yml b/roles/ansible-role-nginx/tasks/setup-Ubuntu.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/tasks/setup-Ubuntu.yml rename to roles/ansible-role-nginx/tasks/setup-Ubuntu.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/tasks/vhosts.yml b/roles/ansible-role-nginx/tasks/vhosts.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/tasks/vhosts.yml rename to roles/ansible-role-nginx/tasks/vhosts.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/templates/headers.conf.j2 b/roles/ansible-role-nginx/templates/headers.conf.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/templates/headers.conf.j2 rename to roles/ansible-role-nginx/templates/headers.conf.j2 diff --git a/lemp-rhel7/roles/ansible-role-nginx/templates/nginx.conf.j2 b/roles/ansible-role-nginx/templates/nginx.conf.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/templates/nginx.conf.j2 rename to roles/ansible-role-nginx/templates/nginx.conf.j2 diff --git a/lemp-rhel7/roles/ansible-role-nginx/templates/nginx.repo.j2 b/roles/ansible-role-nginx/templates/nginx.repo.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/templates/nginx.repo.j2 rename to roles/ansible-role-nginx/templates/nginx.repo.j2 diff --git a/lemp-rhel7/roles/ansible-role-nginx/templates/vhosts.j2 b/roles/ansible-role-nginx/templates/vhosts.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/templates/vhosts.j2 rename to roles/ansible-role-nginx/templates/vhosts.j2 diff --git a/lemp-rhel7/roles/ansible-role-nginx/tests/inventory b/roles/ansible-role-nginx/tests/inventory similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/tests/inventory rename to roles/ansible-role-nginx/tests/inventory diff --git a/lemp-rhel7/roles/ansible-role-nginx/tests/test.yml b/roles/ansible-role-nginx/tests/test.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/tests/test.yml rename to roles/ansible-role-nginx/tests/test.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/vars/Debian.yml b/roles/ansible-role-nginx/vars/Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/vars/Debian.yml rename to roles/ansible-role-nginx/vars/Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/vars/FreeBSD.yml b/roles/ansible-role-nginx/vars/FreeBSD.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/vars/FreeBSD.yml rename to roles/ansible-role-nginx/vars/FreeBSD.yml diff --git a/lemp-rhel7/roles/ansible-role-nginx/vars/RedHat.yml b/roles/ansible-role-nginx/vars/RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-nginx/vars/RedHat.yml rename to roles/ansible-role-nginx/vars/RedHat.yml diff --git a/lemp-rhel7/roles/ansible-role-php/.travis.yml b/roles/ansible-role-php/.travis.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/.travis.yml rename to roles/ansible-role-php/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-php/README.md b/roles/ansible-role-php/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/README.md rename to roles/ansible-role-php/README.md diff --git a/lemp-rhel7/roles/ansible-role-php/defaults/main.yml b/roles/ansible-role-php/defaults/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/defaults/main.yml rename to roles/ansible-role-php/defaults/main.yml diff --git a/lemp-rhel7/roles/ansible-role-php/handlers/main.yml b/roles/ansible-role-php/handlers/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/handlers/main.yml rename to roles/ansible-role-php/handlers/main.yml diff --git a/lemp-rhel7/roles/ansible-role-php/meta/main.yml b/roles/ansible-role-php/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/meta/main.yml rename to roles/ansible-role-php/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tasks/configure-apcu.yml b/roles/ansible-role-php/tasks/configure-apcu.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tasks/configure-apcu.yml rename to roles/ansible-role-php/tasks/configure-apcu.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tasks/configure-fpm.yml b/roles/ansible-role-php/tasks/configure-fpm.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tasks/configure-fpm.yml rename to roles/ansible-role-php/tasks/configure-fpm.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tasks/configure-opcache.yml b/roles/ansible-role-php/tasks/configure-opcache.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tasks/configure-opcache.yml rename to roles/ansible-role-php/tasks/configure-opcache.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tasks/configure.yml b/roles/ansible-role-php/tasks/configure.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tasks/configure.yml rename to roles/ansible-role-php/tasks/configure.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tasks/install-from-source.yml b/roles/ansible-role-php/tasks/install-from-source.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tasks/install-from-source.yml rename to roles/ansible-role-php/tasks/install-from-source.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tasks/main.yml b/roles/ansible-role-php/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tasks/main.yml rename to roles/ansible-role-php/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tasks/setup-Debian.yml b/roles/ansible-role-php/tasks/setup-Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tasks/setup-Debian.yml rename to roles/ansible-role-php/tasks/setup-Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tasks/setup-RedHat.yml b/roles/ansible-role-php/tasks/setup-RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tasks/setup-RedHat.yml rename to roles/ansible-role-php/tasks/setup-RedHat.yml diff --git a/lemp-rhel7/roles/ansible-role-php/templates/apc.ini.j2 b/roles/ansible-role-php/templates/apc.ini.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/templates/apc.ini.j2 rename to roles/ansible-role-php/templates/apc.ini.j2 diff --git a/lemp-rhel7/roles/ansible-role-php/templates/fpm-init.j2 b/roles/ansible-role-php/templates/fpm-init.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/templates/fpm-init.j2 rename to roles/ansible-role-php/templates/fpm-init.j2 diff --git a/lemp-rhel7/roles/ansible-role-php/templates/opcache.ini.j2 b/roles/ansible-role-php/templates/opcache.ini.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/templates/opcache.ini.j2 rename to roles/ansible-role-php/templates/opcache.ini.j2 diff --git a/lemp-rhel7/roles/ansible-role-php/templates/php-fpm.conf.j2 b/roles/ansible-role-php/templates/php-fpm.conf.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/templates/php-fpm.conf.j2 rename to roles/ansible-role-php/templates/php-fpm.conf.j2 diff --git a/lemp-rhel7/roles/ansible-role-php/templates/php.ini.j2 b/roles/ansible-role-php/templates/php.ini.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/templates/php.ini.j2 rename to roles/ansible-role-php/templates/php.ini.j2 diff --git a/lemp-rhel7/roles/ansible-role-php/templates/www.conf.j2 b/roles/ansible-role-php/templates/www.conf.j2 similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/templates/www.conf.j2 rename to roles/ansible-role-php/templates/www.conf.j2 diff --git a/lemp-rhel7/roles/ansible-role-php/tests/Dockerfile.centos-7 b/roles/ansible-role-php/tests/Dockerfile.centos-7 similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tests/Dockerfile.centos-7 rename to roles/ansible-role-php/tests/Dockerfile.centos-7 diff --git a/lemp-rhel7/roles/ansible-role-php/tests/Dockerfile.ubuntu-12.04 b/roles/ansible-role-php/tests/Dockerfile.ubuntu-12.04 similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tests/Dockerfile.ubuntu-12.04 rename to roles/ansible-role-php/tests/Dockerfile.ubuntu-12.04 diff --git a/lemp-rhel7/roles/ansible-role-php/tests/Dockerfile.ubuntu-14.04 b/roles/ansible-role-php/tests/Dockerfile.ubuntu-14.04 similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tests/Dockerfile.ubuntu-14.04 rename to roles/ansible-role-php/tests/Dockerfile.ubuntu-14.04 diff --git a/lemp-rhel7/roles/ansible-role-php/tests/inventory b/roles/ansible-role-php/tests/inventory similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tests/inventory rename to roles/ansible-role-php/tests/inventory diff --git a/lemp-rhel7/roles/ansible-role-php/tests/requirements.yml b/roles/ansible-role-php/tests/requirements.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tests/requirements.yml rename to roles/ansible-role-php/tests/requirements.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tests/test-package.yml b/roles/ansible-role-php/tests/test-package.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tests/test-package.yml rename to roles/ansible-role-php/tests/test-package.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tests/test-source.yml b/roles/ansible-role-php/tests/test-source.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tests/test-source.yml rename to roles/ansible-role-php/tests/test-source.yml diff --git a/lemp-rhel7/roles/ansible-role-php/tests/test-vars-ubuntu1204.yml b/roles/ansible-role-php/tests/test-vars-ubuntu1204.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/tests/test-vars-ubuntu1204.yml rename to roles/ansible-role-php/tests/test-vars-ubuntu1204.yml diff --git a/lemp-rhel7/roles/ansible-role-php/vars/Debian.yml b/roles/ansible-role-php/vars/Debian.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/vars/Debian.yml rename to roles/ansible-role-php/vars/Debian.yml diff --git a/lemp-rhel7/roles/ansible-role-php/vars/RedHat.yml b/roles/ansible-role-php/vars/RedHat.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-php/vars/RedHat.yml rename to roles/ansible-role-php/vars/RedHat.yml diff --git a/lemp-rhel7/roles/ansible-role-postfix/.travis.yml b/roles/ansible-role-postfix/.travis.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-postfix/.travis.yml rename to roles/ansible-role-postfix/.travis.yml diff --git a/lemp-rhel7/roles/ansible-role-postfix/README.md b/roles/ansible-role-postfix/README.md similarity index 100% rename from lemp-rhel7/roles/ansible-role-postfix/README.md rename to roles/ansible-role-postfix/README.md diff --git a/lemp-rhel7/roles/ansible-role-postfix/defaults/main.yml b/roles/ansible-role-postfix/defaults/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-postfix/defaults/main.yml rename to roles/ansible-role-postfix/defaults/main.yml diff --git a/lemp-rhel7/roles/ansible-role-postfix/meta/main.yml b/roles/ansible-role-postfix/meta/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-postfix/meta/main.yml rename to roles/ansible-role-postfix/meta/main.yml diff --git a/lemp-rhel7/roles/ansible-role-postfix/tasks/main.yml b/roles/ansible-role-postfix/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-postfix/tasks/main.yml rename to roles/ansible-role-postfix/tasks/main.yml diff --git a/lemp-rhel7/roles/ansible-role-postfix/tests/inventory b/roles/ansible-role-postfix/tests/inventory similarity index 100% rename from lemp-rhel7/roles/ansible-role-postfix/tests/inventory rename to roles/ansible-role-postfix/tests/inventory diff --git a/lemp-rhel7/roles/ansible-role-postfix/tests/test.yml b/roles/ansible-role-postfix/tests/test.yml similarity index 100% rename from lemp-rhel7/roles/ansible-role-postfix/tests/test.yml rename to roles/ansible-role-postfix/tests/test.yml diff --git a/lemp-rhel7/roles/common/files/RPM-GPG-KEY-EPEL-7 b/roles/common/files/RPM-GPG-KEY-EPEL-7 similarity index 100% rename from lemp-rhel7/roles/common/files/RPM-GPG-KEY-EPEL-7 rename to roles/common/files/RPM-GPG-KEY-EPEL-7 diff --git a/lemp-rhel7/roles/common/files/RPM-GPG-KEY-NGINX b/roles/common/files/RPM-GPG-KEY-NGINX similarity index 100% rename from lemp-rhel7/roles/common/files/RPM-GPG-KEY-NGINX rename to roles/common/files/RPM-GPG-KEY-NGINX diff --git a/lemp-rhel7/roles/common/files/epel.repo b/roles/common/files/epel.repo similarity index 100% rename from lemp-rhel7/roles/common/files/epel.repo rename to roles/common/files/epel.repo diff --git a/lemp-rhel7/roles/common/files/nginx.repo b/roles/common/files/nginx.repo similarity index 100% rename from lemp-rhel7/roles/common/files/nginx.repo rename to roles/common/files/nginx.repo diff --git a/lemp-rhel7/roles/common/tasks/main.yml b/roles/common/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/common/tasks/main.yml rename to roles/common/tasks/main.yml diff --git a/lemp-rhel7/roles/common/tasks/setup-RedHat.yml b/roles/common/tasks/setup-RedHat.yml similarity index 100% rename from lemp-rhel7/roles/common/tasks/setup-RedHat.yml rename to roles/common/tasks/setup-RedHat.yml diff --git a/lemp-rhel7/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml similarity index 100% rename from lemp-rhel7/roles/wordpress/tasks/main.yml rename to roles/wordpress/tasks/main.yml diff --git a/lemp-rhel7/roles/wordpress/templates/wp-config.php b/roles/wordpress/templates/wp-config.php similarity index 100% rename from lemp-rhel7/roles/wordpress/templates/wp-config.php rename to roles/wordpress/templates/wp-config.php diff --git a/lemp-rhel7/site.retry b/site.retry similarity index 100% rename from lemp-rhel7/site.retry rename to site.retry diff --git a/lemp-rhel7/site.yml b/site.yml similarity index 100% rename from lemp-rhel7/site.yml rename to site.yml diff --git a/tasks/configure.yml b/tasks/configure.yml deleted file mode 100644 index d8a4585..0000000 --- a/tasks/configure.yml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- name: Copy my.cnf global MySQL configuration. - template: - src: my.cnf.j2 - dest: "{{ mysql_config_file }}" - owner: root - group: root - mode: 0644 - force: "{{ overwrite_global_mycnf }}" - notify: restart mysql - -- name: Verify mysql include directory exists. - file: - path: "{{ mysql_config_include_dir }}" - state: directory - owner: root - group: root - mode: 0755 - when: mysql_config_include_files | length - -- name: Copy my.cnf override files into include directory. - template: - src: "{{ item.src }}" - dest: "{{ mysql_config_include_dir }}/{{ item.src | basename }}" - owner: root - group: root - mode: 0644 - force: "{{ item.force | default(False) }}" - with_items: "{{ mysql_config_include_files }}" - notify: restart mysql - -- name: Create slow query log file (if configured). - shell: "touch {{ mysql_slow_query_log_file }} creates={{ mysql_slow_query_log_file }}" - when: mysql_slow_query_log_enabled - -- name: Create datadir if it does not exist - file: - path: "{{ mysql_datadir }}" - state: directory - owner: mysql - group: mysql - mode: 0755 - setype: mysqld_db_t - -- name: Set ownership on slow query log file (if configured). - file: - path: "{{ mysql_slow_query_log_file }}" - state: file - owner: mysql - group: mysql - mode: 0640 - when: mysql_slow_query_log_enabled - -- name: Create error log file (if configured). - shell: "touch {{ mysql_log_error }} creates={{ mysql_log_error }}" - when: mysql_log == "" and mysql_log_error != "" - -- name: Set ownership on error log file (if configured). - file: - path: "{{ mysql_log_error }}" - state: file - owner: mysql - group: mysql - mode: 0640 - when: mysql_log == "" and mysql_log_error != "" - -- name: Ensure MySQL is started and enabled on boot. - service: "name={{ mysql_daemon }} state=started enabled={{ mysql_enabled_on_startup }}" - register: mysql_service_configuration diff --git a/tasks/databases.yml b/tasks/databases.yml deleted file mode 100644 index 681e515..0000000 --- a/tasks/databases.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Ensure MySQL databases are present. - mysql_db: - name: "{{ item.name }}" - collation: "{{ item.collation | default('utf8_general_ci') }}" - encoding: "{{ item.encoding | default('utf8') }}" - state: present - with_items: "{{ mysql_databases }}" diff --git a/tasks/main.yml b/tasks/main.yml deleted file mode 100644 index 627d917..0000000 --- a/tasks/main.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Variable configuration. -- name: Include OS-specific variables. - include_vars: "{{ ansible_os_family }}.yml" - when: ansible_os_family != "RedHat" - -- name: Include OS-specific variables (RedHat). - include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml" - when: ansible_os_family == "RedHat" - -- name: Define mysql_packages. - set_fact: - mysql_packages: "{{ __mysql_packages | list }}" - when: mysql_packages is not defined - -- name: Define mysql_daemon. - set_fact: - mysql_daemon: "{{ __mysql_daemon }}" - when: mysql_daemon is not defined - -- name: Define mysql_slow_query_log_file. - set_fact: - mysql_slow_query_log_file: "{{ __mysql_slow_query_log_file }}" - when: mysql_slow_query_log_file is not defined - -# Setup/install tasks. -- include: setup-RedHat.yml - when: ansible_os_family == 'RedHat' - -- include: setup-Debian.yml - when: ansible_os_family == 'Debian' - -- name: Check if MySQL packages were installed. - set_fact: - mysql_install_packages: "{{ (rh_mysql_install_packages is defined and rh_mysql_install_packages.changed) or (deb_mysql_install_packages is defined and deb_mysql_install_packages.changed) }}" - -# Configure MySQL. -- include: configure.yml -- include: secure-installation.yml -- include: databases.yml -- include: users.yml -- include: replication.yml diff --git a/tasks/replication.yml b/tasks/replication.yml deleted file mode 100644 index ec56dfc..0000000 --- a/tasks/replication.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -- name: Ensure replication user exists on master. - mysql_user: - name: "{{ mysql_replication_user.name }}" - host: "{{ mysql_replication_user.host | default('%') }}" - password: "{{ mysql_replication_user.password }}" - priv: "{{ mysql_replication_user.priv | default('*.*:REPLICATION SLAVE') }}" - state: present - when: > - (mysql_replication_role == 'master') - and mysql_replication_user - and (mysql_replication_master != '') - -- name: Check slave replication status. - mysql_replication: mode=getslave - ignore_errors: true - register: slave - when: > - mysql_replication_role == 'slave' - and (mysql_replication_master != '') - -- name: Check master replication status. - mysql_replication: mode=getmaster - delegate_to: "{{ mysql_replication_master }}" - register: master - when: > - slave|failed - and (mysql_replication_role == 'slave') - and (mysql_replication_master != '') - -- name: Configure replication on the slave. - mysql_replication: - mode: changemaster - master_host: "{{ mysql_replication_master }}" - master_user: "{{ mysql_replication_user.name }}" - master_password: "{{ mysql_replication_user.password }}" - master_log_file: "{{ master.File }}" - master_log_pos: "{{ master.Position }}" - ignore_errors: True - when: > - slave|failed - and (mysql_replication_role == 'slave') - and (mysql_replication_master != '') - and mysql_replication_user - -- name: Start replication. - mysql_replication: mode=startslave - when: > - slave|failed - and (mysql_replication_role == 'slave') - and (mysql_replication_master != '') diff --git a/tasks/secure-installation.yml b/tasks/secure-installation.yml deleted file mode 100644 index 200dfeb..0000000 --- a/tasks/secure-installation.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- name: Disallow root login remotely - command: 'mysql -NBe "{{ item }}"' - with_items: - - DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1') - changed_when: False - -- name: Get list of hosts for the root user. - command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = "root" ORDER BY (Host="localhost") ASC' - register: mysql_root_hosts - changed_when: false - -# Note: We do not use mysql_user for this operation, as it doesn't always update -# the root password correctly. See: https://goo.gl/MSOejW -- name: Update MySQL root password for localhost root account. - shell: > - mysql -u root -NBe - 'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}");' - with_items: "{{ mysql_root_hosts.stdout_lines }}" - when: mysql_install_packages | bool or mysql_root_password_update - -# Has to be after the root password assignment, for idempotency. -- name: Copy .my.cnf file with root password credentials. - template: - src: "user-my.cnf.j2" - dest: "{{ mysql_user_home }}/.my.cnf" - owner: root - group: root - mode: 0600 - -- name: Get list of hosts for the anonymous user. - command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = ""' - register: mysql_anonymous_hosts - changed_when: false - -- name: Remove anonymous MySQL users. - mysql_user: - name: "" - host: "{{ item }}" - state: absent - with_items: "{{ mysql_anonymous_hosts.stdout_lines }}" - -- name: Remove MySQL test database. - mysql_db: "name='test' state=absent" diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml deleted file mode 100644 index 4ead891..0000000 --- a/tasks/setup-Debian.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- name: Check if MySQL is already installed. - stat: path=/etc/init.d/mysql - register: mysql_installed - -- name: Update apt cache if MySQL is not yet installed. - apt: update_cache=yes - when: mysql_installed.stat.exists == false - -- name: Ensure MySQL Python libraries are installed. - apt: "name=python-mysqldb state=installed" - -- name: Ensure MySQL packages are installed. - apt: "name={{ item }} state=installed" - with_items: "{{ mysql_packages }}" - register: deb_mysql_install_packages - -# Because Ubuntu starts MySQL as part of the install process, we need to stop -# mysql and remove the logfiles in case the user set a custom log file size. -- name: Ensure MySQL is stopped after initial install. - service: "name={{ mysql_daemon }} state=stopped" - when: mysql_installed.stat.exists == false - -- name: Delete innodb log files created by apt package after initial install. - shell: "rm -f {{ mysql_datadir }}/ib_logfile[01]" - when: mysql_installed.stat.exists == false diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml deleted file mode 100644 index fc05bee..0000000 --- a/tasks/setup-RedHat.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Ensure MySQL packages are installed. - yum: "name={{ item }} state=installed enablerepo={{ mysql_enablerepo }}" - with_items: "{{ mysql_packages }}" - register: rh_mysql_install_packages - -- name: Ensure MySQL Python libraries are installed. - yum: "name=MySQL-python state=installed enablerepo={{ mysql_enablerepo }}" diff --git a/tasks/users.yml b/tasks/users.yml deleted file mode 100644 index 6c41ce7..0000000 --- a/tasks/users.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Ensure MySQL users are present. - mysql_user: - name: "{{ item.name }}" - host: "{{ item.host | default('localhost') }}" - password: "{{ item.password }}" - priv: "{{ item.priv | default('*.*:USAGE') }}" - state: "{{ item.state | default('present') }}" - append_privs: "{{ item.append_privs | default('no') }}" - with_items: "{{ mysql_users }}" - no_log: true diff --git a/templates/my.cnf.j2 b/templates/my.cnf.j2 deleted file mode 100644 index 3923720..0000000 --- a/templates/my.cnf.j2 +++ /dev/null @@ -1,105 +0,0 @@ -[client] -#password = your_password -port = {{ mysql_port }} -socket = {{ mysql_socket }} - -[mysqld] -port = {{ mysql_port }} -bind-address = {{ mysql_bind_address }} -datadir = {{ mysql_datadir }} -socket = {{ mysql_socket }} -pid-file = {{ mysql_pid_file }} -{% if mysql_skip_name_resolve %} -skip-name-resolve -{% endif %} - -# Logging configuration. -{% if mysql_log_error == 'syslog' or mysql_log == 'syslog' %} -syslog -syslog-tag = {{ mysql_syslog_tag }} -{% else %} -{% if mysql_log %} -log = {{ mysql_log }} -{% endif %} -log-error = {{ mysql_log_error }} -{% endif %} - -{% if mysql_slow_query_log_enabled %} -# Slow query log configuration. -slow_query_log = 1 -slow_query_log_file = {{ mysql_slow_query_log_file }} -long_query_time = {{ mysql_slow_query_time }} -{% endif %} - -{% if mysql_replication_master %} -# Replication -server-id = {{ mysql_server_id }} - -{% if mysql_replication_role == 'master' %} -log_bin = mysql-bin -log-bin-index = mysql-bin.index -expire_logs_days = {{ mysql_expire_logs_days }} -max_binlog_size = {{ mysql_max_binlog_size }} - -{% for db in mysql_databases %} -{% if db.replicate|default(1) %} -binlog_do_db = {{ db.name }} -{% else %} -binlog_ignore_db = {{ db.name }} -{% endif %} -{% endfor %} -{% endif %} - -{% if mysql_replication_role == 'slave' %} -read_only -relay-log = relay-bin -relay-log-index = relay-bin.index -{% endif %} -{% endif %} - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links = 0 - -# User is ignored when systemd is used (fedora >= 15). -user = mysql - -# http://dev.mysql.com/doc/refman/5.5/en/performance-schema.html -;performance_schema - -# Memory settings. -key_buffer_size = {{ mysql_key_buffer_size }} -max_allowed_packet = {{ mysql_max_allowed_packet }} -table_open_cache = {{ mysql_table_open_cache }} -sort_buffer_size = {{ mysql_sort_buffer_size }} -read_buffer_size = {{ mysql_read_buffer_size }} -read_rnd_buffer_size = {{ mysql_read_rnd_buffer_size }} -myisam_sort_buffer_size = {{ mysql_myisam_sort_buffer_size }} -thread_cache_size = {{ mysql_thread_cache_size }} -query_cache_size = {{ mysql_query_cache_size }} -max_connections = {{ mysql_max_connections }} - -# Other settings. -wait_timeout = {{ mysql_wait_timeout }} - -# InnoDB settings. -innodb_file_per_table = {{ mysql_innodb_file_per_table }} -innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }} -innodb_log_file_size = {{ mysql_innodb_log_file_size }} -innodb_log_buffer_size = {{ mysql_innodb_log_buffer_size }} -innodb_flush_log_at_trx_commit = {{ mysql_innodb_flush_log_at_trx_commit }} -innodb_lock_wait_timeout = {{ mysql_innodb_lock_wait_timeout }} - -[mysqldump] -quick -max_allowed_packet = {{ mysql_mysqldump_max_allowed_packet }} - -[mysqld_safe] -pid-file = {{ mysql_pid_file }} - -{% if mysql_config_include_files | length %} -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir {{ mysql_config_include_dir }} -{% endif %} - diff --git a/templates/user-my.cnf.j2 b/templates/user-my.cnf.j2 deleted file mode 100644 index 95cae66..0000000 --- a/templates/user-my.cnf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -[client] -user={{ mysql_root_username }} -password="{{ mysql_root_password }}" diff --git a/tests/Dockerfile.centos-6 b/tests/Dockerfile.centos-6 deleted file mode 100644 index 4a4e7b8..0000000 --- a/tests/Dockerfile.centos-6 +++ /dev/null @@ -1,15 +0,0 @@ -FROM centos:6 - -# Install Ansible -RUN yum -y update; yum clean all; -RUN yum -y install epel-release -RUN yum -y install git ansible sudo -RUN yum clean all - -# Disable requiretty -RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers - -# Install Ansible inventory file -RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts - -CMD ["/usr/sbin/init"] diff --git a/tests/Dockerfile.centos-7 b/tests/Dockerfile.centos-7 deleted file mode 100644 index 8aa0654..0000000 --- a/tests/Dockerfile.centos-7 +++ /dev/null @@ -1,27 +0,0 @@ -FROM centos:7 - -# Install systemd -- See https://hub.docker.com/_/centos/ -RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs -RUN yum -y update; yum clean all; \ -(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \ -rm -f /lib/systemd/system/multi-user.target.wants/*; \ -rm -f /etc/systemd/system/*.wants/*; \ -rm -f /lib/systemd/system/local-fs.target.wants/*; \ -rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ -rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ -rm -f /lib/systemd/system/basic.target.wants/*; \ -rm -f /lib/systemd/system/anaconda.target.wants/*; - -# Install Ansible -RUN yum -y install epel-release -RUN yum -y install git ansible sudo -RUN yum clean all - -# Disable requiretty -RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers - -# Install Ansible inventory file -RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts - -VOLUME ["/sys/fs/cgroup"] -CMD ["/usr/sbin/init"] diff --git a/tests/Dockerfile.ubuntu-12.04 b/tests/Dockerfile.ubuntu-12.04 deleted file mode 100644 index 8aebd65..0000000 --- a/tests/Dockerfile.ubuntu-12.04 +++ /dev/null @@ -1,14 +0,0 @@ -FROM ubuntu:12.04 -RUN apt-get update - -# Install Ansible -RUN apt-get install -y software-properties-common python-software-properties git -RUN apt-add-repository -y ppa:ansible/ansible -RUN apt-get update -RUN apt-get install -y ansible - -COPY initctl_faker . -RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl - -# Install Ansible inventory file -RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.ubuntu-14.04 b/tests/Dockerfile.ubuntu-14.04 deleted file mode 100644 index f81cabe..0000000 --- a/tests/Dockerfile.ubuntu-14.04 +++ /dev/null @@ -1,14 +0,0 @@ -FROM ubuntu:14.04 -RUN apt-get update - -# Install Ansible -RUN apt-get install -y software-properties-common git -RUN apt-add-repository -y ppa:ansible/ansible -RUN apt-get update -RUN apt-get install -y ansible - -COPY initctl_faker . -RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl - -# Install Ansible inventory file -RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/centos-7-test.yml b/tests/centos-7-test.yml deleted file mode 100644 index 57a6171..0000000 --- a/tests/centos-7-test.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- hosts: all - vars: - mysql_packages: - - mariadb - - mariadb-server - - mariadb-libs - - MySQL-python - - perl-DBD-MySQL - mysql_daemon: mariadb - mysql_log_error: /var/log/mariadb/mariadb.log - mysql_syslog_tag: mariadb - mysql_pid_file: /var/run/mariadb/mariadb.pid - roles: - - role_under_test diff --git a/tests/initctl_faker b/tests/initctl_faker deleted file mode 100644 index a2267f3..0000000 --- a/tests/initctl_faker +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')" - -case "$ALIAS_CMD" in - start|stop|restart|reload|status) - exec service $1 $ALIAS_CMD - ;; -esac - -case "$1" in - list ) - exec service --status-all - ;; - reload-configuration ) - exec service $2 restart - ;; - start|stop|restart|reload|status) - exec service $2 $1 - ;; - \?) - exit 0 - ;; -esac diff --git a/tests/inventory b/tests/inventory deleted file mode 100644 index 2fbb50c..0000000 --- a/tests/inventory +++ /dev/null @@ -1 +0,0 @@ -localhost diff --git a/tests/test.yml b/tests/test.yml deleted file mode 100644 index 0ed0b43..0000000 --- a/tests/test.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- hosts: all - roles: - - role_under_test diff --git a/vars/Debian.yml b/vars/Debian.yml deleted file mode 100644 index 097be99..0000000 --- a/vars/Debian.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -__mysql_daemon: mysql -__mysql_packages: - - mysql-common - - mysql-server -__mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log -mysql_config_file: /etc/mysql/my.cnf -mysql_config_include_dir: /etc/mysql/conf.d -mysql_socket: /var/run/mysqld/mysqld.sock diff --git a/vars/RedHat-6.yml b/vars/RedHat-6.yml deleted file mode 100644 index 71117a2..0000000 --- a/vars/RedHat-6.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -__mysql_daemon: mysqld -__mysql_packages: - - mysql - - mysql-server -__mysql_slow_query_log_file: /var/log/mysql-slow.log -mysql_config_file: /etc/my.cnf -mysql_config_include_dir: /etc/my.cnf.d -mysql_socket: /var/lib/mysql/mysql.sock diff --git a/vars/RedHat-7.yml b/vars/RedHat-7.yml deleted file mode 100644 index 0cf3922..0000000 --- a/vars/RedHat-7.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -__mysql_daemon: mariadb -__mysql_packages: - - mariadb - - mariadb-server - - mariadb-libs - - MySQL-python - - perl-DBD-MySQL -__mysql_slow_query_log_file: /var/log/mysql-slow.log -mysql_log_error: /var/log/mariadb/mariadb.log -mysql_syslog_tag: mariadb -mysql_pid_file: /var/run/mariadb/mariadb.pid -mysql_config_file: /etc/my.cnf -mysql_config_include_dir: /etc/my.cnf.d -mysql_socket: /var/lib/mysql/mysql.sock