From aa950c94d34cec493d4e0b77a3edd3a24b5a4f52 Mon Sep 17 00:00:00 2001 From: Lars Beckers <lars.beckers@rwth-aachen.de> Date: Thu, 13 Dec 2018 20:07:24 +0100 Subject: [PATCH] lint yaml files --- .yamllint | 19 +++++++++++++++++ request-tracker/handlers/main.yml | 2 ++ request-tracker/tasks/main.yml | 33 ++++++++++++++++-------------- request-tracker/tasks/postgres.yml | 13 ++++++++---- 4 files changed, 48 insertions(+), 19 deletions(-) create mode 100644 .yamllint diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..cca80e2 --- /dev/null +++ b/.yamllint @@ -0,0 +1,19 @@ +--- + +extends: default + +rules: + comments-indentation: + level: warning + document-start: + level: error + empty-lines: + max: 1 + empty-values: + forbid-in-flow-mappings: true + forbid-in-block-mappings: true + line-length: + level: warning + octal-values: + forbid-implicit-octal: true + level: warning diff --git a/request-tracker/handlers/main.yml b/request-tracker/handlers/main.yml index c9e3c45..95e9e78 100644 --- a/request-tracker/handlers/main.yml +++ b/request-tracker/handlers/main.yml @@ -1,3 +1,5 @@ +--- + - name: restart RT service: name=rt4-fcgi state=restarted diff --git a/request-tracker/tasks/main.yml b/request-tracker/tasks/main.yml index fc78921..e0b3bc0 100644 --- a/request-tracker/tasks/main.yml +++ b/request-tracker/tasks/main.yml @@ -1,21 +1,23 @@ -- name: Have the config folder +--- + +- name: Have the config folder file: path: /etc/request-tracker4/RT_SiteConfig.d owner: root group: www-data - mode: 0750 + mode: '0750' state: directory - recurse: yes + recurse: true tags: - rt - name: Have RT placeholder config installed - template: + template: src: RT_SiteConfig.pm.j2 dest: /etc/request-tracker4/RT_SiteConfig.pm owner: root group: www-data - mode: 0640 + mode: '0640' tags: - rt notify: @@ -27,8 +29,8 @@ dest: "/etc/request-tracker4/RT_SiteConfig.d/{{ item }}" owner: root group: www-data - mode: 0640 - with_items: + mode: '0640' + with_items: - 40-timezone.pm - 50-debconf.pm - 60-logging.pm @@ -54,7 +56,7 @@ dest: /etc/dbconfig-common/request-tracker4.conf owner: root group: root - mode: 0600 + mode: '0600' tags: - rt notify: @@ -63,18 +65,18 @@ - import_tasks: postgres.yml - name: Have RT packages installed - apt: + apt: name: - request-tracker4 - rt4-fcgi - rt4-db-postgresql state: present - install_recommends: no + install_recommends: false tags: - rt - name: Have nginx packages installed - apt: + apt: name: nginx state: present when: rt_enable_nginx|default(True) @@ -118,15 +120,16 @@ dest: /etc/default/rt4-fcgi owner: root group: root - mode: 0644 + mode: '0644' tags: - rt - name: Have DB for RT initialized + # yamllint disable-line rule:line-length shell: "rt-setup-database --action init --skip-create && touch /etc/request-tracker4/.db_initialized" args: creates: /etc/request-tracker4/.db_initialized - become: yes + become: true become_user: www-data tags: - rt @@ -144,7 +147,7 @@ service: name: "{{ item }}" state: started - enabled: yes + enabled: true with_items: - rt4-fcgi - request-tracker4 @@ -155,7 +158,7 @@ service: name: nginx state: started - enabled: yes + enabled: true when: rt_enable_nginx|default(True) tags: - rt diff --git a/request-tracker/tasks/postgres.yml b/request-tracker/tasks/postgres.yml index f4f559f..bef8fd7 100644 --- a/request-tracker/tasks/postgres.yml +++ b/request-tracker/tasks/postgres.yml @@ -1,6 +1,8 @@ +--- + - name: Ensure the Postgres user exists postgresql_user: name=www-data state=present - become: yes + become: true become_user: postgres tags: - postgresql @@ -8,7 +10,7 @@ - name: Ensure the Postgres DB exists postgresql_db: name=rtdb owner=www-data state=present - become: yes + become: true become_user: postgres tags: - postgresql @@ -21,14 +23,17 @@ state: present type: database roles: www-data - become: yes + become: true become_user: postgres tags: - postgresql - rt - name: Ensure Postgres is started - service: name=postgresql state=started enabled=yes + service: + name: postgresql + state: started + enabled: true tags: - postgresql - rt -- GitLab