Merge #1234 (ansible linting improvements)

Author: martey

ansible/roles/common/handlers/main.yml

@@ -1,10 +1,10 @@
-- name: restart fail2ban
+- name: Restart fail2ban
   ansible.builtin.service:
     name: fail2ban
     state: restarted
   become: true
 
-- name: restart supervisor
+- name: Restart supervisor
   ansible.builtin.service:
     name: supervisor
     state: restarted

ansible/roles/common/tasks/apt.yml

@@ -1,17 +1,17 @@
-- name: install python3-apt
+- name: Install python3-apt
   ansible.builtin.apt:
     pkg: python3-apt
     state: present
   become: true
 
-- name: update package list & upgrade existing packages
+- name: Update package list & upgrade existing packages
   ansible.builtin.apt:
     cache_valid_time: 3600
     update_cache: true
     upgrade: true
   become: true
 
-- name: install common packages
+- name: Install common packages
   ansible.builtin.apt:
     name:
       - git
@@ -25,14 +25,14 @@
     state: present
   become: true
 
-- name: copy apt configuration file (20auto-upgrades)
+- name: Copy apt configuration file (20auto-upgrades)
   ansible.builtin.template:
     dest: "/etc/apt/apt.conf.d/20auto-upgrades"
     mode: 0644
     src: 20auto-upgrades
   become: true
 
-- name: copy apt configuration file (50unattended-upgrades)
+- name: Copy apt configuration file (50unattended-upgrades)
   ansible.builtin.template:
     dest: "/etc/apt/apt.conf.d/50unattended-upgrades"
     mode: 0644

ansible/roles/common/tasks/main.yml

@@ -1,2 +1,2 @@
-- include: apt.yml
-- include: security.yml
+- import_tasks: apt.yml
+- import_tasks: security.yml

ansible/roles/common/tasks/security.yml

@@ -1,4 +1,4 @@
-- name: install fail2ban
+- name: Install fail2ban
   ansible.builtin.apt:
     pkg: fail2ban
     state: present

ansible/roles/db/tasks/main.yml

@@ -1,4 +1,4 @@
-- name: install PostgreSQL packages
+- name: Install PostgreSQL packages
   ansible.builtin.apt:
     name:
       - libpq-dev
@@ -7,7 +7,7 @@
     state: present
   become: true
 
-- name: create a PostgreSQL database for this project
+- name: Create a PostgreSQL database for this project
   become: true
   become_user: postgres
   ansible.builtin.postgresql_db:
@@ -16,7 +16,7 @@
     state: present
     template: template0
 
-- name: create a PostgreSQL user for this project
+- name: Create a PostgreSQL user for this project
   become: true
   become_user: postgres
   ansible.builtin.postgresql_user:

ansible/roles/web/handlers/main.yml

@@ -1,16 +1,16 @@
-- name: restart redis
+- name: Restart redis
   ansible.builtin.service:
     name: redis-server
     state: restarted
   become: true
 
-- name: restart nginx
+- name: Restart nginx
   ansible.builtin.service:
     name: nginx
     state: restarted
   become: true
 
-- name: delete other virtualenvs
+- name: Delete other virtualenvs
   ansible.builtin.shell: find  -maxdepth 1
          ! -path '.'
          ! -path './'$(basename $(readlink current))
@@ -19,18 +19,18 @@
   args:
     chdir: "{{ virtualenv_root }}"
 
-- name: restart gunicorn
+- name: Restart gunicorn
   ansible.builtin.supervisorctl:
     name: gunicorn
     state: restarted
   become: true
 
-- name: mark fixtures as applied
+- name: Mark fixtures as applied
   ansible.builtin.file:
     path: "{{ project_root }}/fixtures/.applied"
     state: touch
     mode: 0600
   tags:
     - fixtures
 
-- include: sentry.yml
+- import_tasks: sentry.yml

ansible/roles/web/handlers/sentry.yml

@@ -1,4 +1,4 @@
-- name: create new Sentry release
+- name: Create new Sentry release
   ansible.builtin.uri:
     body: "{'projects': ['{{ sentry_project_name }}'], 'version': '{{ git_status.stdout }}'}"
     body_format: "json"
@@ -9,7 +9,7 @@
     status_code: 201, 208
     url: "https://sentry.io/api/0/organizations/{{ application_owner }}/releases/"
 
-- name: send Sentry notification of deployment
+- name: Send Sentry notification of deployment
   ansible.builtin.uri:
     body: "{'environment': '{{ environment_type }}'}"
     body_format: "json"

ansible/roles/web/tasks/django.yml

@@ -1,4 +1,4 @@
-- name: pull repository from Github to project directory
+- name: Pull repository from Github to project directory
   ansible.builtin.git:
     accept_hostkey: true
     dest: "{{ project_root }}"
@@ -8,12 +8,12 @@
   become: true
   when: environment_type != "development"
   notify:
