Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024 distro support #24

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,55 @@ version: 2.1
jobs:
lint-ansible:
docker:
- image: ubuntu:22.04
- image: ubuntu:24.04
steps:
- checkout
- run:
name: ansible-lint
command: |
apt update
apt -y install build-essential python3-virtualenv git
DEBIAN_FRONTEND=noninteractive apt -y install build-essential python3-virtualenv git
virtualenv ansible-lint
. ansible-lint/bin/activate
pip install ansible ansible-lint
cd ansible/playbooks/roles
ansible-lint *
lint-puppet:
docker:
- image: ubuntu:22.04
- image: ubuntu:24.04
steps:
- checkout
- run:
name: puppet-lint
command: |
apt update
apt -y install build-essential zlib1g-dev ruby ruby-dev
DEBIAN_FRONTEND=noninteractive apt -y install build-essential zlib1g-dev ruby ruby-dev
gem install puppet-lint
puppet-lint --fail-on-warnings --no-documentation-check puppet/modules
lint-salt:
docker:
- image: ubuntu:22.04
- image: ubuntu:24.04
steps:
- checkout
- run:
name: salt-lint
command: |
apt update
apt -y install build-essential python3-dev python3-virtualenv
DEBIAN_FRONTEND=noninteractive apt -y install build-essential python3-dev python3-virtualenv
virtualenv salt-lint
. salt-lint/bin/activate
pip install salt-lint
find saltstack -name "*.sls" -print0 | xargs -0 -n1 salt-lint
lint-chef:
docker:
- image: ubuntu:22.04
- image: ubuntu:24.04
steps:
- checkout
- run:
name: chef-lint
command: |
apt update
apt -y install build-essential zlib1g-dev ruby ruby-dev
DEBIAN_FRONTEND=noninteractive apt -y install build-essential zlib1g-dev ruby ruby-dev
gem install foodcritic cookstyle
foodcritic -t ~FC031 -t ~FC071 -t ~FC011 -t ~FC109 chef/cookbooks
cookstyle chef
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
bash -x standalone-chef.sh -e [email protected] -l
ansible-ubuntu:
docker:
- image: ubuntu:22.04
- image: ubuntu:24.04
steps:
- checkout
- run:
Expand All @@ -108,7 +108,7 @@ jobs:
bash -x standalone-ansible.sh -e [email protected] -l
puppet-ubuntu:
docker:
- image: ubuntu:22.04
- image: ubuntu:24.04
steps:
- checkout
- run:
Expand All @@ -119,7 +119,7 @@ jobs:
bash -x standalone-puppet.sh -e [email protected] -l
salt-ubuntu:
docker:
- image: ubuntu:22.04
- image: ubuntu:24.04
steps:
- checkout
- run:
Expand All @@ -130,7 +130,7 @@ jobs:
bash -x standalone-salt.sh -e [email protected] -l
chef-ubuntu:
docker:
- image: ubuntu:22.04
- image: ubuntu:24.04
steps:
- checkout
- run:
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
bash -x standalone-chef.sh -e [email protected] -l
ansible-opensuse:
docker:
- image: opensuse/leap:15.5
- image: opensuse/leap:15.6
steps:
- checkout
- run:
Expand All @@ -190,7 +190,7 @@ jobs:
bash -x standalone-ansible.sh -e [email protected] -l
puppet-opensuse:
docker:
- image: opensuse/leap:15.5
- image: opensuse/leap:15.6
steps:
- checkout
- run:
Expand All @@ -200,7 +200,7 @@ jobs:
bash -x standalone-puppet.sh -e [email protected] -l
salt-opensuse:
docker:
- image: opensuse/leap:15.5
- image: opensuse/leap:15.6
steps:
- checkout
- run:
Expand All @@ -210,7 +210,7 @@ jobs:
bash -x standalone-salt.sh -e [email protected] -l
chef-opensuse:
docker:
- image: opensuse/leap:15.5
- image: opensuse/leap:15.6
steps:
- checkout
- run:
Expand All @@ -220,7 +220,7 @@ jobs:
bash -x standalone-chef.sh -e [email protected] -l
ansible-fedora:
docker:
- image: fedora:38
- image: fedora:40
steps:
- checkout
- run:
Expand All @@ -230,7 +230,7 @@ jobs:
bash -x standalone-ansible.sh -e [email protected] -l
puppet-fedora:
docker:
- image: fedora:38
- image: fedora:40
steps:
- checkout
- run:
Expand All @@ -240,7 +240,7 @@ jobs:
bash -x standalone-puppet.sh -e [email protected] -l
salt-fedora:
docker:
- image: fedora:38
- image: fedora:40
steps:
- checkout
- run:
Expand All @@ -250,7 +250,7 @@ jobs:
bash -x standalone-salt.sh -e [email protected] -l
chef-fedora:
docker:
- image: fedora:38
- image: fedora:40
steps:
- checkout
- run:
Expand Down
2 changes: 2 additions & 0 deletions saltstack/salt/fail2ban/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ fail2ban:
- user: root
- group: root
- mode: '0644'
- follow_symlinks: True
- require:
- pkg: fail2ban

Expand All @@ -26,5 +27,6 @@ fail2ban:
- user: root
- group: root
- mode: '0644'
- follow_symlinks: True
- require:
- pkg: fail2ban
1 change: 1 addition & 0 deletions saltstack/salt/screen/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ screen:
- user: root
- group: root
- mode: '0644'
- follow_symlinks: True
1 change: 1 addition & 0 deletions saltstack/salt/ssh/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ openssh-server:
- user: root
- group: root
- mode: '0644'
- follow_symlinks: True
- require:
- pkg: openssh-server

Expand Down
3 changes: 3 additions & 0 deletions saltstack/salt/vim/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ vim-data:
- user: root
- group: root
- mode: '0644'
- follow_symlinks: True
{% endif %}

{% if grains['os_family'] == 'RedHat' %}
Expand All @@ -30,6 +31,7 @@ vim-data:
- user: root
- group: root
- mode: '0644'
- follow_symlinks: True
{% endif %}

/etc/vim:
Expand All @@ -44,5 +46,6 @@ vim-data:
- user: root
- group: root
- mode: '0644'
- follow_symlinks: True
- require:
- file: /etc/vim