Merge branch 'main' into main

buluma · Jul 28, 2024 · 95adc71 · 95adc71
2 parents 4e6d794 + fc445cf
commit 95adc71
Show file tree

Hide file tree

Showing 32 changed files with 269 additions and 167 deletions.
diff --git a/.ansible-lint b/.ansible-lint
@@ -13,8 +13,5 @@ exclude_paths:
   - .github
   - requirements.yml
 
-skip_list:
-  - yaml[truthy]
-
 enable_list:
   - name[prefix]
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -27,4 +27,3 @@ Show at least the error, possible related output, if possible all the output.
 - Control node OS: [e.g. Debian 9] (`cat /etc/os-release`)
 - Control node Ansible version: [e.g. 2.9.1] (`ansible --version`)
 - Managed node OS: [e.g. CentOS 7] (`cat /etc/os-release`)
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -15,4 +15,3 @@ Why is this feature required?
 ## Additional context
 
 Add any other context about the feature request here.
-
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,11 @@
+---
+name: Pull request
+about: Describe the proposed change
+
+---
+
+**Describe the change**
+A clear and concise description of what the pull request is.
+
+**Testing**
+In case a feature was added, how were tests performed?
diff --git a/.github/workflows/depandabot_merge.yml b/.github/workflows/depandabot_merge.yml
@@ -24,4 +24,4 @@ jobs:
     steps:
       - uses: "actions/checkout@master"
       - name: Dependabot Auto Merge Action
-        uses: buluma/dependabot-auto-merge-action@v2.1.1
+        uses: buluma/dependabot-auto-merge-action@v2.1.2
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -12,7 +12,6 @@ on:
       - main
       - testing
       - dependabot/**
-      - renovate/**
     paths-ignore:
       - '**/README.md'
       - '**/CHANGELOG.md'
@@ -21,10 +20,8 @@ on:
   pull_request:
   pull_request_target:
   schedule:
-    # - cron: '29 15 15 * *'
-    - cron: '29 15 * * *'
+    - cron: '29 15 15/15 * *'
 
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 permissions: write-all
@@ -37,49 +34,58 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     steps:
-      - name: checkout
+      - name: Checkout Role
         uses: actions/checkout@v4
-      - name: ansible-lint
-        uses: ansible-community/ansible-lint-action@main
+      - name: Run Ansible-lint
+        uses: ansible/ansible-lint@v24.7.0
   test:
-    runs-on: ubuntu-20.04
+    needs:
+      - lint
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
         config:
-          - image: "alpine-openrc"
-            tag: "latest"
-          - image: "amazonlinux"
-            tag: "latest"
+          - image: "docker-molecule-images"
+            tag: "alpine-openrc"
+          - image: "docker-molecule-images"
+            tag: "amazonlinux2023"
           - image: "enterpriselinux"
             tag: "8"
           - image: "enterpriselinux"
             tag: "latest"
-          - image: "debian-systemd"
-            tag: "latest"
-          - image: "debian-systemd"
+          - image: "docker-molecule-images"
+            tag: "buster"
+          - image: "docker-molecule-images"
             tag: "bullseye"
-          - image: "fedora-systemd"
+          - image: "docker-molecule-images"
             tag: "38"
-          - image: "fedora-systemd"
-            tag: "latest"
-          - image: "fedora-systemd"
-            tag: "rawhide"
-          - image: "docker-opensuse-systemd"
-            tag: "latest"
-          - image: "docker-ubuntu-systemd"
-            tag: "latest"
-          - image: "docker-ubuntu-systemd"
+          - image: "docker-molecule-images"
+            tag: "39"
+          - image: "docker-molecule-images"
+            tag: "40"
+          - image: "docker-molecule-images"
+            tag: "opensuse"
+          - image: "docker-molecule-images"
             tag: "focal"
-          - image: "docker-ubuntu-systemd"
+          - image: "docker-molecule-images"
+            tag: "jammy"
+          - image: "docker-molecule-images"
             tag: "bionic"
     steps:
+
+      - name: Docker Login
+        uses: docker/login-action@v3.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Checkout Role
         uses: actions/checkout@v4
         with:
           path: "${{ github.repository }}"
       - name: Running Molecule Test
-        uses: buluma/molecule-action@v6.0.3
+        uses: buluma/molecule-action@v24.6.17
         with:
           image: ${{ matrix.config.image }}
           tag: ${{ matrix.config.tag }}
@@ -88,13 +94,13 @@ jobs:
     needs:
       - lint
       - test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'buluma' && github.event_name == 'pull_request'}}
     steps:
       - uses: "actions/checkout@master"
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Approve a PR

