Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Oefenweb/ansible-ca-certificates
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.43
Choose a base ref
...
head repository: Oefenweb/ansible-ca-certificates
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 11 commits
  • 13 files changed
  • 1 contributor

Commits on Sep 27, 2022

  1. Consistency changes

    tersmitten committed Sep 27, 2022
    Copy the full SHA
    13848f3 View commit details

Commits on Jan 10, 2023

  1. Fix deprecation errors

    tersmitten committed Jan 10, 2023
    Copy the full SHA
    ac67daf View commit details

Commits on Mar 28, 2023

  1. Consistency changes

    tersmitten committed Mar 28, 2023
    Copy the full SHA
    2eed83a View commit details

Commits on Sep 20, 2023

  1. Consistency changes

    tersmitten committed Sep 20, 2023
    Copy the full SHA
    ac5b335 View commit details

Commits on Oct 31, 2023

  1. Consistency changes

    tersmitten committed Oct 31, 2023
    Copy the full SHA
    27e1d4e View commit details

Commits on Nov 2, 2023

  1. Consistency changes

    tersmitten committed Nov 2, 2023
    Copy the full SHA
    ab48aad View commit details

Commits on Nov 7, 2024

  1. Add support for Noble

    tersmitten committed Nov 7, 2024
    Copy the full SHA
    ef19581 View commit details
  2. Cs fixes

    tersmitten committed Nov 7, 2024
    Copy the full SHA
    6280f84 View commit details
  3. Cs fixes

    tersmitten committed Nov 7, 2024
    Copy the full SHA
    9d211fe View commit details
  4. Merge pull request #5 from Oefenweb/add-support-for-noble

    Add support for Noble
    tersmitten authored Nov 7, 2024
    Copy the full SHA
    f471aec View commit details

Commits on Dec 10, 2024

  1. Cs fixes

    tersmitten committed Dec 10, 2024
    Copy the full SHA
    ed305de View commit details
Showing with 59 additions and 49 deletions.
  1. +3 −1 .ansible-lint
  2. +12 −11 .github/workflows/ci.yml
  3. +1 −1 .github/workflows/release.yml
  4. +1 −1 README.md
  5. +23 −16 Vagrantfile
  6. +1 −0 handlers/main.yml
  7. +4 −3 meta/main.yml
  8. +1 −5 molecule/default/collections.yml
  9. +4 −2 molecule/default/molecule.yml
  10. +1 −1 tasks/main.yml
  11. +2 −4 tests/tasks/pre.yml
  12. +3 −2 tests/test.yml
  13. +3 −2 tests/vagrant.yml
4 changes: 3 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---
warn_list:
- '106'
- role-name
- name[play]
- name[casing]
23 changes: 12 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -15,10 +15,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the codebase
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Python 3
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'

@@ -44,29 +44,30 @@ jobs:
fail-fast: false
matrix:
include:
- distro: debian8
- distro: debian9
- distro: debian10
- distro: ubuntu1604
ansible-version: '>=2.10, <2.11'
- distro: ubuntu1604
ansible-version: '>=9, <10'
- distro: debian11
- distro: debian12
- distro: ubuntu1804
ansible-version: '>=9, <10'
- distro: ubuntu2004
- distro: ubuntu2204
- distro: ubuntu2404

steps:
- name: Check out the codebase
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: "${{ github.repository }}"

- name: Set up Python 3
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'

- name: Install test dependencies
run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker

run: |
pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
- name: Run Molecule tests
run: |
molecule test
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the codebase
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Publish to Galaxy
uses: robertdebock/galaxy-action@1.2.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ None
---
- hosts: all
roles:
- ca-certificates
- oefenweb.ca-certificates
vars:
ca_certificates_certificate_map:
- src: ca-oefenweb-nl.crt
39 changes: 23 additions & 16 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -4,13 +4,6 @@
role = File.basename(File.expand_path(File.dirname(__FILE__)))