-    - restart nginx
-    - restart gunicorn
-    - create new Sentry release
-    - send Sentry notification of deployment
+    - Restart nginx
+    - Restart gunicorn
+    - Create new Sentry release
+    - Send Sentry notification of deployment
 
-- name: install python packages and associated libraries
+- name: Install python packages and associated libraries
   ansible.builtin.apt:
     name:
       - gettext
@@ -31,80 +31,80 @@
       - zlib1g-dev
     state: present
   become: true
-  notify: restart gunicorn
+  notify: Restart gunicorn
 
-- name: change ownership of everything to this user
+- name: Change ownership of everything to this user
   ansible.builtin.file:
     path: "{{ project_root }}"
     recurse: true
     owner: "{{ ansible_user_id }}"
     group: www-data
   become: true
 
-- name: manually figure out latest Git commit
+- name: Manually figure out latest Git commit
   ansible.builtin.command: git rev-parse HEAD chdir={{ project_root }}
   register: git_status
   tags:
     - skip_ansible_lint
 
-- name: determine if virtualenv exists
+- name: Determine if virtualenv exists
   ansible.builtin.stat:
     path: "{{ virtualenv_root }}/{{ git_status.stdout }}"
   register: venv_dir
 
-- name: create virtualenv if necessary
+- name: Create virtualenv if necessary
   ansible.builtin.command: >
     python3 -m virtualenv -p python3 {{ virtualenv_root }}/{{ git_status.stdout }}
   when: venv_dir.stat.isdir is not defined
-  notify: delete other virtualenvs
+  notify: Delete other virtualenvs
   tags:
     - skip_ansible_lint
 
-- name: get target of old "current" virtualenv symlink
+- name: Get target of old "current" virtualenv symlink
   ansible.builtin.stat:
     path: "{{ virtualenv_root }}/current"
   register: old_current_virtualenv
 
-- name: add/update "previous" virtualenv symlink
+- name: Add/update "previous" virtualenv symlink
   ansible.builtin.file:
     path: "{{ virtualenv_root }}/previous"
     src: "{{ old_current_virtualenv.stat.lnk_source }}"
     state: link
   when: venv_dir.stat.isdir is not defined and old_current_virtualenv.stat.islnk is true
 
-- name: add/update "current" virtualenv symlink
+- name: Add/update "current" virtualenv symlink
   ansible.builtin.file:
     state: link
     path: "{{ virtualenv_root }}/current"
     src: "{{ virtualenv_root }}/{{ git_status.stdout }}"
 
-- name: use symlink for easier virtualenv management
+- name: Use symlink for easier virtualenv management
   ansible.builtin.file:
     path: "{{ virtualenv_root }}/current"
     src: "{{ virtualenv_root }}/{{ git_status.stdout }}"
     state: link
 
-- name: install latest version of pip
+- name: Install latest version of pip
   ansible.builtin.pip:
     extra_args: "--upgrade"
     name: pip
     state: present
     virtualenv: "{{ virtualenv_root }}/current"
 
-- name: update virtualenv with requirements
+- name: Update virtualenv with requirements
   ansible.builtin.pip:
     extra_args: "--upgrade"
     requirements: "{{ project_root }}/requirements/{{ environment_type }}.txt"
     state: present
     virtualenv: "{{ virtualenv_root }}/current"
-  notify: restart gunicorn
+  notify: Restart gunicorn
 
-- name: add supervisor configuration file for gunicorn
+- name: Add supervisor configuration file for gunicorn
   ansible.builtin.template:
     dest: "/etc/supervisor/conf.d/gunicorn.conf"
     mode: 0644
     src: supervisor.conf
   become: true
   notify:
-    - restart supervisor
-    - restart gunicorn
+    - Restart supervisor
+    - Restart gunicorn

ansible/roles/web/tasks/letsencrypt.yml

@@ -1,11 +1,11 @@
-- name: install certbot
+- name: Install certbot
   ansible.builtin.apt:
     name: certbot
     state: present
   become: true
   when: ssl_enabled
 
-- name: create .well-known directory
+- name: Create .well-known directory
   ansible.builtin.file:
     mode: 0755
     path: "{{ project_root }}/.well-known"
@@ -16,7 +16,7 @@
 # We use the "standalone" method because nginx needs a certificate to run,
 # so the webroot method will not work when we provision the certificate for
 # the first time.
-- name: run certbot and generate certificate
+- name: Run certbot and generate certificate
   ansible.builtin.command: >
     certbot certonly -n --standalone --agree-tos
     -d {{ website_domain }}

ansible/roles/web/tasks/main.yml

@@ -1,5 +1,5 @@
-- include: redis.yml
-- include: nginx.yml
-- include: letsencrypt.yml
-- include: django.yml
-- include: pretalx.yml
+- import_tasks: redis.yml
+- import_tasks: nginx.yml
+- import_tasks: letsencrypt.yml
+- import_tasks: django.yml
+- import_tasks: pretalx.yml