tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

library: Fixed some typos and some ansible 2 compatibility warnings.

This commit is contained in:
Andrea Dell'Amico 2016-09-05 16:40:57 +02:00
parent 3118736ea0
commit eb7989f07a
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache/tasks/apache-basic-auth.yml
View File

@ -1,7 +1,7 @@
--- ---
- name: Load the basic auth modules - name: Load the basic auth modules
apache2_module: name={{ item }} state=present apache2_module: name={{ item }} state=present
with_items: apache_basic_auth_modules with_items: '{{ apache_basic_auth_modules }}'
notify: apache2 reload notify: apache2 reload
tags: tags:
- apache - apache
@ -29,7 +29,7 @@
- name: Create the basic auth file - name: Create the basic auth file
htpasswd: path={{ item.auth_file }} name={{ item.username }} password={{ item.password }} create=yes state={{ item.state }} htpasswd: path={{ item.auth_file }} name={{ item.username }} password={{ item.password }} create=yes state={{ item.state }}
with_items: apache_basic_users with_items: '{{ apache_basic_users }}'
when: apache_basic_users is defined and not apache_basic_auth_single_file when: apache_basic_users is defined and not apache_basic_auth_single_file
tags: tags:
- apache - apache

4
letsencrypt-acmetool-client/tasks/main.yml
View File

@ -25,12 +25,12 @@
notify: Initialize letsencrypt acmetool notify: Initialize letsencrypt acmetool
tags: letsencrypt tags: letsencrypt
- name: Create the letsencrytp acme user - name: Create the letsencrypt acme user
user: name={{ letsencrypt_acme_user }} home={{ letsencrypt_acme_user_home }} createhome=no shell=/bin/bash user: name={{ letsencrypt_acme_user }} home={{ letsencrypt_acme_user_home }} createhome=no shell=/bin/bash
when: letsencrypt_acme_install when: letsencrypt_acme_install
tags: letsencrypt tags: letsencrypt
- name: Create the letsencrytp acme home, if it does not exist already. In a separate step because it could be already there. - name: Create the letsencrypt acme home, if it does not exist already. In a separate step because it could be already there.
file: dest={{ letsencrypt_acme_user_home }} owner={{ letsencrypt_acme_user }} group={{ letsencrypt_acme_user }} state=directory recurse=yes file: dest={{ letsencrypt_acme_user_home }} owner={{ letsencrypt_acme_user }} group={{ letsencrypt_acme_user }} state=directory recurse=yes
when: letsencrypt_acme_install when: letsencrypt_acme_install
tags: letsencrypt tags: letsencrypt

2
postfix-relay/tasks/postfix-relay-server.yml
View File

@ -7,7 +7,7 @@
- name: Install the sasl2 authentication infrastructure - name: Install the sasl2 authentication infrastructure
apt: pkg={{ item }} state=installed apt: pkg={{ item }} state=installed
with_items: postfix_sasl_packages with_items: '{{ postfix_sasl_packages }}'
tags: tags:
- postfix-relay - postfix-relay

2
solr-tomcat-instance/defaults/main.yml
View File

@ -33,7 +33,7 @@ solr_opts: "-DzkRun -DnumShards={{ solr_shards }}"
#solr_opts: "-DzkRun={{ ansible_fqdn}}:{{ solr_zoo_port }} -DnumShards={{ solr_shards }} -DzkHost=index1:{{ solr_zoo_port }},index2:{{ solr_zoo_port }},index3:{{ solr_zoo_port }}" #solr_opts: "-DzkRun={{ ansible_fqdn}}:{{ solr_zoo_port }} -DnumShards={{ solr_shards }} -DzkHost=index1:{{ solr_zoo_port }},index2:{{ solr_zoo_port }},index3:{{ solr_zoo_port }}"
# Define the following if you want a multicore installation # Define the following if you want a multicore installation
#solr_multicore: True solr_multicore: False
solr_cores: solr_cores:
- collection1 - collection1

4
solr-tomcat-instance/templates/solr.xml.j2
View File

@ -29,7 +29,7 @@
<solr> <solr>
<solrcloud> <solrcloud>
{% if solr_multicore is not defined or not solr_multicore %} {% if not solr_multicore %}
<str name="host">{{ ansible_fqdn }}</str> <str name="host">{{ ansible_fqdn }}</str>
<int name="hostPort">{{ solr_http_port_1 }}</int> <int name="hostPort">{{ solr_http_port_1 }}</int>
<str name="hostContext">${hostContext:solr}</str> <str name="hostContext">${hostContext:solr}</str>
@ -43,7 +43,7 @@
<int name="connTimeout">${connTimeout:0}</int> <int name="connTimeout">${connTimeout:0}</int>
</shardHandlerFactory> </shardHandlerFactory>
{% if solr_multicore is defined or solr_multicore %} {% if solr_multicore %}
<cores adminPath="/admin/cores"> <cores adminPath="/admin/cores">
{% for core in solr_cores %} {% for core in solr_cores %}