diff --git a/.ansible-lint b/.ansible-lint index f18a6472898d714ef85310cdbe01e39500977528..5620f63fdead7345765426d57e39bbf4809773f4 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -37,6 +37,7 @@ use_default_rules: true skip_list: - skip_this_tag - git-latest + - name[casing] # Any rule that has the 'opt-in' tag will not be loaded unless its 'id' is # mentioned in the enable_list: diff --git a/meta/main.yml b/meta/main.yml index ffcfaca9692b136f5cef61dce132286990810e32..4e494b37a78106b30e6e855134b068e32bb23b85 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,5 +1,7 @@ --- galaxy_info: + role_name: "ansible_lza_validators" + namespace: "slub" author: Jörg Sachse (<Joerg.Sachse@slub-dresden.de>) company: SLUB Dresden description: role to install validation server for the SLUBarchiv digital preservation repository diff --git a/molecule/resources/playbooks/prepare.yml b/molecule/resources/playbooks/prepare.yml index 3a60934020e5ccdfbaebdfc0f020c764fc2218e4..25f7ac8c245371b3e95018713bab6ee9069d88ba 100644 --- a/molecule/resources/playbooks/prepare.yml +++ b/molecule/resources/playbooks/prepare.yml @@ -9,6 +9,7 @@ become: true - name: configure additional package repositories for Debian + when: ansible_os_family == "Debian" block: - name: add 'contrib' repos to default Debian repos ansible.builtin.replace: @@ -34,9 +35,9 @@ update_cache: true mode: "0644" become: true - when: ansible_os_family == "Debian" - name: configure additional package repositories for RedHat + when: ansible_os_family == "RedHat" block: - name: add custom repositories ansible.builtin.yum_repository: @@ -58,4 +59,3 @@ ansible.builtin.file: path: "/etc/yum.repos.d/SLUB.repo" state: absent - when: ansible_os_family == "RedHat" diff --git a/site.yml b/site.yml index 7f71f79288280d8a3e1491da18463a74a087f2fd..ca7f5a197f7c8ca034ec7426b3e8d90507bda588 100644 --- a/site.yml +++ b/site.yml @@ -1,8 +1,9 @@ --- -- hosts: "*" +- name: install validation server + hosts: "*" pre_tasks: - name: Verify that the installed version of Ansible meets this playbook's version requirements. - assert: + ansible.builtin.assert: that: "ansible_version.full is version_compare('2.8', '>=')" msg: > "You must update Ansible to at least 2.8 to use this playbook." diff --git a/tasks/configure_apache.yml b/tasks/configure_apache.yml index d5f20ab0114c792f64a2448f3c146fbeb6e19fd4..8e45ef1a7d0f8dc8a04978dec0e83aa8cd49c951 100644 --- a/tasks/configure_apache.yml +++ b/tasks/configure_apache.yml @@ -26,7 +26,7 @@ # symlink /etc/apache2/mods-available/cgi.load to /etc/apache2/mods-enabled/ - name: CGI-Extension-Modul aktivieren - apache2_module: + community.general.apache2_module: name: "cgid" notify: - restart apache