Skip to content

Commit

Permalink
duplition of key quiet
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-de-bock committed Sep 15, 2023
1 parent 259a1e4 commit d0a1d5a
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 23 deletions.
16 changes: 8 additions & 8 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# Ansible managed
#
exclude_paths:
- ./molecule/default/prepare.yml
- ./molecule/default/converge.yml
- ./molecule/default/verify.yml
- ./molecule/default/collections.yml
- ./.tox
- ./.cache
- ./.github
- ./requirements.yml
- molecule/default/prepare.yml
- molecule/default/converge.yml
- molecule/default/verify.yml
- molecule/default/collections.yml
- .tox
- .cache
- .github
- requirements.yml

skip_list:
- yaml[truthy]
Expand Down
2 changes: 1 addition & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
repository:
description: Install and configure httpd on your system.
homepage: https://robertdebock.nl/
topics: webserver, apache, httpd, installer, package, ansible, molecule, tox, playbook
topics: webserver, apache, httpd, installer, package, system, networking, ansible, molecule, tox, playbook
8 changes: 4 additions & 4 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ jobs:
config:
- image: "enterpriselinux"
tag: "8"
- image: "enterpriselinux"
tag: "latest"
- image: "debian"
tag: "latest"
- image: "debian"
tag: "bookworm"
tag: "bullseye"
- image: "fedora"
tag: "36"
tag: "37"
- image: "fedora"
tag: "latest"
- image: "fedora"
tag: "rawhide"
- image: "opensuse"
tag: "latest"
- image: "ubuntu"
Expand Down
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ molecule:
matrix:
- image: "enterpriselinux"
tag: "8"
- image: "enterpriselinux"
tag: "latest"
- image: "debian"
tag: "latest"
- image: "debian"
tag: "bookworm"
tag: "bullseye"
- image: "fedora"
tag: "36"
tag: "37"
- image: "fedora"
tag: "latest"
- image: "fedora"
tag: "rawhide"
- image: "opensuse"
tag: "latest"
- image: "ubuntu"
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-added-large-files

- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
rev: v1.32.0
hooks:
- id: yamllint
args: [-c=.yamllint]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ This role has been tested on these [container images](https://hub.docker.com/u/r

|container|tags|
|---------|----|
|[EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general)|8|
|[EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general)|8, 9|
|[Debian](https://hub.docker.com/repository/docker/robertdebock/debian/general)|all|
|[Fedora](https://hub.docker.com/repository/docker/robertdebock/fedora/general)|all|
|[opensuse](https://hub.docker.com/repository/docker/robertdebock/opensuse/general)|all|
Expand Down
3 changes: 3 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ galaxy_info:
- name: EL
versions:
- "8"
- "9"
- name: Debian
versions:
- all
Expand All @@ -30,5 +31,7 @@ galaxy_info:
- httpd
- installer
- package
- system
- networking

dependencies: []
10 changes: 9 additions & 1 deletion tasks/assert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
that:
- httpd_servername is defined
- httpd_servername is string
- httpd_servername is not none
quiet: yes

- name: assert | Test if httpd_port is set correctly
Expand All @@ -27,6 +28,7 @@
that:
- httpd_ssl_servername is defined
- httpd_ssl_servername is string
- httpd_ssl_servername is not none
quiet: yes

- name: assert | Test if httpd_ssl_port is set correctly
Expand All @@ -52,10 +54,13 @@
that:
- item.name is defined
- item.name is string
- item.name is not none
- item.location is defined
- item.location is string
- item.location is not none
- item.backend_url is defined
- item.backend_url is string
- item.backend_url is not none
quiet: yes
loop: "{{ httpd_locations }}"
loop_control:
Expand All @@ -76,6 +81,7 @@
that:
- item.name is defined
- item.name is string
- item.name is not none
- item.servername is defined
- item.servername is string
quiet: yes
Expand Down Expand Up @@ -121,9 +127,10 @@
ansible.builtin.assert:
that:
- item.name is defined
- item.name is string
- item.name is not none
- item.path is defined
- item.path is string
- item.path is not none
- item.option is defined or item.allow_override is defined
quiet: yes
loop: "{{ httpd_directories }}"
Expand All @@ -148,6 +155,7 @@
ansible.builtin.assert:
that:
- item.allow_override is string
- item.allow_override is not none
quiet: yes
loop: "{{ httpd_directories }}"
loop_control:
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
#
[tox]
minversion = 4.2.4
envlist = py{310}-ansible{5,6,7}
envlist = py{310}-ansible{6,7,8}

skipsdist = true

[testenv]
deps =
-rrequirements.txt
ansible5: ansible == 5.*
ansible6: ansible == 6.*
ansible7: ansible == 7.*
ansible8: ansible == 8.*
commands = molecule test
setenv =
TOX_ENVNAME={envname}
Expand Down

0 comments on commit d0a1d5a

Please sign in to comment.