diff --git a/.github/workflows/release_drafter.yml b/.github/workflows/release_drafter.yml
@@ -41,7 +41,7 @@ jobs:
     steps:
 
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@master
         # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
         with:
           config-name: release-drafter.yml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,8 @@ repos:
     rev: v1.32.0
     hooks:
       - id: yamllint
-        args: [-c=.yamllint]
+        args:
+          - -c=.yamllint
 
   - repo: https://github.com/buluma/pre-commit
     rev: v1.0.3

diff --git a/.yamllint b/.yamllint
@@ -1,16 +1,27 @@
 ---
 extends: default
-
+# https://ansible.readthedocs.io/projects/lint/rules/yaml/#octals
 rules:
+  comments:
+    # https://github.com/prettier/prettier/issues/6780
+    min-spaces-from-content: 1
+  # https://github.com/adrienverge/yamllint/issues/384
+  comments-indentation: false
+  document-start: disable
+  # 160 chars was the default used by old E204 rule, but
+  # you can easily change it or disable in your .yamllint file.
+  line-length:
+    max: 310
+  # We are adding an extra space inside braces as that's how prettier does it
+  # and we are trying not to fight other linters.
   braces:
-    max-spaces-inside: 1
-    level: error
-  brackets:
-    max-spaces-inside: 1
-    level: error
-  line-length: disable
-  truthy: disable
-
-ignore: |
-  .tox/
-  .cache/
+    min-spaces-inside: 0 # yamllint defaults to 0
+    max-spaces-inside: 1 # yamllint defaults to 0
+  # key-duplicates:
+  #   forbid-duplicated-merge-keys: true # not enabled by default
+  octal-values:
+    forbid-implicit-octal: true # yamllint defaults to false
+    forbid-explicit-octal: true # yamllint defaults to false
+  # quoted-strings:
+  #   quote-type: double
+  #   required: only-when-needed
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,93 @@
 # Changelog
 
