Versions Update, cleanup.

buluma · May 30, 2023 · 952cded · 952cded
1 parent b3488e1
commit 952cded
Show file tree

Hide file tree

Showing 26 changed files with 180 additions and 229 deletions.
diff --git a/.ansible-lint b/.ansible-lint
@@ -12,3 +12,9 @@ exclude_paths:
   - ./.cache
   - ./.github
   - ./requirements.yml
+
+skip_list:
+  - yaml[truthy]
+
+enable_list:
+  - name[prefix]
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+---
+github: buluma
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -28,3 +28,5 @@ Show at least the error, possible related output, maybe just 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`)
+
+Please consider [sponsoring me](https://github.com/sponsors/buluma).
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -15,3 +15,5 @@ Why is this feature required?
 ## Additional context
 
 Add any other context about the feature request here.
+
+Please consider [sponsoring me](https://github.com/sponsors/buluma).
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -5,4 +5,4 @@
 repository:
   description: Install and configure openssh on your system.
   homepage: https://buluma.github.io/
-  topics: openssh, ansible, molecule, tox, playbook, hacktoberfest
+  topics: openssh, ansible, molecule, tox, playbook
diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml
@@ -16,4 +16,3 @@ jobs:
         uses: buluma/galaxy-action@v6.25.22
         with:
           galaxy_api_key: ${{ secrets.galaxy_api_key }}
-          git_branch: main
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -6,17 +6,19 @@
 name: Ansible Molecule
 
 on:
-  # Schedule updates (once weekly)
-  schedule:
-    - cron: '29 15/16 * * 0,1'
-  workflow_dispatch:
   push:
     branches:
+      - master
       - main
       - testing
     paths-ignore:
       - '**/README.md'
       - '**/CHANGELOG.md'
+    tags_ignore:
+      - '*'
+  pull_request:
+  schedule:
+    - cron: '29 15 15 * *'
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
@@ -28,12 +30,8 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v3
-        with:
-          path: "${{ github.repository }}"
-      - name: molecule
-        uses: buluma/molecule-action@v5.0.1
-        with:
-          command: lint
+      - name: ansible-lint
+        uses: ansible-community/ansible-lint-action@main
   test:
     needs:
       - lint
@@ -47,27 +45,25 @@ jobs:
           - image: "amazonlinux"
             tag: "latest"
           - image: "enterpriselinux"
-            tag: "latest"
+            tag: "8"
           - image: "debian-systemd"
             tag: "latest"
-          - image: "debian-systemd"
-            tag: "buster"
           - image: "fedora-systemd"
-            tag: "34"
+            tag: "36"
           - image: "fedora-systemd"
-            tag: "35"
+            tag: "37"
           - image: "fedora-systemd"
             tag: "latest"
           - image: "docker-opensuse-systemd"
             tag: "latest"
           - image: "docker-ubuntu-systemd"
             tag: "latest"
-          - image: "docker-ubuntu-systemd"
-            tag: "bionic"
           - image: "docker-ubuntu-systemd"
             tag: "focal"
           - image: "docker-ubuntu-systemd"
-            tag: "jammy"
+            tag: "bionic"
+          - image: "kali"
+            tag: "latest"
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -78,7 +74,7 @@ jobs:
       - name: parse apparmor for mysql
         run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: molecule
-        uses: buluma/molecule-action@v5.0.1
+        uses: buluma/molecule-action@v5.0.7
         with:
           image: ${{ matrix.config.image }}
           tag: ${{ matrix.config.tag }}
diff --git a/.github/workflows/requirements2png.yml b/.github/workflows/requirements2png.yml
@@ -4,26 +4,22 @@
 #
 
 on:
-  workflow_dispatch:
-  push: {branches: ["master", "main"]}
-
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
+  - push
 
 name: Ansible Graphviz
 
 jobs:
   build:
     runs-on: ubuntu-20.04
+    permissions:
+      contents: write
     steps:
       - name: checkout
         uses: actions/checkout@v3
         with:
           path: ${{ github.repository }}
       - name: create png
-        uses: buluma/graphviz-action@1.0.0
+        uses: buluma/graphviz-action@1.0.0 # TODO: Update action
       - name: Commit files
         run: |
           cd ${{ github.repository }}
@@ -34,7 +30,6 @@ jobs:
       - name: save to png branch
         uses: ad-m/github-push-action@master
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
           directory: ${{ github.repository }}
           force: true
           branch: png
diff --git a/.github/workflows/todo.yml b/.github/workflows/todo.yml
@@ -8,18 +8,13 @@ name: "TODO 2 Issue"
 on:
   push:
 
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   build:
     runs-on: "ubuntu-20.04"
     steps:
-      - uses: "actions/checkout@v3"
+      - uses: "actions/checkout@master"
       - name: "TODO to Issue"
-        uses: "buluma/todo-to-issue-action@v1.0.1"
+        uses: "alstr/todo-to-issue-action@v2.3" # TODO: Update buluma/todo-to-issue-action@v1.0.1 @buluma
         id: "todo"
         with:
-          USER_PROJECTS: buluma/Ansible/To do
-          PROJECTS_SECRET: ${{ secrets.PROJECTS_SECRET }}
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,85 +1,44 @@
 ---
-image: "buluma/github-action-molecule:4.0.9"
-
-services:
-  - docker:dind
+image: "buluma/github-action-molecule:5.0.7"
 
 variables:
-  DOCKER_HOST: "tcp://docker:2375"
   PY_COLORS: 1
 
 molecule:
-  stage: build
-  allow_failure: true
   script:
     - if [ -f tox.ini ] ; then tox ; fi
     - if [ ! -f tox.ini ] ; then molecule test ; fi
   rules:
-    - if: $CI_COMMIT_REF_NAME == "main"
-  retry: 1
+    - if: $CI_COMMIT_REF_NAME == "master"
   parallel:
     matrix:
       - image: "alpine-openrc"
         tag: "latest"
       - image: "amazonlinux"
         tag: "latest"
       - image: "enterpriselinux"
-        tag: "latest"
+        tag: "8"
       - image: "debian-systemd"
         tag: "latest"
-      - image: "debian-systemd"
-        tag: "buster"
       - image: "fedora-systemd"
-        tag: "34"
+        tag: "36"
       - image: "fedora-systemd"
-        tag: "35"
+        tag: "37"
       - image: "fedora-systemd"
         tag: "latest"
       - image: "docker-opensuse-systemd"
         tag: "latest"
       - image: "docker-ubuntu-systemd"
         tag: "latest"
-      - image: "docker-ubuntu-systemd"
-        tag: "bionic"
       - image: "docker-ubuntu-systemd"
         tag: "focal"
       - image: "docker-ubuntu-systemd"
-        tag: "jammy"
+        tag: "bionic"
+      - image: "kali"
+        tag: "latest"
 
-testing:
-  stage: test
-  needs: []
+galaxy:
   script:
-    - if [ -f tox.ini ] ; then tox ; fi
-    - if [ ! -f tox.ini ] ; then molecule test ; fi
+    - ansible-galaxy role import --api-key ${GALAXY_API_KEY} buluma ${CI_PROJECT_NAME}
   rules:
-    - if: $CI_COMMIT_REF_NAME == "testing"
-  retry: 1
-  parallel:
-    matrix:
-      - image: "alpine-openrc"
-        tag: "latest"
-      - image: "amazonlinux"
-        tag: "latest"
-      - image: "enterpriselinux"
-        tag: "latest"
-      - image: "debian-systemd"
-        tag: "latest"
-      - image: "debian-systemd"
-        tag: "buster"
-      - image: "fedora-systemd"
-        tag: "34"
-      - image: "fedora-systemd"
-        tag: "35"
-      - image: "fedora-systemd"
-        tag: "latest"
-      - image: "docker-opensuse-systemd"
-        tag: "latest"
-      - image: "docker-ubuntu-systemd"
-        tag: "latest"
-      - image: "docker-ubuntu-systemd"
-        tag: "bionic"
-      - image: "docker-ubuntu-systemd"
-        tag: "focal"
-      - image: "docker-ubuntu-systemd"
-        tag: "jammy"
+    - if: $CI_COMMIT_TAG != null
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.3
+    rev: v1.29.0
     hooks:
       - id: yamllint
         args: [-c=.yamllint]
@@ -19,7 +19,6 @@ repos:
       - id: ansible_role_find_unused_variable
       - id: ansible_role_find_empty_files
       - id: ansible_role_find_empty_directories
-      - id: ansible_role_fix_readability
       - id: ansible_role_find_undefined_handlers
       - id: ansible_role_find_unquoted_values
       - id: ansible_role_find_horizontal_when
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -72,3 +72,5 @@ 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. You can follow the progress on GitHub.
+
+Please consider [sponsoring me](https://github.com/sponsors/buluma).
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 
                                  Apache License
-                           Version 2.0, 07 2022
+                           Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Michael Buluma (me@buluma.me.ke)
+   Copyright 2023 Shadow Walker (bulumaknight@gmail.com)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.