From 631acc10de74c9d23bb5ba5a3515cadb77f0e03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com> Date: Wed, 5 Jul 2023 11:56:29 +0200 Subject: [PATCH] [UPD] ansible-lint --- .ansible-lint | 7 ++++ .yamllint | 39 ++++++++++++++++++++ handlers/main.yml | 6 ++-- meta/main.yml | 22 ++++++------ tasks/main.yml | 91 +++++++++++++++++++++++------------------------ 5 files changed, 105 insertions(+), 60 deletions(-) create mode 100644 .ansible-lint create mode 100644 .yamllint diff --git a/.ansible-lint b/.ansible-lint new file mode 100644 index 0000000..8d40d06 --- /dev/null +++ b/.ansible-lint @@ -0,0 +1,7 @@ +--- +warn_list: # or 'skip_list' to silence them completely + - git-latest # Git checkouts must contain explicit version + - ignore-errors # Use failed_when and specify error conditions instead of using ignore_errors + - no-changed-when # Commands should not change things if nothing needs doing + - no-handler # Tasks that run when changed should likely be handlers + - package-latest # Package installs should not use latest diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..fbebdb8 --- /dev/null +++ b/.yamllint @@ -0,0 +1,39 @@ +--- +# Based on ansible-lint config +extends: default + +rules: + braces: + max-spaces-inside: 1 + level: error + brackets: + max-spaces-inside: 1 + level: error + colons: + max-spaces-after: -1 + level: error + commas: + max-spaces-after: -1 + level: error + # comments enable + comments: enable + comments-indentation: enable + document-start: enable + empty-lines: + max: 3 + level: error + hyphens: + level: error + indentation: + level: warning + indent-sequences: consistent + spaces: 4 + check-multi-line-strings: true + key-duplicates: enable + line-length: disable + new-line-at-end-of-file: enable + new-lines: + type: unix + # trailing-spaces enable + trailing-spaces: enable + truthy: enable diff --git a/handlers/main.yml b/handlers/main.yml index 09cfa4d..39a23d1 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,8 +1,8 @@ --- -- name: start etherpad docker - docker_compose: - project_src: /home/docker/etherpad +- name: Start etherpad docker + community.docker.docker_compose: + project_src: /home/docker/etherpad async: 120 poll: 10 when: not ansible_check_mode diff --git a/meta/main.yml b/meta/main.yml index 1c9c8b9..cdd7879 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,13 +1,13 @@ --- galaxy_info: - author: Rémi - description: Role for deploying Etherpad with Docker - company: Le Filament (https://le-filament.com) - license: AGPL-3.0-or-later - min_ansible_version: 2.1 - platforms: - - name: Ubuntu - versions: - - focal - galaxy_tags: - - etherpad + author: lefilament + description: Role for deploying Etherpad with Docker + company: Le Filament (https://le-filament.com) + license: AGPL-3.0-or-later + min_ansible_version: "2.1" + platforms: + - name: Ubuntu + versions: + - focal + galaxy_tags: + - etherpad diff --git a/tasks/main.yml b/tasks/main.yml index 7723237..d161778 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,64 +1,63 @@ --- -- name: create Etherpad docker structure on server in /home/docker/etherpad - file: - name: /home/docker/etherpad - state: directory - owner: root - group: root - mode: '0755' +- name: Create Etherpad docker structure on server in /home/docker/etherpad + ansible.builtin.file: + name: /home/docker/etherpad + state: directory + owner: root + group: root + mode: '0755' ## Install Etherpad docker -- name: copy Dockerfile - copy: - src: Dockerfile - dest: /home/docker/etherpad/Dockerfile - owner: root - group: root - mode: '0644' +- name: Copy Dockerfile + ansible.builtin.copy: + src: Dockerfile + dest: /home/docker/etherpad/Dockerfile + owner: root + group: root + mode: '0644' - name: Install etherpad docker - template: - src: etherpad.yaml.j2 - dest: /home/docker/etherpad/docker-compose.yaml - owner: root - group: root - mode: '0400' + ansible.builtin.template: + src: etherpad.yaml.j2 + dest: /home/docker/etherpad/docker-compose.yaml + owner: root + group: root + mode: '0400' notify: - - start etherpad docker + - Start etherpad docker ## Backup Etherpad section - name: Install Etherpad backup compose file - template: - src: backup.yaml.j2 - dest: /home/docker/backups/backup-etherpad.yaml - owner: root - group: root - mode: '0400' + ansible.builtin.template: + src: backup.yaml.j2 + dest: /home/docker/backups/backup-etherpad.yaml + owner: root + group: root + mode: '0400' when: inventory_hostname in groups['maintenance_contract'] - name: Install Etherpad backup2 compose file - template: - src: backup2.yaml.j2 - dest: /home/docker/backups/backup2-etherpad.yaml - owner: root - group: root - mode: '0400' + ansible.builtin.template: + src: backup2.yaml.j2 + dest: /home/docker/backups/backup2-etherpad.yaml + owner: root + group: root + mode: '0400' when: inventory_hostname in groups['maintenance_contract'] - -- name: add cron job to run backup every day - cron: - name: backup etherpad - minute: "50" - hour: "03" - job: /usr/bin/docker-compose -f /home/docker/backups/backup-etherpad.yaml run --rm backup_etherpad +- name: Add cron job to run backup every day + ansible.builtin.cron: + name: backup etherpad + minute: "50" + hour: "03" + job: /usr/bin/docker-compose -f /home/docker/backups/backup-etherpad.yaml run --rm backup_etherpad when: inventory_hostname in groups['maintenance_contract'] -- name: add cron job to run backup2 every day - cron: - name: backup2 etherpad - minute: "00" - hour: "01" - job: /usr/bin/docker-compose -f /home/docker/backups/backup2-etherpad.yaml run --rm backup_etherpad +- name: Add cron job to run backup2 every day + ansible.builtin.cron: + name: backup2 etherpad + minute: "00" + hour: "01" + job: /usr/bin/docker-compose -f /home/docker/backups/backup2-etherpad.yaml run --rm backup_etherpad when: inventory_hostname in groups['maintenance_contract'] -- GitLab