diff --git a/README.md b/README.md index f156af5..4bca452 100644 --- a/README.md +++ b/README.md @@ -117,8 +117,8 @@ found in the *vars/versions* directory. When configuring a version, that is not predefined (so far), the following variables must also be defined in the playbook/inventory: -* ``tomcat_redis_checksum``: SHA256 sum for the downloaded Tomcat redistributable package (string, default: ``a787ea12e163e78ccebbb9662d7da78e707aef051d15af9ab5be20489adf1f6d``) -* ``tomcat_web_xml_schema_version``: Configures Tomcat web.xml schema version when used with the default template ``web.xml.j2``. +* ``tomcat_redis_checksum``: SHA256 sum for the downloaded Tomcat redistributable package (string, default: ``sha256:a787ea12e163e78ccebbb9662d7da78e707aef051d15af9ab5be20489adf1f6d``) +* ``tomcat_web_xml_schema_version``: Configures Tomcat web.xml schema version when used with the default template ``web.xml.j2``. Should be something like ``3.1``. ### tomcat_web_xml_schema_version @@ -526,6 +526,6 @@ Ruby with rake and bundler available. * [deepan](https://github.com/deepan) * [PhysicsUnplugged](https://github.com/PhysicsUnplugged) * [AMeng](https://github.com/AMeng) - +* [afeld](https://github.com/afeld) diff --git a/tasks/main.yml b/tasks/main.yml index 57cf285..1911bc5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -136,7 +136,7 @@ - name: Register static/unmanaged conf files tags: tomcat register: tomcat_registered_conf_files - always_run: true + check_mode: no changed_when: false when: tomcat_fact_is_not_initial_check_mode # failed_when: "{{ false if lib_fact_check_mode else omit }}" diff --git a/vars/service/systemd.yml b/vars/service/systemd.yml index 29bc54d..9b2d9b3 100644 --- a/vars/service/systemd.yml +++ b/vars/service/systemd.yml @@ -3,4 +3,4 @@ tomcat_default_service_template: "{{ tomcat_server_systemd_template }}" tomcat_default_service_file: "tomcat@.service" tomcat_default_service_name: "tomcat@tomcat" tomcat_service_dir: /etc/systemd/system -tomcat_service_file_mode: 644 +tomcat_service_file_mode: 0644 diff --git a/vars/service/sysvinit.yml b/vars/service/sysvinit.yml index 2c0c4b5..4686e4e 100644 --- a/vars/service/sysvinit.yml +++ b/vars/service/sysvinit.yml @@ -3,4 +3,4 @@ tomcat_default_service_template: "{{ tomcat_server_sysvinit_template }}" tomcat_default_service_file: tomcat tomcat_default_service_name: tomcat tomcat_service_dir: /etc/init.d -tomcat_service_file_mode: 755 +tomcat_service_file_mode: 0755 diff --git a/vars/service/upstart.yml b/vars/service/upstart.yml index 448d48e..afd4e50 100644 --- a/vars/service/upstart.yml +++ b/vars/service/upstart.yml @@ -3,4 +3,4 @@ tomcat_default_service_template: "{{ tomcat_server_upstart_template }}" tomcat_default_service_file: tomcat.conf tomcat_default_service_name: tomcat tomcat_service_dir: /etc/init -tomcat_service_file_mode: 644 +tomcat_service_file_mode: 0644