imfreedom/ansible

make the apache2 role yamllint clean

2021-11-22, Gary Kramlich
d746793b4fa2
Parents 889fec659a78
Children 82275ceb1599
make the apache2 role yamllint clean
7 files changed, 10 insertions(+), 8 deletions(-)
  • +1 -0
    roles/apache2/meta/main.yaml
  • +1 -1
    roles/apache2/tasks/apache2.yaml
  • +1 -1
    roles/apache2/tasks/apache2tls.yaml
  • +1 -1
    roles/apache2/tasks/certbot.yaml
  • +3 -2
    roles/apache2/tasks/http.yaml
  • +1 -1
    roles/apache2/tasks/main.yaml
  • +2 -2
    roles/apache2/tasks/software.yaml
    • --- a/roles/apache2/meta/main.yaml Mon Nov 22 04:12:02 2021 -0600
    +++ b/roles/apache2/meta/main.yaml Mon Nov 22 04:13:29 2021 -0600
    @@ -1,1 +1,2 @@
    +---
    dependencies: []
    --- a/roles/apache2/tasks/apache2.yaml Mon Nov 22 04:12:02 2021 -0600
    +++ b/roles/apache2/tasks/apache2.yaml Mon Nov 22 04:13:29 2021 -0600
    @@ -1,3 +1,4 @@
    +---
    - name: install Apache configuration files
    copy:
    src: "{{ item }}"
    @@ -67,4 +68,3 @@
    ignore_errors: "{{ ansible_check_mode }}"
    notify:
    - reload apache2
    -
    --- a/roles/apache2/tasks/apache2tls.yaml Mon Nov 22 04:12:02 2021 -0600
    +++ b/roles/apache2/tasks/apache2tls.yaml Mon Nov 22 04:13:29 2021 -0600
    @@ -1,3 +1,4 @@
    +---
    # The following task is here as it has to wait until the certificate has been
    # obtained, which we only run when the hostname does not end with "-new".
    #
    @@ -37,4 +38,3 @@
    - enabled
    notify:
    - reload apache2
    -
    --- a/roles/apache2/tasks/certbot.yaml Mon Nov 22 04:12:02 2021 -0600
    +++ b/roles/apache2/tasks/certbot.yaml Mon Nov 22 04:13:29 2021 -0600
    @@ -1,3 +1,4 @@
    +---
    - name: create /etc/letsencrypt/renewal-hooks/deploy directory
    file:
    path: /etc/letsencrypt/renewal-hooks/deploy
    @@ -26,4 +27,3 @@
    tags:
    - apache
    - certbot
    -
    --- a/roles/apache2/tasks/http.yaml Mon Nov 22 04:12:02 2021 -0600
    +++ b/roles/apache2/tasks/http.yaml Mon Nov 22 04:13:29 2021 -0600
    @@ -1,8 +1,9 @@
    +---
    - name: allow http traffic
    ufw:
    rule: allow
    proto: tcp
    port: "{{ item }}"
    loop:
    - - "80" # HTTP
    - - "443" # HTTPS
    + - "80" # HTTP
    + - "443" # HTTPS
    --- a/roles/apache2/tasks/main.yaml Mon Nov 22 04:12:02 2021 -0600
    +++ b/roles/apache2/tasks/main.yaml Mon Nov 22 04:13:29 2021 -0600
    @@ -1,3 +1,4 @@
    +---
    - include_tasks: software.yaml
    args:
    apply:
    @@ -37,4 +38,3 @@
    - apache
    tags:
    - always
    -
    --- a/roles/apache2/tasks/software.yaml Mon Nov 22 04:12:02 2021 -0600
    +++ b/roles/apache2/tasks/software.yaml Mon Nov 22 04:13:29 2021 -0600
    @@ -1,9 +1,10 @@
    +---
    - name: install software
    apt:
    name: "{{ apache_packages }}"
    state: present
    cache_valid_time: 3600
    - force_apt_get: yes
    + force_apt_get: "yes"
    vars:
    apache_packages:
    - adduser
    @@ -13,4 +14,3 @@
    - liburi-perl
    - libwww-perl
    - openssl
    -