diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 51ba466..8f96dfd 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,6 @@ -# These are supported funding model platforms +--- +# Feel free to add yourself if you maintain this repo +# or participate in a way that you have the feeling that you belong there ;-) github: [do1jlr] liberapay: L3D diff --git a/.github/workflows/ansible-archlinux-latest.yml b/.github/workflows/ansible-archlinux-latest.yml index 9d651a3..e823f0c 100644 --- a/.github/workflows/ansible-archlinux-latest.yml +++ b/.github/workflows/ansible-archlinux-latest.yml @@ -1,5 +1,7 @@ +--- name: Ansible check archlinux:latest +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with archlinux:latest - uses: roles-ansible/check-ansible-archlinux-latest-action@master - with: - targets: "./" + - name: ansible check with archlinux:latest + uses: roles-ansible/check-ansible-archlinux-latest-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-centos-centos6.yml b/.github/workflows/ansible-centos-centos6.yml deleted file mode 100644 index 6907237..0000000 --- a/.github/workflows/ansible-centos-centos6.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Ansible check centos:centos6 - -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with ubuntu:centos6 - uses: roles-ansible/check-ansible-centos-centos6-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-centos-centos7.yml b/.github/workflows/ansible-centos-centos7.yml index 90bff41..401d2c0 100644 --- a/.github/workflows/ansible-centos-centos7.yml +++ b/.github/workflows/ansible-centos-centos7.yml @@ -1,5 +1,7 @@ +--- name: Ansible check centos:centos7 +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with ubuntu:centos7 - uses: roles-ansible/check-ansible-centos-centos7-action@master - with: - targets: "./" + - 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 index 5d7acc9..f20097b 100644 --- a/.github/workflows/ansible-centos-centos8.yml +++ b/.github/workflows/ansible-centos-centos8.yml @@ -1,5 +1,7 @@ +--- name: Ansible check centos:centos8 +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with ubuntu:centos8 - uses: roles-ansible/check-ansible-centos-centos8-action@master - with: - targets: "./" + - 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 index de991de..94eb54b 100644 --- a/.github/workflows/ansible-centos-latest.yml +++ b/.github/workflows/ansible-centos-latest.yml @@ -1,5 +1,7 @@ +--- name: Ansible check centos:latest +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with ubuntu:latest - uses: roles-ansible/check-ansible-centos-latest-action@master - with: - targets: "./" + - 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 index a7650ad..d76b02c 100644 --- a/.github/workflows/ansible-debian-buster.yml +++ b/.github/workflows/ansible-debian-buster.yml @@ -1,5 +1,7 @@ +--- name: Ansible check debian:buster +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with debian:buster - uses: roles-ansible/check-ansible-debian-buster-action@master - with: - targets: "./" + - 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 index d0ad4ca..f7eb5b6 100644 --- a/.github/workflows/ansible-debian-latest.yml +++ b/.github/workflows/ansible-debian-latest.yml @@ -1,5 +1,7 @@ +--- name: Ansible check debian:latest +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with debian:latest - uses: roles-ansible/check-ansible-debian-latest-action@master - with: - targets: "./" + - 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 index 72fe3a8..2e3215a 100644 --- a/.github/workflows/ansible-debian-sid.yml +++ b/.github/workflows/ansible-debian-sid.yml @@ -1,5 +1,7 @@ +--- name: Ansible check debian:sid +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with debian:sid - uses: roles-ansible/check-ansible-debian-sid-action@master - with: - targets: "./" + - 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 index 97076ae..e47f773 100644 --- a/.github/workflows/ansible-debian-stable.yml +++ b/.github/workflows/ansible-debian-stable.yml @@ -1,5 +1,7 @@ +--- name: Ansible check debian:stable +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with debian:stable - uses: roles-ansible/check-ansible-debian-stable-action@master - with: - targets: "./" + - 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 index 19ac5fb..c947cae 100644 --- a/.github/workflows/ansible-debian-stretch.yml +++ b/.github/workflows/ansible-debian-stretch.yml @@ -1,5 +1,7 @@ +--- name: Ansible check debian:stretch +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with debian:stretch - uses: roles-ansible/check-ansible-debian-stretch-action@master - with: - targets: "./" + - 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 index 6bbe44d..08502fe 100644 --- a/.github/workflows/ansible-fedora-31.yml +++ b/.github/workflows/ansible-fedora-31.yml @@ -1,5 +1,7 @@ +--- name: Ansible check fedora:31 +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with fedora:31 - uses: roles-ansible/check-ansible-fedora-31-action@master - with: - targets: "./" + - 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 index 70fc147..e362dd4 100644 --- a/.github/workflows/ansible-fedora-32.yml +++ b/.github/workflows/ansible-fedora-32.yml @@ -1,5 +1,7 @@ +--- name: Ansible check fedora:32 +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with fedora:32 - uses: roles-ansible/check-ansible-fedora-32-action@master - with: - targets: "./" + - 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 index 6032811..70c52ad 100644 --- a/.github/workflows/ansible-fedora-33.yml +++ b/.github/workflows/ansible-fedora-33.yml @@ -1,5 +1,7 @@ +--- name: Ansible check fedora:33 +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with fedora:33 - uses: roles-ansible/check-ansible-fedora-33-action@master - with: - targets: "./" + - 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 index 8b14097..7cfbdf7 100644 --- a/.github/workflows/ansible-fedora-latest.yml +++ b/.github/workflows/ansible-fedora-latest.yml @@ -1,5 +1,7 @@ +--- name: Ansible check fedora:latest +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with fedora:latest - uses: roles-ansible/check-ansible-fedora-latest-action@master - with: - targets: "./" \ No newline at end of file + - 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 index 712c76f..41dcb97 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -1,5 +1,7 @@ +--- name: Ansible Lint check +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,13 +10,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - 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] + - 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 index aea24a2..0f9edd8 100644 --- a/.github/workflows/ansible-ubuntu-bionic.yml +++ b/.github/workflows/ansible-ubuntu-bionic.yml @@ -1,5 +1,7 @@ +--- name: Ansible check ubuntu:bionic +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with ubuntu:bionic - uses: roles-ansible/check-ansible-ubuntu-bionic-action@master - with: - targets: "./" + - name: ansible check with ubuntu:bionic + uses: roles-ansible/check-ansible-ubuntu-bionic-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-ubuntu-eoan.yml b/.github/workflows/ansible-ubuntu-eoan.yml deleted file mode 100644 index 30b5779..0000000 --- a/.github/workflows/ansible-ubuntu-eoan.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Ansible check ubuntu:eoan - -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with ubuntu:eoan - uses: roles-ansible/check-ansible-ubuntu-eoan-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-ubuntu-latest.yml b/.github/workflows/ansible-ubuntu-latest.yml index 2e34685..b9544a5 100644 --- a/.github/workflows/ansible-ubuntu-latest.yml +++ b/.github/workflows/ansible-ubuntu-latest.yml @@ -1,5 +1,7 @@ +--- name: Ansible check ubuntu:latest +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with ubuntu:latest - uses: roles-ansible/check-ansible-ubuntu-latest-action@master - with: - targets: "./" + - 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 index a18c397..6cde8b8 100644 --- a/.github/workflows/ansible-ubuntu-trusty.yml +++ b/.github/workflows/ansible-ubuntu-trusty.yml @@ -1,5 +1,7 @@ +--- name: Ansible check ubuntu:trusty +# yamllint disable-line rule:truthy on: [push, pull_request] jobs: @@ -8,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: ansible check with ubuntu:trusty - uses: roles-ansible/check-ansible-ubuntu-trusty-action@master - with: - targets: "./" + - name: ansible check with ubuntu:trusty + uses: roles-ansible/check-ansible-ubuntu-trusty-action@master + with: + targets: "./" diff --git a/.github/workflows/ansible-ubuntu-xenial.yml b/.github/workflows/ansible-ubuntu-xenial.yml deleted file mode 100644 index 3bf993d..0000000 --- a/.github/workflows/ansible-ubuntu-xenial.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Ansible check ubuntu:xenial - -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with ubuntu:xenial - uses: roles-ansible/check-ansible-ubuntu-xenial-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/.travis.yml b/.travis.yml deleted file mode 100644 index 85ec81b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -# OS Details -os: linux -language: python -python: '3.8' - -cache: - pip: true - -# Install ansible and ansible-lint -install: - - pip install ansible - - pip install ansible-lint - -# more advanced testing is currently handled with -# github actions. The gh-actions for our test are there: -# https://github.com/roles-ansible and are tagged -# with 'github-actions' --> https://github.com/search?q=topic%3Agithub-actions+org%3Aroles-ansible&type=Repositories -script: - - ansible-lint . - - echo -e "\n\n\n\n\nWe use github actions for more detailed tests.\n\nMore details about that in our github repo at:\nhttps://github.com/roles-ansible/ansible_role_base/actions\n\n\n\n\n\n" - -notifications: - email: - on_success: never - on_failure: always - webhooks: https://galaxy.ansible.com/api/v1/notifications/ 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 diff --git a/tasks/editor.yml b/tasks/editor.yml index 7dea30f..c758724 100644 --- a/tasks/editor.yml +++ b/tasks/editor.yml @@ -9,7 +9,7 @@ - ansible_distribution != 'CentOS' - ansible_distribution != 'RedHat' - ansible_distribution != 'Archlinux' - ignore_errors: yes + ignore_errors: true - name: vim is our editor become: true @@ -21,4 +21,4 @@ - ansible_distribution == 'CentOS' - ansible_distribution == 'RedHat' - ansible_distribution == 'Archlinux' - ignore_errors: yes + ignore_errors: true diff --git a/tasks/keychain.yml b/tasks/keychain.yml index 211d0b8..5794b49 100644 --- a/tasks/keychain.yml +++ b/tasks/keychain.yml @@ -1,18 +1,18 @@ --- - name: install keychain to support ssh agent - become: yes + become: true package: name: keychain state: "{{ base__package_state }}" when: - - ansible_os_family != 'RedHat' + - ansible_os_family != 'RedHat' - name: install keychain on centos - become: yes + become: true yum: name: - "{{ _base__keychain_rpm }}" - libselinux-python state: "{{ base__package_state }}" when: - - ansible_os_family == 'RedHat' and ansible_distribution_version | float <= 7 + - ansible_os_family == 'RedHat' and ansible_distribution_version | float <= 7 diff --git a/tasks/os_info.yml b/tasks/os_info.yml index 4bfb408..04b2395 100644 --- a/tasks/os_info.yml +++ b/tasks/os_info.yml @@ -1,13 +1,13 @@ --- - - name: Print OS Infos - debug: - msg: | - ansible_os_family = '{{ ansible_os_family }}' - ansible_distribution = '{{ ansible_distribution }}' - ansible_distribution_version = '{{ ansible_distribution_version }}' - ansible_distribution_release = '{{ ansible_distribution_release }}' - ansible_machine = '{{ ansible_machine }}' +- name: Print OS Infos + debug: + msg: | + ansible_os_family = '{{ ansible_os_family }}' + ansible_distribution = '{{ ansible_distribution }}' + ansible_distribution_version = '{{ ansible_distribution_version }}' + ansible_distribution_release = '{{ ansible_distribution_release }}' + ansible_machine = '{{ ansible_machine }}' - inventory_hostname = '{{ inventory_hostname }}' - ansible_hostname = '{{ ansible_hostname }}' - ansible_fqdn = '{{ ansible_fqdn }}' + inventory_hostname = '{{ inventory_hostname }}' + ansible_hostname = '{{ ansible_hostname }}' + ansible_fqdn = '{{ ansible_fqdn }}' diff --git a/tasks/packages.yml b/tasks/packages.yml index 0ef442a..f5c3457 100644 --- a/tasks/packages.yml +++ b/tasks/packages.yml @@ -2,7 +2,7 @@ - name: update repo-cache for debian/ubuntu become: true apt: - update_cache: yes + update_cache: true cache_valid_time: 3600 when: ansible_os_family == 'Debian' @@ -10,7 +10,7 @@ - name: update repo-cache for debian/ubuntu become: true dnf: - update_cache: yes + update_cache: true when: - ansible_os_family == 'RedHat' and ansible_distribution_version | float >= 8 diff --git a/tasks/sources.yml b/tasks/sources.yml index 84e8fc9..53a4911 100644 --- a/tasks/sources.yml +++ b/tasks/sources.yml @@ -2,7 +2,7 @@ - name: update repo-cache for Debian/Ubuntu become: true apt: - update_cache: yes + update_cache: true cache_valid_time: 3600 when: ansible_os_family == 'Debian' diff --git a/tasks/versioncheck.yml b/tasks/versioncheck.yml index fa361f6..1ca07b5 100644 --- a/tasks/versioncheck.yml +++ b/tasks/versioncheck.yml @@ -13,7 +13,7 @@ src: "/etc/.ansible-version/{{ playbook_version_path }}" register: playbook_version when: submodules_versioncheck|bool - ignore_errors: yes + ignore_errors: true failed_when: false - name: Print remote role version diff --git a/vars/main.yml b/vars/main.yml index dc0045c..8de141e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -58,6 +58,7 @@ base__linux_packages: - atop - asciinema - youtube-dl + - bzip2 -playbook_version_number: 9005 # should be over ninethousand +playbook_version_number: 9005 # should be over ninethousand playbook_version_path: 'base-packages_roles-ansible_github.version'