boxes = [
{
:name => "ubuntu-1604",
:box => "bento/ubuntu-16.04",
:ip => '10.0.0.12',
:cpu => "50",
:ram => "256"
},
{
:name => "ubuntu-1804",
:box => "bento/ubuntu-18.04",
@@ -23,21 +16,21 @@ boxes = [
:box => "bento/ubuntu-20.04",
:ip => '10.0.0.14',
:cpu => "50",
:ram => "384"
:ram => "512"
},
{
:name => "debian-8",
:box => "bento/debian-8",
:ip => '10.0.0.16',
:name => "ubuntu-2204",
:box => "bento/ubuntu-22.04",
:ip => '10.0.0.15',
:cpu => "50",
:ram => "256"
:ram => "512"
},
{
:name => "debian-9",
:box => "bento/debian-9",
:ip => '10.0.0.17',
:name => "ubuntu-2404",
:box => "bento/ubuntu-24.04",
:ip => '10.0.0.16',
:cpu => "50",
:ram => "256"
:ram => "512"
},
{
:name => "debian-10",
@@ -46,6 +39,20 @@ boxes = [
:cpu => "50",
:ram => "256"
},
{
:name => "debian-11",
:box => "bento/debian-11",
:ip => '10.0.0.19',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-12",
:box => "bento/debian-12",
:ip => '10.0.0.20',
:cpu => "50",
:ram => "384"
},
]

Vagrant.configure("2") do |config|
1 change: 1 addition & 0 deletions handlers/main.yml
Original file line number Diff line number Diff line change
@@ -3,3 +3,4 @@
- name: update ca-certificates

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 3 in handlers/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.command: >
update-ca-certificates
changed_when: true
7 changes: 4 additions & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -10,14 +10,15 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- xenial
- bionic
- focal
- jammy
- noble
- name: Debian
versions:
- jessie
- stretch
- buster
- bullseye
- bookworm
galaxy_tags:
- system
- certificates
6 changes: 1 addition & 5 deletions molecule/default/collections.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
---
collections:
- name: community.docker
version: '>=1.2.0,<2'
- name: community.general
version: '>=2,<3'
collections: []
6 changes: 4 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -5,10 +5,12 @@ driver:
name: docker
platforms:
- name: instance
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /sys/fs/cgroup:/sys/fs/cgroup:rw
- /var/lib/containerd
cgroupns_mode: host
privileged: true
pre_build_image: true
provisioner:
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
state: directory
owner: root
group: root
mode: 0755
mode: '0755'
with_items: "{{ _stat_directories.results | default([]) }}"
when: not item.stat.exists
tags:
6 changes: 2 additions & 4 deletions tests/tasks/pre.yml
Original file line number Diff line number Diff line change
@@ -9,8 +9,9 @@
cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"

- name: generate

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 11 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
connection: local
become: false
block:

- name: generate key

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.

Check warning on line 15 in tests/tasks/pre.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.command: >
openssl genrsa -out {{ ca_certificates_certificate_key_file }} 2048
@@ -28,6 +29,3 @@
;
args:
creates: "{{ ca_certificates_certificate_crt_file }}"

connection: local
become: false
5 changes: 3 additions & 2 deletions tests/test.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# test file
---
- hosts: localhost
- name: converge
hosts: localhost
connection: local
become: true
pre_tasks:
- name: include vars
ansible.builtin.include_vars: "{{ playbook_dir }}/vars/main.yml"
- name: include tasks
ansible.builtin.include: "{{ playbook_dir }}/tasks/pre.yml"
ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
roles:
- ../../
5 changes: 3 additions & 2 deletions tests/vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# test file
---
- hosts: all
- name: converge
hosts: all
remote_user: vagrant
become: true
pre_tasks:
- name: include vars
ansible.builtin.include_vars: "{{ playbook_dir }}/vars/main.yml"
- name: include tasks
ansible.builtin.include: "{{ playbook_dir }}/tasks/pre.yml"
ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
roles:
- ../../