From 199bc8f0edc353dad5f6125ac4f2d25b3278a8d2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 22 Jan 2019 21:09:42 +0000 Subject: [PATCH] Re-structure ansible files --- Vagrantfile | 2 +- .../1-basic/main.yml => deploy.yml} | 4 ++-- .../{provisioning/main.yml => provision.yml} | 3 +-- ansible/provisioning/vars/vars.yml | 21 ------------------- ansible/vars/vars.yml | 21 +++++++++++++++++++ 5 files changed, 25 insertions(+), 26 deletions(-) rename ansible/{deploying/1-basic/main.yml => deploy.yml} (88%) rename ansible/{provisioning/main.yml => provision.yml} (91%) delete mode 100644 ansible/provisioning/vars/vars.yml diff --git a/Vagrantfile b/Vagrantfile index 0baa2fe..75222f6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -16,7 +16,7 @@ Vagrant.configure("2") do |config| config.vm.provision "ansible" do |ansible| ansible.compatibility_mode = "2.0" - ansible.playbook = "ansible/provisioning/main.yml" + ansible.playbook = "ansible/provision.yml" ansible.inventory_path = "ansible/hosts.ini" ansible.become = true ansible.ask_vault_pass = true diff --git a/ansible/deploying/1-basic/main.yml b/ansible/deploy.yml similarity index 88% rename from ansible/deploying/1-basic/main.yml rename to ansible/deploy.yml index f6052c0..2fa9341 100644 --- a/ansible/deploying/1-basic/main.yml +++ b/ansible/deploy.yml @@ -3,7 +3,7 @@ become: true vars_files: - - ../../vars/vars.yml + - vars/vars.yml tasks: - name: Creating project directory @@ -13,7 +13,7 @@ - name: Uploading application synchronize: - src: ../../../../ + src: ../../ dest: "{{ app_project_root }}" - name: Installing Composer dependencies diff --git a/ansible/provisioning/main.yml b/ansible/provision.yml similarity index 91% rename from ansible/provisioning/main.yml rename to ansible/provision.yml index 28ce44b..7520d86 100644 --- a/ansible/provisioning/main.yml +++ b/ansible/provision.yml @@ -10,8 +10,7 @@ - geerlingguy.composer vars_files: - - ../vars/vault.yml - - ../vars/vars.yml + - vars/vault.yml - vars/vars.yml tasks: diff --git a/ansible/provisioning/vars/vars.yml b/ansible/provisioning/vars/vars.yml deleted file mode 100644 index b4c59c9..0000000 --- a/ansible/provisioning/vars/vars.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apache_vhosts: - - servername: dransible - documentroot: "{{ app_project_docroot }}" - -php_packages: - - libapache2-mod-php{{ php_default_version_debian }} - - libpcre3-dev - - php-apcu - - php-sqlite3 - - php{{ php_default_version_debian }}-cli - - php{{ php_default_version_debian }}-common - - php{{ php_default_version_debian }}-curl - - php{{ php_default_version_debian }}-dev - - php{{ php_default_version_debian }}-fpm - - php{{ php_default_version_debian }}-gd - - php{{ php_default_version_debian }}-imap - - php{{ php_default_version_debian }}-json - - php{{ php_default_version_debian }}-mbstring - - php{{ php_default_version_debian }}-opcache - - php{{ php_default_version_debian }}-xml diff --git a/ansible/vars/vars.yml b/ansible/vars/vars.yml index 2a2dd2d..18df7cb 100644 --- a/ansible/vars/vars.yml +++ b/ansible/vars/vars.yml @@ -1,4 +1,25 @@ --- +apache_vhosts: + - servername: dransible + documentroot: "{{ app_project_docroot }}" + +php_packages: + - libapache2-mod-php{{ php_default_version_debian }} + - libpcre3-dev + - php-apcu + - php-sqlite3 + - php{{ php_default_version_debian }}-cli + - php{{ php_default_version_debian }}-common + - php{{ php_default_version_debian }}-curl + - php{{ php_default_version_debian }}-dev + - php{{ php_default_version_debian }}-fpm + - php{{ php_default_version_debian }}-gd + - php{{ php_default_version_debian }}-imap + - php{{ php_default_version_debian }}-json + - php{{ php_default_version_debian }}-mbstring + - php{{ php_default_version_debian }}-opcache + - php{{ php_default_version_debian }}-xml + app_project_root: /var/www/app app_project_docroot: "{{ app_project_root }}/web"