From eaa622f4062edd55b26e3bcb12b9019a2e87fde5 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 11 Mar 2021 23:02:56 +0100 Subject: [PATCH 1/6] Add some actions --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 1a95489..fab5174 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,5 +1,5 @@ +--- # These are supported funding model platforms github: [do1jlr] liberapay: L3D -custom: https://paypal.me/c3woc From 656e384769845e5e3c8e551d73b8feeba0512833 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 11 Mar 2021 23:03:51 +0100 Subject: [PATCH 2/6] Add some actions --- .github/workflows/ansible-alpine-latest.yml | 18 +++++++++++++++ .../workflows/ansible-archlinux-latest.yml | 18 +++++++++++++++ .github/workflows/ansible-centos-centos7.yml | 18 +++++++++++++++ .github/workflows/ansible-centos-centos8.yml | 18 +++++++++++++++ .github/workflows/ansible-centos-latest.yml | 18 +++++++++++++++ .github/workflows/ansible-debian-buster.yml | 18 +++++++++++++++ .github/workflows/ansible-debian-latest.yml | 18 +++++++++++++++ .github/workflows/ansible-debian-sid.yml | 18 +++++++++++++++ .github/workflows/ansible-debian-stable.yml | 18 +++++++++++++++ .github/workflows/ansible-debian-stretch.yml | 18 +++++++++++++++ .github/workflows/ansible-fedora-31.yml | 18 +++++++++++++++ .github/workflows/ansible-fedora-32.yml | 18 +++++++++++++++ .github/workflows/ansible-fedora-33.yml | 18 +++++++++++++++ .github/workflows/ansible-fedora-latest.yml | 18 +++++++++++++++ .github/workflows/ansible-linting-check.yml | 22 +++++++++++++++++++ .github/workflows/ansible-ubuntu-bionic.yml | 18 +++++++++++++++ .github/workflows/ansible-ubuntu-latest.yml | 18 +++++++++++++++ .github/workflows/ansible-ubuntu-trusty.yml | 18 +++++++++++++++ .github/workflows/yamllint.yaml | 22 +++++++++++++++++++ .yamllint | 8 +++++++ 20 files changed, 358 insertions(+) create mode 100644 .github/workflows/ansible-alpine-latest.yml create mode 100644 .github/workflows/ansible-archlinux-latest.yml create mode 100644 .github/workflows/ansible-centos-centos7.yml create mode 100644 .github/workflows/ansible-centos-centos8.yml create mode 100644 .github/workflows/ansible-centos-latest.yml create mode 100644 .github/workflows/ansible-debian-buster.yml create mode 100644 .github/workflows/ansible-debian-latest.yml create mode 100644 .github/workflows/ansible-debian-sid.yml create mode 100644 .github/workflows/ansible-debian-stable.yml create mode 100644 .github/workflows/ansible-debian-stretch.yml create mode 100644 .github/workflows/ansible-fedora-31.yml create mode 100644 .github/workflows/ansible-fedora-32.yml create mode 100644 .github/workflows/ansible-fedora-33.yml create mode 100644 .github/workflows/ansible-fedora-latest.yml create mode 100644 .github/workflows/ansible-linting-check.yml create mode 100644 .github/workflows/ansible-ubuntu-bionic.yml create mode 100644 .github/workflows/ansible-ubuntu-latest.yml create mode 100644 .github/workflows/ansible-ubuntu-trusty.yml create mode 100644 .github/workflows/yamllint.yaml create mode 100644 .yamllint diff --git a/.github/workflows/ansible-alpine-latest.yml b/.github/workflows/ansible-alpine-latest.yml new file mode 100644 index 0000000..07bfff0 --- /dev/null +++ b/.github/workflows/ansible-alpine-latest.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check alpine:latest + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with alpine:latest + uses: roles-ansible/check-ansible-alpine-latest-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-archlinux-latest.yml b/.github/workflows/ansible-archlinux-latest.yml new file mode 100644 index 0000000..e823f0c --- /dev/null +++ b/.github/workflows/ansible-archlinux-latest.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check archlinux:latest + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with archlinux:latest + uses: roles-ansible/check-ansible-archlinux-latest-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-centos-centos7.yml b/.github/workflows/ansible-centos-centos7.yml new file mode 100644 index 0000000..401d2c0 --- /dev/null +++ b/.github/workflows/ansible-centos-centos7.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check centos:centos7 + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with ubuntu:centos7 + uses: roles-ansible/check-ansible-centos-centos7-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-centos-centos8.yml b/.github/workflows/ansible-centos-centos8.yml new file mode 100644 index 0000000..f20097b --- /dev/null +++ b/.github/workflows/ansible-centos-centos8.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check centos:centos8 + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with ubuntu:centos8 + uses: roles-ansible/check-ansible-centos-centos8-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-centos-latest.yml b/.github/workflows/ansible-centos-latest.yml new file mode 100644 index 0000000..94eb54b --- /dev/null +++ b/.github/workflows/ansible-centos-latest.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check centos:latest + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with ubuntu:latest + uses: roles-ansible/check-ansible-centos-latest-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-debian-buster.yml b/.github/workflows/ansible-debian-buster.yml new file mode 100644 index 0000000..d76b02c --- /dev/null +++ b/.github/workflows/ansible-debian-buster.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check debian:buster + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with debian:buster + uses: roles-ansible/check-ansible-debian-buster-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-debian-latest.yml b/.github/workflows/ansible-debian-latest.yml new file mode 100644 index 0000000..f7eb5b6 --- /dev/null +++ b/.github/workflows/ansible-debian-latest.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check debian:latest + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with debian:latest + uses: roles-ansible/check-ansible-debian-latest-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-debian-sid.yml b/.github/workflows/ansible-debian-sid.yml new file mode 100644 index 0000000..2e3215a --- /dev/null +++ b/.github/workflows/ansible-debian-sid.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check debian:sid + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with debian:sid + uses: roles-ansible/check-ansible-debian-sid-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-debian-stable.yml b/.github/workflows/ansible-debian-stable.yml new file mode 100644 index 0000000..e47f773 --- /dev/null +++ b/.github/workflows/ansible-debian-stable.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check debian:stable + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with debian:stable + uses: roles-ansible/check-ansible-debian-stable-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-debian-stretch.yml b/.github/workflows/ansible-debian-stretch.yml new file mode 100644 index 0000000..c947cae --- /dev/null +++ b/.github/workflows/ansible-debian-stretch.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check debian:stretch + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with debian:stretch + uses: roles-ansible/check-ansible-debian-stretch-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-fedora-31.yml b/.github/workflows/ansible-fedora-31.yml new file mode 100644 index 0000000..08502fe --- /dev/null +++ b/.github/workflows/ansible-fedora-31.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check fedora:31 + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with fedora:31 + uses: roles-ansible/check-ansible-fedora-31-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-fedora-32.yml b/.github/workflows/ansible-fedora-32.yml new file mode 100644 index 0000000..e362dd4 --- /dev/null +++ b/.github/workflows/ansible-fedora-32.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check fedora:32 + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with fedora:32 + uses: roles-ansible/check-ansible-fedora-32-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-fedora-33.yml b/.github/workflows/ansible-fedora-33.yml new file mode 100644 index 0000000..70c52ad --- /dev/null +++ b/.github/workflows/ansible-fedora-33.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check fedora:33 + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with fedora:33 + uses: roles-ansible/check-ansible-fedora-33-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-fedora-latest.yml b/.github/workflows/ansible-fedora-latest.yml new file mode 100644 index 0000000..7cfbdf7 --- /dev/null +++ b/.github/workflows/ansible-fedora-latest.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check fedora:latest + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with fedora:latest + uses: roles-ansible/check-ansible-fedora-latest-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml new file mode 100644 index 0000000..41dcb97 --- /dev/null +++ b/.github/workflows/ansible-linting-check.yml @@ -0,0 +1,22 @@ +--- +name: Ansible Lint check + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Lint Ansible Playbook + uses: ansible/ansible-lint-action@master + with: + targets: "." + # [required] + # Paths to ansible files (i.e., playbooks, tasks, handlers etc..) + args: "" + # [optional] diff --git a/.github/workflows/ansible-ubuntu-bionic.yml b/.github/workflows/ansible-ubuntu-bionic.yml new file mode 100644 index 0000000..0f9edd8 --- /dev/null +++ b/.github/workflows/ansible-ubuntu-bionic.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check ubuntu:bionic + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with ubuntu:bionic + uses: roles-ansible/check-ansible-ubuntu-bionic-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-ubuntu-latest.yml b/.github/workflows/ansible-ubuntu-latest.yml new file mode 100644 index 0000000..b9544a5 --- /dev/null +++ b/.github/workflows/ansible-ubuntu-latest.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check ubuntu:latest + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with ubuntu:latest + uses: roles-ansible/check-ansible-ubuntu-latest-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-ubuntu-trusty.yml b/.github/workflows/ansible-ubuntu-trusty.yml new file mode 100644 index 0000000..6cde8b8 --- /dev/null +++ b/.github/workflows/ansible-ubuntu-trusty.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check ubuntu:trusty + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with ubuntu:trusty + uses: roles-ansible/check-ansible-ubuntu-trusty-action@master + with: + targets: "./" diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml new file mode 100644 index 0000000..39c49f8 --- /dev/null +++ b/.github/workflows/yamllint.yaml @@ -0,0 +1,22 @@ +--- +name: 'Yamllint GitHub Actions' + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + yamllint: + name: 'Yamllint' + runs-on: ubuntu-latest + steps: + - name: 'Checkout' + uses: actions/checkout@master + - name: 'Yamllint' + uses: karancode/yamllint-github-action@master + with: + yamllint_file_or_dir: '.' + yamllint_config_filepath: './.yamllint' + yamllint_strict: false + yamllint_comment: true +# env: +# GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN } diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..cb32cb1 --- /dev/null +++ b/.yamllint @@ -0,0 +1,8 @@ +--- +extends: default + +rules: + # 150 chars should be enough, but don't fail if a line is longer + line-length: + max: 150 + level: warning From 35b3b05b51e6974408dec06493b14c9d719529c7 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 11 Mar 2021 23:08:51 +0100 Subject: [PATCH 3/6] improve yamllint --- vars/Archlinux.yml | 2 +- vars/CentOS.yml | 4 ++-- vars/Debian.yml | 6 +++--- vars/Fedora.yml | 4 ++-- vars/RedHat.yml | 4 ++-- vars/Ubuntu.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml index 7dfc6ff..82dacf9 100644 --- a/vars/Archlinux.yml +++ b/vars/Archlinux.yml @@ -6,7 +6,7 @@ firefox_plugins: - firefox-ublock-origin - firefox-umatrix - firefox-extension-https-everywhere - + firefox_language: - firefox-i18n-de diff --git a/vars/CentOS.yml b/vars/CentOS.yml index bb8b67b..71f0cf1 100644 --- a/vars/CentOS.yml +++ b/vars/CentOS.yml @@ -7,12 +7,12 @@ firefox_plugins: [] # - firefox-ublock-origin # - firefox-umatrix # - firefox-extension-https-everywhere - + firefox_language: [] # - firefox-i18n-de password_manager_packages: -# - browserpass-firefox + # - browserpass-firefox - pass - qtpass - pass-otp diff --git a/vars/Debian.yml b/vars/Debian.yml index 1b3d507..9c19bbe 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -7,12 +7,12 @@ firefox_plugins: [] # - firefox-ublock-origin # - firefox-umatrix # - firefox-extension-https-everywhere - -firefox_language: + +firefox_language: - firefox-esr-l10n-de password_manager_packages: -# - browserpass-firefox + # - browserpass-firefox - pass - qtpass - pass-otp diff --git a/vars/Fedora.yml b/vars/Fedora.yml index bb8b67b..71f0cf1 100644 --- a/vars/Fedora.yml +++ b/vars/Fedora.yml @@ -7,12 +7,12 @@ firefox_plugins: [] # - firefox-ublock-origin # - firefox-umatrix # - firefox-extension-https-everywhere - + firefox_language: [] # - firefox-i18n-de password_manager_packages: -# - browserpass-firefox + # - browserpass-firefox - pass - qtpass - pass-otp diff --git a/vars/RedHat.yml b/vars/RedHat.yml index bb8b67b..71f0cf1 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -7,12 +7,12 @@ firefox_plugins: [] # - firefox-ublock-origin # - firefox-umatrix # - firefox-extension-https-everywhere - + firefox_language: [] # - firefox-i18n-de password_manager_packages: -# - browserpass-firefox + # - browserpass-firefox - pass - qtpass - pass-otp diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml index bb8b67b..71f0cf1 100644 --- a/vars/Ubuntu.yml +++ b/vars/Ubuntu.yml @@ -7,12 +7,12 @@ firefox_plugins: [] # - firefox-ublock-origin # - firefox-umatrix # - firefox-extension-https-everywhere - + firefox_language: [] # - firefox-i18n-de password_manager_packages: -# - browserpass-firefox + # - browserpass-firefox - pass - qtpass - pass-otp From 650c1128d0ccfaad5bea1b8e38c6231c465d940b Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 11 Mar 2021 23:12:32 +0100 Subject: [PATCH 4/6] add fallback mechanism --- tasks/main.yml | 2 +- vars/fallback.yml | 18 ++++++++++++++++++ vars/main.yml | 7 +++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 vars/fallback.yml diff --git a/tasks/main.yml b/tasks/main.yml index bc09dbe..0ea3348 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,7 +4,7 @@ when: submodules_versioncheck|bool - name: Include OS Specific vars - ansible.builtin.include_vars: "{{ ansible_distribution }}.yml" + ansible.builtin.include_vars: "{{ lookup('first_found', firefox_params) }}" - name: Install firefox become: true diff --git a/vars/fallback.yml b/vars/fallback.yml new file mode 100644 index 0000000..06714ca --- /dev/null +++ b/vars/fallback.yml @@ -0,0 +1,18 @@ +--- +firefox_package_name: + - firefox + +firefox_plugins: [] +# - browserpass-firefox +# - firefox-ublock-origin +# - firefox-umatrix +# - firefox-extension-https-everywhere + +firefox_language: [] +# - firefox-i18n-de + +password_manager_packages: [] +# - browserpass-firefox +# - pass +# - qtpass +# - pass-otp diff --git a/vars/main.yml b/vars/main.yml index dd9836a..a73c224 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,10 @@ --- playbook_version_number: 9003 # should be over ninethousand playbook_version_path: 'role-firefox-installation_simple_chaos-bodensee_github.com.version' + +firefox_params: + files: + "{{ ansible_distribution }}.yml" + 'fallback.yml' + paths: + - 'vars' From 229182068bbf44e475144b3b29ee6eb4735a54b4 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 11 Mar 2021 23:34:07 +0100 Subject: [PATCH 5/6] update --- vars/Archlinux.yml | 2 +- vars/Debian.yml | 1 + vars/main.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml index 82dacf9..da496c8 100644 --- a/vars/Archlinux.yml +++ b/vars/Archlinux.yml @@ -4,7 +4,6 @@ firefox_package_name: firefox_plugins: - firefox-ublock-origin - - firefox-umatrix - firefox-extension-https-everywhere firefox_language: @@ -15,3 +14,4 @@ password_manager_packages: - pass - qtpass - pass-otp + - gopass diff --git a/vars/Debian.yml b/vars/Debian.yml index 9c19bbe..c856894 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -16,3 +16,4 @@ password_manager_packages: - pass - qtpass - pass-otp + - gopass diff --git a/vars/main.yml b/vars/main.yml index a73c224..b7d627e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,5 +1,5 @@ --- -playbook_version_number: 9003 # should be over ninethousand +playbook_version_number: 9004 # should be int playbook_version_path: 'role-firefox-installation_simple_chaos-bodensee_github.com.version' firefox_params: From feabc055853c5f17cb94f794511c13e902dac99a Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 11 Mar 2021 23:38:51 +0100 Subject: [PATCH 6/6] fix typo --- vars/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/main.yml b/vars/main.yml index b7d627e..28c28fb 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -4,7 +4,7 @@ playbook_version_path: 'role-firefox-installation_simple_chaos-bodensee_github.c firefox_params: files: - "{{ ansible_distribution }}.yml" - 'fallback.yml' + - "{{ ansible_distribution }}.yml" + - 'fallback.yml' paths: - 'vars'