From cf58cc6d23c027e561924368df045211e0b1400f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 18 May 2021 07:38:40 +0100 Subject: [PATCH] Rename directory [ci skip] --- .github/workflows/ci.yml | 16 ++++++++-------- .gitignore | 2 +- README.md | 10 +++++----- tools/{ansible => deployment}/ansible.cfg | 0 tools/{ansible => deployment}/deploy.yml | 0 .../deploy/after-update-code.yml | 0 .../deploy/before-symlink.yml | 0 tools/{ansible => deployment}/hosts.yml | 0 .../includes/build-theme-assets.yml | 0 tools/{ansible => deployment}/main.yml | 0 tools/{ansible => deployment}/provision.yml | 0 tools/{ansible => deployment}/requirements.yml | 0 .../roles/drupal-permissions/tasks/main.yml | 0 .../{ansible => deployment}/vars/deploy_vars.yml | 0 .../vars/deploy_vault.yml | 0 .../vars/digitalocean_vars.yml | 0 .../vars/digitalocean_vault.yml | 0 .../vars/provision_vars.yml | 0 .../vars/provision_vault.yml | 0 tools/{ansible => deployment}/vars/vars.yml | 0 20 files changed, 14 insertions(+), 14 deletions(-) rename tools/{ansible => deployment}/ansible.cfg (100%) rename tools/{ansible => deployment}/deploy.yml (100%) rename tools/{ansible => deployment}/deploy/after-update-code.yml (100%) rename tools/{ansible => deployment}/deploy/before-symlink.yml (100%) rename tools/{ansible => deployment}/hosts.yml (100%) rename tools/{ansible => deployment}/includes/build-theme-assets.yml (100%) rename tools/{ansible => deployment}/main.yml (100%) rename tools/{ansible => deployment}/provision.yml (100%) rename tools/{ansible => deployment}/requirements.yml (100%) rename tools/{ansible => deployment}/roles/drupal-permissions/tasks/main.yml (100%) rename tools/{ansible => deployment}/vars/deploy_vars.yml (100%) rename tools/{ansible => deployment}/vars/deploy_vault.yml (100%) rename tools/{ansible => deployment}/vars/digitalocean_vars.yml (100%) rename tools/{ansible => deployment}/vars/digitalocean_vault.yml (100%) rename tools/{ansible => deployment}/vars/provision_vars.yml (100%) rename tools/{ansible => deployment}/vars/provision_vault.yml (100%) rename tools/{ansible => deployment}/vars/vars.yml (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37cc32b..ac5477b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,23 +201,23 @@ jobs: - name: Cache dependencies uses: actions/cache@d9747005de0f7240e5d35a68dca96b3f41b8b340 with: - path: tools/ansible/.roles - key: dependencies-composer-${{ hashFiles('tools/ansible/requirements.yml') }} + path: tools/deployment/.roles + key: dependencies-composer-${{ hashFiles('tools/deployment/requirements.yml') }} - name: Download Ansible roles - run: ansible-galaxy install -r tools/ansible/requirements.yml + run: ansible-galaxy install -r tools/deployment/requirements.yml - name: Export the Ansible Vault password - run: echo $ANSIBLE_VAULT_PASS > tools/ansible/.vault-pass.txt + run: echo $ANSIBLE_VAULT_PASS > tools/deployment/.vault-pass.txt env: ANSIBLE_VAULT_PASS: ${{ secrets.ANSIBLE_VAULT_PASS }} - name: Deploy the code run: > - ansible-playbook tools/ansible/deploy.yml - -i tools/ansible/hosts.yml + ansible-playbook tools/deployment/deploy.yml + -i tools/deployment/hosts.yml -e "ansistrano_deploy_branch=$GITHUB_SHA" - --vault-password-file=tools/ansible/.vault-pass.txt + --vault-password-file=tools/deployment/.vault-pass.txt - name: Remove the Ansible Vault password file - run: rm tools/ansible/.vault-pass.txt + run: rm tools/deployment/.vault-pass.txt diff --git a/.gitignore b/.gitignore index 2276127..8322889 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,6 @@ /.idea/workspace.xml /.platform/local/ /node_modules/ -/tools/ansible/.roles/ +/tools/deployment/.roles/ /vendor/ /web/themes/custom/*/body-field-values.txt diff --git a/README.md b/README.md index 2b44b9e..e213441 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Hosting -This site is hosted on a DigitalOcean droplet, which was created using [Ansible][] (see `tools/ansible/digitalocean.yml`). +This site is hosted on a DigitalOcean droplet, which was created using [Ansible][] (see `tools/deployment/digitalocean.yml`). [Ansible]: https://www.ansible.com @@ -12,10 +12,10 @@ To re-provision the server: ```bash # Download the required roles -ansible-galaxy install -r tools/ansible/requirements.yml --force +ansible-galaxy install -r tools/deployment/requirements.yml --force # Run the provision playbook -ansible-playbook tools/ansible/provision.yml +ansible-playbook tools/deployment/provision.yml ``` ### Deploying @@ -25,14 +25,14 @@ Ansible Vault is used to manage sensitive information like database passwords. Deployments are triggered automatically when changes are pushed to GitHub, and are performed automatically via GitHub Actions on each push to the `production` branch. -To run a deployment manually, run `ansible-playbook tools/ansible/deploy.yml --ask-vault-pass`. +To run a deployment manually, run `ansible-playbook tools/deployment/deploy.yml --ask-vault-pass`. The Vault password is stored in LastPass. [Ansistrano]: https://ansistrano.com #### Generating settings files -Production settings files are generated automatically during a deployment. This is done using the [opdavies.drupal_settings_files][drupal_settings_files] Ansible role, using variables from `tools/ansible/vars/deploy_vars.yml`, and performed during Ansistrano’s `After update code` build step. +Production settings files are generated automatically during a deployment. This is done using the [opdavies.drupal_settings_files][drupal_settings_files] Ansible role, using variables from `tools/deployment/vars/deploy_vars.yml`, and performed during Ansistrano’s `After update code` build step. [drupal_settings_files]: https://galaxy.ansible.com/opdavies/drupal_settings_files diff --git a/tools/ansible/ansible.cfg b/tools/deployment/ansible.cfg similarity index 100% rename from tools/ansible/ansible.cfg rename to tools/deployment/ansible.cfg diff --git a/tools/ansible/deploy.yml b/tools/deployment/deploy.yml similarity index 100% rename from tools/ansible/deploy.yml rename to tools/deployment/deploy.yml diff --git a/tools/ansible/deploy/after-update-code.yml b/tools/deployment/deploy/after-update-code.yml similarity index 100% rename from tools/ansible/deploy/after-update-code.yml rename to tools/deployment/deploy/after-update-code.yml diff --git a/tools/ansible/deploy/before-symlink.yml b/tools/deployment/deploy/before-symlink.yml similarity index 100% rename from tools/ansible/deploy/before-symlink.yml rename to tools/deployment/deploy/before-symlink.yml diff --git a/tools/ansible/hosts.yml b/tools/deployment/hosts.yml similarity index 100% rename from tools/ansible/hosts.yml rename to tools/deployment/hosts.yml diff --git a/tools/ansible/includes/build-theme-assets.yml b/tools/deployment/includes/build-theme-assets.yml similarity index 100% rename from tools/ansible/includes/build-theme-assets.yml rename to tools/deployment/includes/build-theme-assets.yml diff --git a/tools/ansible/main.yml b/tools/deployment/main.yml similarity index 100% rename from tools/ansible/main.yml rename to tools/deployment/main.yml diff --git a/tools/ansible/provision.yml b/tools/deployment/provision.yml similarity index 100% rename from tools/ansible/provision.yml rename to tools/deployment/provision.yml diff --git a/tools/ansible/requirements.yml b/tools/deployment/requirements.yml similarity index 100% rename from tools/ansible/requirements.yml rename to tools/deployment/requirements.yml diff --git a/tools/ansible/roles/drupal-permissions/tasks/main.yml b/tools/deployment/roles/drupal-permissions/tasks/main.yml similarity index 100% rename from tools/ansible/roles/drupal-permissions/tasks/main.yml rename to tools/deployment/roles/drupal-permissions/tasks/main.yml diff --git a/tools/ansible/vars/deploy_vars.yml b/tools/deployment/vars/deploy_vars.yml similarity index 100% rename from tools/ansible/vars/deploy_vars.yml rename to tools/deployment/vars/deploy_vars.yml diff --git a/tools/ansible/vars/deploy_vault.yml b/tools/deployment/vars/deploy_vault.yml similarity index 100% rename from tools/ansible/vars/deploy_vault.yml rename to tools/deployment/vars/deploy_vault.yml diff --git a/tools/ansible/vars/digitalocean_vars.yml b/tools/deployment/vars/digitalocean_vars.yml similarity index 100% rename from tools/ansible/vars/digitalocean_vars.yml rename to tools/deployment/vars/digitalocean_vars.yml diff --git a/tools/ansible/vars/digitalocean_vault.yml b/tools/deployment/vars/digitalocean_vault.yml similarity index 100% rename from tools/ansible/vars/digitalocean_vault.yml rename to tools/deployment/vars/digitalocean_vault.yml diff --git a/tools/ansible/vars/provision_vars.yml b/tools/deployment/vars/provision_vars.yml similarity index 100% rename from tools/ansible/vars/provision_vars.yml rename to tools/deployment/vars/provision_vars.yml diff --git a/tools/ansible/vars/provision_vault.yml b/tools/deployment/vars/provision_vault.yml similarity index 100% rename from tools/ansible/vars/provision_vault.yml rename to tools/deployment/vars/provision_vault.yml diff --git a/tools/ansible/vars/vars.yml b/tools/deployment/vars/vars.yml similarity index 100% rename from tools/ansible/vars/vars.yml rename to tools/deployment/vars/vars.yml