Skip to content

Commit

Permalink
Merge branch 'release-3.0.0' into 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ericsysmin authored Feb 4, 2024
2 parents 721c0a4 + 0f7c7a5 commit 539b456
Show file tree
Hide file tree
Showing 62 changed files with 327 additions and 237 deletions.
9 changes: 0 additions & 9 deletions .ansible-lint

This file was deleted.

35 changes: 19 additions & 16 deletions .github/workflows/chrony.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: "ericsysmin.system.chrony"
---
name: ericsysmin.system.chrony
on:
push:
paths:
- "roles/chrony/**"
- "molecule/chrony/**"
- ".github/workflows/chrony.yml"
- roles/chrony/**
- molecule/chrony/**
- .github/workflows/chrony.yml
pull_request:
paths:
- "roles/chrony/**"
- "molecule/chrony/**"
- ".github/workflows/chrony.yml"
- roles/chrony/**
- molecule/chrony/**
- .github/workflows/chrony.yml
jobs:
molecule:
runs-on: ubuntu-latest
Expand All @@ -20,19 +21,21 @@ jobs:
fail-fast: true
matrix:
molecule_distro:
- { "distro": "centos-7", "command": "/usr/sbin/init" }
- { "distro": "centos-8", "command": "/usr/sbin/init" }
- { "distro": "fedora-32", "command": "/usr/sbin/init" }
- { "distro": "fedora-31", "command": "/usr/sbin/init" }
- { "distro": "fedora-30", "command": "/usr/lib/systemd/systemd" }
- { "distro": "ubuntu-18.04", "command": "/lib/systemd/systemd" }
- { "distro": "ubuntu-20.04", "command": "/lib/systemd/systemd" }
- { "distro": "debian-10", "command": "/lib/systemd/systemd" }
- { distro: centos-7, command: /usr/sbin/init }
- { distro: centos-8, command: /usr/sbin/init }
- { distro: fedora-32, command: /usr/sbin/init }
- { distro: fedora-31, command: /usr/sbin/init }
- { distro: fedora-30, command: /usr/lib/systemd/systemd }
- { distro: ubuntu-16.04, command: /sbin/init }
- { distro: ubuntu-18.04, command: /lib/systemd/systemd }
- { distro: ubuntu-20.04, command: /lib/systemd/systemd }
- { distro: debian-9, command: /lib/systemd/systemd }
- { distro: debian-10, command: /lib/systemd/systemd }
collection_role:
- chrony
steps:
- name: Check out code
uses: actions/checkout@v1
uses: actions/checkout@v4
with:
path: ansible_collections/ericsysmin/system

Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/epel.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: "ericsysmin.system.epel"
---
name: ericsysmin.system.epel
on:
push:
paths:
- "roles/epel/**"
- "molecule/epel/**"
- ".github/workflows/epel.yml"
- roles/epel/**
- molecule/epel/**
- .github/workflows/epel.yml
pull_request:
paths:
- "roles/epel/**"
- "molecule/epel/**"
- ".github/workflows/epel.yml"
- roles/epel/**
- molecule/epel/**
- .github/workflows/epel.yml
jobs:
molecule:
runs-on: ubuntu-latest
Expand All @@ -20,13 +21,13 @@ jobs:
fail-fast: true
matrix:
molecule_distro:
- { "distro": "centos-7", "command": "/usr/sbin/init" }
- { "distro": "centos-8", "command": "/usr/sbin/init" }
- { distro: centos-7, command: /usr/sbin/init }
- { distro: centos-8, command: /usr/sbin/init }
collection_role:
- epel
steps:
- name: Check out code
uses: actions/checkout@v1
uses: actions/checkout@v4
with:
path: ansible_collections/ericsysmin/system

Expand Down
35 changes: 19 additions & 16 deletions .github/workflows/logrotate.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: "ericsysmin.system.logrotate"
---
name: ericsysmin.system.logrotate
on:
push:
paths:
- "roles/logrotate/**"
- "molecule/logrotate/**"
- ".github/workflows/logrotate.yml"
- roles/logrotate/**
- molecule/logrotate/**
- .github/workflows/logrotate.yml
pull_request:
paths:
- "roles/logrotate/**"
- "molecule/logrotate/**"
- ".github/workflows/logrotate.yml"
- roles/logrotate/**
- molecule/logrotate/**
- .github/workflows/logrotate.yml
jobs:
logrotate:
runs-on: ubuntu-latest
Expand All @@ -20,19 +21,21 @@ jobs:
fail-fast: true
matrix:
molecule_distro:
- { "distro": "centos-7", "command": "/usr/sbin/init" }
- { "distro": "centos-8", "command": "/usr/sbin/init" }
- { "distro": "fedora-32", "command": "/usr/sbin/init" }
- { "distro": "fedora-31", "command": "/usr/sbin/init" }
- { "distro": "fedora-30", "command": "/usr/lib/systemd/systemd" }
- { "distro": "ubuntu-18.04", "command": "/lib/systemd/systemd" }
- { "distro": "ubuntu-20.04", "command": "/lib/systemd/systemd" }
- { "distro": "debian-10", "command": "/lib/systemd/systemd" }
- { distro: centos-7, command: /usr/sbin/init }
- { distro: centos-8, command: /usr/sbin/init }
- { distro: fedora-32, command: /usr/sbin/init }
- { distro: fedora-31, command: /usr/sbin/init }
- { distro: fedora-30, command: /usr/lib/systemd/systemd }
- { distro: ubuntu-16.04, command: /sbin/init }
- { distro: ubuntu-18.04, command: /lib/systemd/systemd }
- { distro: ubuntu-20.04, command: /lib/systemd/systemd }
- { distro: debian-9, command: /lib/systemd/systemd }
- { distro: debian-10, command: /lib/systemd/systemd }
collection_role:
- logrotate
steps:
- name: Check out code
uses: actions/checkout@v1
uses: actions/checkout@v4
with:
path: ansible_collections/ericsysmin/system

Expand Down
25 changes: 14 additions & 11 deletions .github/workflows/ntp.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: "ericsysmin.system.ntp"
---
name: ericsysmin.system.ntp
on:
push:
paths:
- "roles/ntp/**"
- "molecule/ntp/**"
- ".github/workflows/ntp.yml"
- roles/ntp/**
- molecule/ntp/**
- .github/workflows/ntp.yml
pull_request:
paths:
- "roles/ntp/**"
- "molecule/ntp/**"
- ".github/workflows/ntp.yml"
- roles/ntp/**
- molecule/ntp/**
- .github/workflows/ntp.yml
jobs:
molecule:
runs-on: ubuntu-latest
Expand All @@ -20,14 +21,16 @@ jobs:
fail-fast: true
matrix:
molecule_distro:
- { "distro": "centos-7", "command": "/usr/sbin/init" }
- { "distro": "ubuntu-18.04", "command": "/lib/systemd/systemd" }
- { "distro": "ubuntu-20.04", "command": "/lib/systemd/systemd" }
- { distro: centos-7, command: /usr/sbin/init }
- { distro: ubuntu-16.04, command: /sbin/init }
- { distro: ubuntu-18.04, command: /lib/systemd/systemd }
- { distro: ubuntu-20.04, command: /lib/systemd/systemd }
- { distro: debian-9, command: /lib/systemd/systemd }
collection_role:
- ntp
steps:
- name: Check out code
uses: actions/checkout@v1
uses: actions/checkout@v4
with:
path: ansible_collections/ericsysmin/system

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: "release"
---
name: release
on:
release:
types:
Expand All @@ -11,12 +12,12 @@ jobs:
ANSIBLE_FORCE_COLOR: 1
steps:
- name: Check out code
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.11

- name: Install dependencies
run: |
Expand Down
27 changes: 14 additions & 13 deletions .github/workflows/remi_repo.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: "ericsysmin.system.remi_repo"
---
name: ericsysmin.system.remi_repo
on:
push:
paths:
- "roles/remi_repo/**"
- "molecule/remi_repo/**"
- ".github/workflows/remi_repo.yml"
- roles/remi_repo/**
- molecule/remi_repo/**
- .github/workflows/remi_repo.yml
pull_request:
paths:
- "roles/remi_repo/**"
- "molecule/remi_repo/**"
- ".github/workflows/remi_repo.yml"
- roles/remi_repo/**
- molecule/remi_repo/**
- .github/workflows/remi_repo.yml
jobs:
molecule:
runs-on: ubuntu-latest
Expand All @@ -20,16 +21,16 @@ jobs:
fail-fast: true
matrix:
molecule_distro:
- { "distro": "centos-7", "command": "/usr/sbin/init" }
- { "distro": "centos-8", "command": "/usr/sbin/init" }
- { "distro": "fedora-32", "command": "/usr/sbin/init" }
- { "distro": "fedora-31", "command": "/usr/sbin/init" }
- { "distro": "fedora-30", "command": "/usr/lib/systemd/systemd" }
- { distro: centos-7, command: /usr/sbin/init }
- { distro: centos-8, command: /usr/sbin/init }
- { distro: fedora-32, command: /usr/sbin/init }
- { distro: fedora-31, command: /usr/sbin/init }
- { distro: fedora-30, command: /usr/lib/systemd/systemd }
collection_role:
- remi_repo
steps:
- name: Check out code
uses: actions/checkout@v1
uses: actions/checkout@v4
with:
path: ansible_collections/ericsysmin/system

Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/selinux.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: "ericsysmin.system.selinux"
---
name: ericsysmin.system.selinux
on:
push:
paths:
- "roles/selinux/**"
- "molecule/selinux/**"
- ".github/workflows/selinux.yml"
- roles/selinux/**
- molecule/selinux/**
- .github/workflows/selinux.yml
pull_request:
paths:
- "roles/selinux/**"
- "molecule/selinux/**"
- ".github/workflows/selinux.yml"
- roles/selinux/**
- molecule/selinux/**
- .github/workflows/selinux.yml
jobs:
molecule:
runs-on: ubuntu-latest
Expand All @@ -20,13 +21,13 @@ jobs:
fail-fast: true
matrix:
molecule_distro:
- { "distro": "centos-7", "command": "/usr/sbin/init" }
- { "distro": "centos-8", "command": "/usr/sbin/init" }
- { distro: centos-7, command: /usr/sbin/init }
- { distro: centos-8, command: /usr/sbin/init }
collection_role:
- selinux
steps:
- name: Check out code
uses: actions/checkout@v1
uses: actions/checkout@v4
with:
path: ansible_collections/ericsysmin/system

Expand Down
19 changes: 10 additions & 9 deletions build/galaxy_deploy.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
---
- hosts: localhost
- nname: Deploy to Ansible Galaxy
hosts: localhost
connection: local
gather_facts: false
vars:
# This should be set via the command line at runtime.
tag: "{{ github_tag.split('/')[-1] }}"
pre_tasks:
- name: Ensure the ANSIBLE_GALAXY_TOKEN environment variable is set.
fail:
ansible.builtin.fail:
msg: ANSIBLE_GALAXY_TOKEN is not set.
when: "lookup('env','ANSIBLE_GALAXY_TOKEN') | length == 0"
when: lookup('env','ANSIBLE_GALAXY_TOKEN') | length == 0
- name: Ensure the ~/.ansible directory exists.
file:
ansible.builtin.file:
path: ~/.ansible
state: directory
- name: Write the Galaxy token to ~/.ansible/galaxy_token
copy:
ansible.builtin.copy:
content: |
token: {{ lookup('env','ANSIBLE_GALAXY_TOKEN') }}
token: {{ lookup('env', 'ANSIBLE_GALAXY_TOKEN') }}
dest: ~/.ansible/galaxy_token
tasks:
- name: Template out the galaxy.yml file.
template:
ansible.builtin.template:
src: templates/galaxy.yml.j2
dest: ../galaxy.yml
register: galaxy_yml
- name: Build the collection. # noqa 503
command: >
ansible.builtin.command: >
ansible-galaxy collection build
chdir=../
when: galaxy_yml.changed
- name: Publish the collection. # noqa 503
command: >
ansible.builtin.command: >
ansible-galaxy collection publish ./ericsysmin-system-{{ tag }}.tar.gz
chdir=../
when: galaxy_yml.changed
9 changes: 5 additions & 4 deletions galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
### REQUIRED

# The namespace of the collection. This can be a company/brand/organization or product namespace under which all
Expand All @@ -17,8 +18,7 @@ readme: README.md
# A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
# @nicks:irc/im.site#channel'
authors:
- Eric Anderson <[email protected]> (https://ericsysmin.com)

- Eric Anderson <[email protected]> (https://ericsysmin.com)

### OPTIONAL but strongly recommended

Expand All @@ -32,7 +32,7 @@ description: Collection of System Administration Roles

# The path to the license file for the collection. This path is relative to the root of the collection. This key is
# mutually exclusive with 'license'
license_file: 'LICENSE'
license_file: LICENSE

# A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
# requirements as 'namespace' and 'name'
Expand All @@ -51,7 +51,8 @@ tags:
# collection label 'namespace.name'. The value is a version range
# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
# range specifiers can be set and are separated by ','
dependencies: {}
dependencies:
"community.general": "*"

# The URL of the originating SCM repository
repository: https://github.com/ericsysmin/ansible-collection-system
Expand Down
Loading

0 comments on commit 539b456

Please sign in to comment.