diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bc4bf24f5a03231449ffe177cab18107358ed7be..8da5a5aff01783c02c2030d8644bfc1094bd86a5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,11 +8,29 @@ # # You should have received a copy of the GNU General Public License along with the Webarchitects Apache Ansible role. If not, see <https://www.gnu.org/licenses/>. --- -# https://yamllint.readthedocs.io/en/stable/integration.html -# https://github.com/adrienverge/yamllint/tags repos: + # https://github.com/adrienverge/yamllint/tags - repo: https://github.com/adrienverge/yamllint.git - rev: v1.31.0 + rev: v1.32.0 hooks: - id: yamllint + name: YAML Lint + # https://github.com/ansible/ansible-lint/releases + - repo: https://github.com/ansible/ansible-lint.git + rev: v6.17.2 + hooks: + - id: ansible-lint + name: Ansible Lint + language: python + additional_dependencies: + # https://github.com/kellyjonbrazil/jc/releases + - jc==1.23.2 + # https://github.com/jmespath/jmespath.py/tags + - jmespath==1.0.1 + # https://github.com/jackdewinter/pymarkdown/releases + - repo: https://github.com/jackdewinter/pymarkdown + rev: v0.9.11 + hooks: + - id: pymarkdown + name: Markdown Lint ... diff --git a/tasks/config.yml b/tasks/config.yml index b2b0af437028559b9b44e2c8b45c70be666ae6b7..16464f1ef56ce29396dbee9b2a21b70130909758 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -177,13 +177,13 @@ name: acmesh tasks_from: letsencrypt.yml vars: - common_name: "{{ inventory_hostname }}" + acmesh_common_name: "{{ inventory_hostname }}" when: - ( "md" not in apache_mods_enabled ) or ( apache_cert.stat is defined and not apache_cert.stat.exists ) - ( "ssl" in apache_mods_enabled ) - ( "le" in apache_conf_enabled ) - - ( common_name is defined ) and ( common_name == inventory_hostname ) + - ( acmesh_common_name is defined ) and ( acmesh_common_name == inventory_hostname ) tags: - apache