+## [24.3.31](https://github.com/buluma/ansible-role-openssh/tree/24.3.31) (2024-03-29)
 
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/2.1.0...24.3.31)
+
+## [2.1.0](https://github.com/buluma/ansible-role-openssh/tree/2.1.0) (2024-01-22)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/2.0.0...2.1.0)
+
+**Closed issues:**
+
+- Update buluma/todo-to-issue-action@v1.0.1 @buluma [\#19](https://github.com/buluma/ansible-role-openssh/issues/19)
+
+## [2.0.0](https://github.com/buluma/ansible-role-openssh/tree/2.0.0) (2023-12-25)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.11...2.0.0)
+
+**Closed issues:**
+
+- Update buluma/todo-to-issue-action@v1.0.1 @buluma [\#16](https://github.com/buluma/ansible-role-openssh/issues/16)
+- Update action [\#15](https://github.com/buluma/ansible-role-openssh/issues/15)
+
+## [1.0.11](https://github.com/buluma/ansible-role-openssh/tree/1.0.11) (2023-11-21)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.10...1.0.11)
+
+## [1.0.10](https://github.com/buluma/ansible-role-openssh/tree/1.0.10) (2023-11-21)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.9...1.0.10)
+
+## [1.0.9](https://github.com/buluma/ansible-role-openssh/tree/1.0.9) (2023-11-21)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.8...1.0.9)
+
+**Closed issues:**
+
+- Update buluma/todo-to-issue-action@v1.0.1 @buluma [\#11](https://github.com/buluma/ansible-role-openssh/issues/11)
+- Update action [\#10](https://github.com/buluma/ansible-role-openssh/issues/10)
+
+**Merged pull requests:**
+
+- Kali-roling [\#12](https://github.com/buluma/ansible-role-openssh/pull/12) ([buluma](https://github.com/buluma))
+
+## [1.0.8](https://github.com/buluma/ansible-role-openssh/tree/1.0.8) (2022-07-08)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.7...1.0.8)
+
+**Merged pull requests:**
+
+- Bump buluma/galaxy-action from 1.0.3 to 6.25.22 [\#5](https://github.com/buluma/ansible-role-openssh/pull/5) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [1.0.7](https://github.com/buluma/ansible-role-openssh/tree/1.0.7) (2022-03-28)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.6...1.0.7)
+
+**Merged pull requests:**
+
+- Bump buluma/gh-action-auto-merge-dependabot-updates from 1.0.3 to 1.0.4 [\#3](https://github.com/buluma/ansible-role-openssh/pull/3) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [1.0.6](https://github.com/buluma/ansible-role-openssh/tree/1.0.6) (2022-03-20)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.5...1.0.6)
+
+**Closed issues:**
+
+- Reduce tests [\#1](https://github.com/buluma/ansible-role-openssh/issues/1)
+
+## [1.0.5](https://github.com/buluma/ansible-role-openssh/tree/1.0.5) (2022-03-03)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.4...1.0.5)
+
+## [1.0.4](https://github.com/buluma/ansible-role-openssh/tree/1.0.4) (2022-02-21)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.3...1.0.4)
+
+## [1.0.3](https://github.com/buluma/ansible-role-openssh/tree/1.0.3) (2022-02-12)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.2...1.0.3)
+
+## [1.0.2](https://github.com/buluma/ansible-role-openssh/tree/1.0.2) (2022-02-10)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.1...1.0.2)
+
+## [1.0.1](https://github.com/buluma/ansible-role-openssh/tree/1.0.1) (2022-02-10)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/1.0.0...1.0.1)
+
+## [1.0.0](https://github.com/buluma/ansible-role-openssh/tree/1.0.0) (2022-02-10)
+
+[Full Changelog](https://github.com/buluma/ansible-role-openssh/compare/e2960a15ee6c7cfa96f5cdda54995de2e342e351...1.0.0)
 
 \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -72,4 +72,3 @@ In the comment-box, you can [refer to the issue number](https://help.github.com/
 Now I'll get a message that you've added some code. Thank you, really.
 
 CI starts to test your changes once pull request is reviewed. You can follow the progress on GitHub.
-
diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ This example is taken from [`molecule/default/converge.yml`](https://github.com/
 ---
 - name: Converge
   hosts: all
-  become: yes
-  gather_facts: yes
+  become: true
+  gather_facts: true
 
   roles:
     - role: buluma.openssh
@@ -31,8 +31,8 @@ The machine needs to be prepared. In CI this is done using [`molecule/default/pr
 ---
 - name: Prepare
   hosts: all
-  become: yes
-  gather_facts: no
+  become: true
+  gather_facts: false
 
   roles:
     - role: buluma.bootstrap
@@ -243,13 +243,13 @@ This role has been tested on these [container images](https://hub.docker.com/u/b
 
 |container|tags|
 |---------|----|
-|[Alpine](https://hub.docker.com/repository/docker/buluma/alpine/general)|all|
-|[Amazon](https://hub.docker.com/repository/docker/buluma/amazonlinux/general)|Candidate|
-|[EL](https://hub.docker.com/repository/docker/buluma/enterpriselinux/general)|8, 9|
-|[Debian](https://hub.docker.com/repository/docker/buluma/debian/general)|all|
-|[Fedora](https://hub.docker.com/repository/docker/buluma/fedora/general)|all|
-|[opensuse](https://hub.docker.com/repository/docker/buluma/opensuse/general)|all|
-|[Ubuntu](https://hub.docker.com/repository/docker/buluma/ubuntu/general)|all|
+|[Alpine](https://hub.docker.com/r/buluma/alpine)|all|
+|[Amazon](https://hub.docker.com/r/buluma/amazonlinux)|Candidate|
+|[EL](https://hub.docker.com/r/buluma/enterpriselinux)|8, 9|
+|[Debian](https://hub.docker.com/r/buluma/debian)|all|
+|[Fedora](https://hub.docker.com/r/buluma/fedora)|all|
+|[opensuse](https://hub.docker.com/r/buluma/opensuse)|all|
+|[Ubuntu](https://hub.docker.com/r/buluma/ubuntu)|focal, jammy, bionic|
 
 The minimum version of Ansible required is 2.12, tests have been done to:
 
@@ -270,4 +270,3 @@ If you find issues, please register them in [GitHub](https://github.com/buluma/a
 ## [Author Information](#author-information)
 
 [Shadow Walker](https://buluma.github.io/)
-
diff --git a/SECURITY.md b/SECURITY.md
@@ -19,4 +19,3 @@ Please [open an issue](https://github.com/buluma/ansible-role-openssh/issues) de
 Tell them where to go, how often they can expect to get an update on a
 reported vulnerability, what to expect if the vulnerability is accepted or
 declined, etc.
-
diff --git a/meta/main.yml b/meta/main.yml
@@ -29,7 +29,9 @@ galaxy_info:
         - all
     - name: Ubuntu
       versions:
-        - all
+        - focal
+        - jammy
+        - bionic
 
   galaxy_tags:
     - openssh

diff --git a/meta/preferences.yml b/meta/preferences.yml
@@ -1,2 +1,2 @@
 ---
-tox_parallel: yes
+tox_parallel: true
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -1,8 +1,8 @@
 ---
 - name: Converge
   hosts: all
-  become: yes
-  gather_facts: yes
+  become: true
+  gather_facts: true
 
   roles:
     - role: ansible-role-openssh