From dc35e4de30c6bd5e3a1f4efe115668983992259c Mon Sep 17 00:00:00 2001 From: Adrien Luxey Date: Sat, 2 May 2020 07:51:39 +0200 Subject: [PATCH] moved stuff around --- {ansible => deployer}/README.md | 18 ++++++++++++++++-- {ansible => deployer}/ansible.cfg | 0 {ansible => deployer}/build.yml | 0 {ansible => deployer}/command | 0 {ansible => deployer}/deploy.yml | 0 {ansible => deployer}/group_vars/all/vars.yml | 0 {ansible => deployer}/group_vars/all/vault.yml | 0 {ansible => deployer}/inventory | 0 .../roles/build/tasks/drupal.yml | 0 .../roles/build/tasks/main.yml | 0 .../roles/build/tasks/wordpress.yml | 0 .../roles/build/templates/drupal/Dockerfile.j2 | 0 .../build/templates/drupal/Dockerfile.php.j2 | 0 .../templates/drupal/docker-compose.yml.j2 | 0 .../roles/build/templates/drupal/nginx.j2 | 0 .../templates/wordpress/docker-compose.yml.j2 | 0 .../build/templates/wordpress/nginx.host.j2 | 0 .../templates/wordpress/nginx/Dockerfile.j2 | 0 .../templates/wordpress/nginx/nginx.conf.j2 | 0 .../templates/wordpress/site/Dockerfile.j2 | 0 .../roles/deploy/tasks/drupal.yml | 0 .../roles/deploy/tasks/main.yml | 0 .../roles/deploy/tasks/wordpress.yml | 0 {ansible => deployer}/sites.yml | 0 sites/{mts8 => mts8.old}/docker-compose.yml | 0 25 files changed, 16 insertions(+), 2 deletions(-) rename {ansible => deployer}/README.md (79%) rename {ansible => deployer}/ansible.cfg (100%) rename {ansible => deployer}/build.yml (100%) rename {ansible => deployer}/command (100%) rename {ansible => deployer}/deploy.yml (100%) rename {ansible => deployer}/group_vars/all/vars.yml (100%) rename {ansible => deployer}/group_vars/all/vault.yml (100%) rename {ansible => deployer}/inventory (100%) rename {ansible => deployer}/roles/build/tasks/drupal.yml (100%) rename {ansible => deployer}/roles/build/tasks/main.yml (100%) rename {ansible => deployer}/roles/build/tasks/wordpress.yml (100%) rename {ansible => deployer}/roles/build/templates/drupal/Dockerfile.j2 (100%) rename {ansible => deployer}/roles/build/templates/drupal/Dockerfile.php.j2 (100%) rename {ansible => deployer}/roles/build/templates/drupal/docker-compose.yml.j2 (100%) rename {ansible => deployer}/roles/build/templates/drupal/nginx.j2 (100%) rename {ansible => deployer}/roles/build/templates/wordpress/docker-compose.yml.j2 (100%) rename {ansible => deployer}/roles/build/templates/wordpress/nginx.host.j2 (100%) rename {ansible => deployer}/roles/build/templates/wordpress/nginx/Dockerfile.j2 (100%) rename {ansible => deployer}/roles/build/templates/wordpress/nginx/nginx.conf.j2 (100%) rename {ansible => deployer}/roles/build/templates/wordpress/site/Dockerfile.j2 (100%) rename {ansible => deployer}/roles/deploy/tasks/drupal.yml (100%) rename {ansible => deployer}/roles/deploy/tasks/main.yml (100%) rename {ansible => deployer}/roles/deploy/tasks/wordpress.yml (100%) rename {ansible => deployer}/sites.yml (100%) rename sites/{mts8 => mts8.old}/docker-compose.yml (100%) diff --git a/ansible/README.md b/deployer/README.md similarity index 79% rename from ansible/README.md rename to deployer/README.md index 3eee38e..e9e134c 100644 --- a/ansible/README.md +++ b/deployer/README.md @@ -27,11 +27,16 @@ Python modules: TODO: Ansible task to install that before the rest -# Features +## Features * Creating Wordpress instances (yoohoo, da best) * That send mail!!11!1! + * Supports existing and new installs + +* Creating Drupal instances + + * Only existing ones (no new installs) ### Does not support @@ -56,4 +61,13 @@ TODO: Ansible task to install that before the rest # Remove the stupid file rm /etc/nginx/sites-enabled/yoursite.com service nginx restart - ``` \ No newline at end of file + ``` + +## Useful SQL commands + +```sql +select host, user, password from mysql.user order by user; +create user 'arvuhez'@'172.26.0.2' identified by 'kjhs'; +grant all on arvuhez.* to 'arvuhez'@'172.26.0.2'; +show grants for 'arvuhez'@'172.26.0.2'; +``` diff --git a/ansible/ansible.cfg b/deployer/ansible.cfg similarity index 100% rename from ansible/ansible.cfg rename to deployer/ansible.cfg diff --git a/ansible/build.yml b/deployer/build.yml similarity index 100% rename from ansible/build.yml rename to deployer/build.yml diff --git a/ansible/command b/deployer/command similarity index 100% rename from ansible/command rename to deployer/command diff --git a/ansible/deploy.yml b/deployer/deploy.yml similarity index 100% rename from ansible/deploy.yml rename to deployer/deploy.yml diff --git a/ansible/group_vars/all/vars.yml b/deployer/group_vars/all/vars.yml similarity index 100% rename from ansible/group_vars/all/vars.yml rename to deployer/group_vars/all/vars.yml diff --git a/ansible/group_vars/all/vault.yml b/deployer/group_vars/all/vault.yml similarity index 100% rename from ansible/group_vars/all/vault.yml rename to deployer/group_vars/all/vault.yml diff --git a/ansible/inventory b/deployer/inventory similarity index 100% rename from ansible/inventory rename to deployer/inventory diff --git a/ansible/roles/build/tasks/drupal.yml b/deployer/roles/build/tasks/drupal.yml similarity index 100% rename from ansible/roles/build/tasks/drupal.yml rename to deployer/roles/build/tasks/drupal.yml diff --git a/ansible/roles/build/tasks/main.yml b/deployer/roles/build/tasks/main.yml similarity index 100% rename from ansible/roles/build/tasks/main.yml rename to deployer/roles/build/tasks/main.yml diff --git a/ansible/roles/build/tasks/wordpress.yml b/deployer/roles/build/tasks/wordpress.yml similarity index 100% rename from ansible/roles/build/tasks/wordpress.yml rename to deployer/roles/build/tasks/wordpress.yml diff --git a/ansible/roles/build/templates/drupal/Dockerfile.j2 b/deployer/roles/build/templates/drupal/Dockerfile.j2 similarity index 100% rename from ansible/roles/build/templates/drupal/Dockerfile.j2 rename to deployer/roles/build/templates/drupal/Dockerfile.j2 diff --git a/ansible/roles/build/templates/drupal/Dockerfile.php.j2 b/deployer/roles/build/templates/drupal/Dockerfile.php.j2 similarity index 100% rename from ansible/roles/build/templates/drupal/Dockerfile.php.j2 rename to deployer/roles/build/templates/drupal/Dockerfile.php.j2 diff --git a/ansible/roles/build/templates/drupal/docker-compose.yml.j2 b/deployer/roles/build/templates/drupal/docker-compose.yml.j2 similarity index 100% rename from ansible/roles/build/templates/drupal/docker-compose.yml.j2 rename to deployer/roles/build/templates/drupal/docker-compose.yml.j2 diff --git a/ansible/roles/build/templates/drupal/nginx.j2 b/deployer/roles/build/templates/drupal/nginx.j2 similarity index 100% rename from ansible/roles/build/templates/drupal/nginx.j2 rename to deployer/roles/build/templates/drupal/nginx.j2 diff --git a/ansible/roles/build/templates/wordpress/docker-compose.yml.j2 b/deployer/roles/build/templates/wordpress/docker-compose.yml.j2 similarity index 100% rename from ansible/roles/build/templates/wordpress/docker-compose.yml.j2 rename to deployer/roles/build/templates/wordpress/docker-compose.yml.j2 diff --git a/ansible/roles/build/templates/wordpress/nginx.host.j2 b/deployer/roles/build/templates/wordpress/nginx.host.j2 similarity index 100% rename from ansible/roles/build/templates/wordpress/nginx.host.j2 rename to deployer/roles/build/templates/wordpress/nginx.host.j2 diff --git a/ansible/roles/build/templates/wordpress/nginx/Dockerfile.j2 b/deployer/roles/build/templates/wordpress/nginx/Dockerfile.j2 similarity index 100% rename from ansible/roles/build/templates/wordpress/nginx/Dockerfile.j2 rename to deployer/roles/build/templates/wordpress/nginx/Dockerfile.j2 diff --git a/ansible/roles/build/templates/wordpress/nginx/nginx.conf.j2 b/deployer/roles/build/templates/wordpress/nginx/nginx.conf.j2 similarity index 100% rename from ansible/roles/build/templates/wordpress/nginx/nginx.conf.j2 rename to deployer/roles/build/templates/wordpress/nginx/nginx.conf.j2 diff --git a/ansible/roles/build/templates/wordpress/site/Dockerfile.j2 b/deployer/roles/build/templates/wordpress/site/Dockerfile.j2 similarity index 100% rename from ansible/roles/build/templates/wordpress/site/Dockerfile.j2 rename to deployer/roles/build/templates/wordpress/site/Dockerfile.j2 diff --git a/ansible/roles/deploy/tasks/drupal.yml b/deployer/roles/deploy/tasks/drupal.yml similarity index 100% rename from ansible/roles/deploy/tasks/drupal.yml rename to deployer/roles/deploy/tasks/drupal.yml diff --git a/ansible/roles/deploy/tasks/main.yml b/deployer/roles/deploy/tasks/main.yml similarity index 100% rename from ansible/roles/deploy/tasks/main.yml rename to deployer/roles/deploy/tasks/main.yml diff --git a/ansible/roles/deploy/tasks/wordpress.yml b/deployer/roles/deploy/tasks/wordpress.yml similarity index 100% rename from ansible/roles/deploy/tasks/wordpress.yml rename to deployer/roles/deploy/tasks/wordpress.yml diff --git a/ansible/sites.yml b/deployer/sites.yml similarity index 100% rename from ansible/sites.yml rename to deployer/sites.yml diff --git a/sites/mts8/docker-compose.yml b/sites/mts8.old/docker-compose.yml similarity index 100% rename from sites/mts8/docker-compose.yml rename to sites/mts8.old/docker-compose.yml