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

library/roles/tomcat: Make it more ansible 2 compliant. 

library/roles/postgresql: Make it more ansible 2 compliant.
This commit is contained in:
Andrea Dell'Amico 2016-03-01 18:49:38 +01:00
parent d11b513c2d
commit 67ea1e71c3
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
postgresql/defaults/main.yml
View File

@ -39,9 +39,9 @@ psql_sysctl_kernel_sharedmem_parameters:
- { name: 'kernel.shmall', value: '2097152' } - { name: 'kernel.shmall', value: '2097152' }
postgresql_pkgs: postgresql_pkgs:
- postgresql-'{{ psql_version }}' - 'postgresql-{{ psql_version }}'
- postgresql-contrib-'{{ psql_version }}' - 'postgresql-contrib-{{ psql_version }}'
- postgresql-client-'{{ psql_version }}' - 'postgresql-client-{{ psql_version }}'
- pgtop - pgtop
psql_db_name: db_name psql_db_name: db_name
@ -52,7 +52,7 @@ psql_db_pwd: "We cannot save the password into the repository. Use another varia
postgres_install_gis_extensions: False postgres_install_gis_extensions: False
postgres_gis_version: 2.1 postgres_gis_version: 2.1
postgres_gis_pkgs: postgres_gis_pkgs:
- postgresql-'{{ psql_version }}'-postgis-'{{ postgres_gis_version }}' - 'postgresql-{{ psql_version }}-postgis-{{ postgres_gis_version }}'
pg_backup_enabled: True pg_backup_enabled: True

8
tomcat/defaults/main.yml
View File

@ -3,9 +3,9 @@ tomcat_version: 7
tomcat_pkg_state: installed tomcat_pkg_state: installed
tomcat_service_enabled: True tomcat_service_enabled: True
tomcat_pkgs: tomcat_pkgs:
- tomcat'{{ tomcat_version }}' - 'tomcat{{ tomcat_version }}'
- libtomcat'{{ tomcat_version }}'-java - 'libtomcat{{ tomcat_version }}-java'
- tomcat'{{ tomcat_version }}'-common - 'tomcat{{ tomcat_version }}-common'
- libapr1 - libapr1
tomcat_user: tomcat7 tomcat_user: tomcat7
tomcat_max_threads: 200 tomcat_max_threads: 200
@ -31,7 +31,7 @@ tomcat_ajp_address: 127.0.0.1
# Disable the shutdown port by default # Disable the shutdown port by default
#tomcat_shutdown_port: 8005 #tomcat_shutdown_port: 8005
tomcat_shutdown_port: -1 tomcat_shutdown_port: -1
tomcat_shutdown_pwd: "{{ lookup('password', '/tmp/passwordfile chars=ascii_letters,digits,hexdigits,punctuation') }}" tomcat_shutdown_pwd: "{{ lookup('password', '/tmp/passwordfile chars=ascii_letters,digits,hexdigits') }}"
tomcat_restart_timeout: 300 tomcat_restart_timeout: 300
tomcat_catalina_home_dir: '/usr/share/tomcat{{ tomcat_version }}' tomcat_catalina_home_dir: '/usr/share/tomcat{{ tomcat_version }}'
tomcat_catalina_base_dir: '/var/lib/tomcat{{ tomcat_version }}' tomcat_catalina_base_dir: '/var/lib/tomcat{{ tomcat_version }}'

2
tomcat/tasks/tomcat-pkgs.yml
View File

@ -1,7 +1,7 @@
--- ---
- name: Install the tomcat packages - name: Install the tomcat packages
apt: pkg={{ item }} state={{ tomcat_pkg_state }} apt: pkg={{ item }} state={{ tomcat_pkg_state }}
with_items: tomcat_pkgs with_items: '{{ tomcat_pkgs }}'
tags: tomcat tags: tomcat
- name: Create the tomcat tmp directory - name: Create the tomcat tmp directory