forked from ISTI-ansible-roles/ansible-roles
d4science-ghn-cluster/group_vars/smartexecutor_dev: Manage the dev smartexecutors too. Two groups to split the devsec and devnext scopes.
d4science-ghn-cluster/roles/nginx-frontend: Better nginx virtualhost management. library/roles: ansible 2 compatibility fixes.
This commit is contained in:
parent
58d736a81f
commit
f95f3a53b7
|
@ -3,7 +3,7 @@
|
||||||
authorized_key: user={{ item.0.name }} key="{{ item.1 }}" state=present
|
authorized_key: user={{ item.0.name }} key="{{ item.1 }}" state=present
|
||||||
when: non_root_users
|
when: non_root_users
|
||||||
with_subelements:
|
with_subelements:
|
||||||
- ssh_users_list
|
- '{{ ssh_users_list }}'
|
||||||
- authorized_keys
|
- authorized_keys
|
||||||
tags: [ "pubkeys", "ssh_keys" ]
|
tags: [ "pubkeys", "ssh_keys" ]
|
||||||
|
|
||||||
|
@ -13,6 +13,6 @@
|
||||||
- obsolete_ssh_key is defined
|
- obsolete_ssh_key is defined
|
||||||
- non_root_users
|
- non_root_users
|
||||||
with_subelements:
|
with_subelements:
|
||||||
- ssh_users_list
|
- '{{ ssh_users_list }}'
|
||||||
- authorized_keys
|
- authorized_keys
|
||||||
tags: [ "pubkeys", "ssh_keys" ]
|
tags: [ "pubkeys", "ssh_keys" ]
|
||||||
|
|
|
@ -1,16 +1,12 @@
|
||||||
---
|
---
|
||||||
- name: Install the ssh keys for the authorized users
|
- name: Install the ssh keys for the authorized users
|
||||||
authorized_key: user=root key="{{ item }}" state=present
|
authorized_key: user=root key="{{ item }}" state=present
|
||||||
with_items: user_ssh_key
|
with_items: '{{ user_ssh_key }}'
|
||||||
tags:
|
tags: [ 'pubkeys', 'ssh_keys' ]
|
||||||
- pubkeys
|
|
||||||
- ssh_keys
|
|
||||||
|
|
||||||
- name: Remove obsolete ssh keys if there are any
|
- name: Remove obsolete ssh keys if there are any
|
||||||
authorized_key: user=root key="{{ item }}" state=absent
|
authorized_key: user=root key="{{ item }}" state=absent
|
||||||
with_items: obsolete_ssh_key
|
with_items: '{{ obsolete_ssh_key }}'
|
||||||
when: obsolete_ssh_key is defined
|
when: obsolete_ssh_key is defined
|
||||||
tags:
|
tags: [ 'pubkeys', 'ssh_keys' ]
|
||||||
- pubkeys
|
|
||||||
- ssh_keys
|
|
||||||
|
|
||||||
|
|
|
@ -96,12 +96,12 @@
|
||||||
register: restart_needed
|
register: restart_needed
|
||||||
notify:
|
notify:
|
||||||
- tomcat restart instances with changed configs
|
- tomcat restart instances with changed configs
|
||||||
tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf' ]
|
tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf', 'tomcat_serverxml' ]
|
||||||
|
|
||||||
- name: Install the instances startup scripts
|
- name: Install the instances startup scripts
|
||||||
template: src=tomcat-instance.init.j2 dest=/etc/init.d/tomcat-instance-{{ item.http_port }} mode=0755 owner=root group=root
|
template: src=tomcat-instance.init.j2 dest=/etc/init.d/tomcat-instance-{{ item.http_port }} mode=0755 owner=root group=root
|
||||||
with_items: '{{ tomcat_m_instances }}'
|
with_items: '{{ tomcat_m_instances }}'
|
||||||
tags: [ 'tomcat', 'tomcat_instances' ]
|
tags: [ 'tomcat', 'tomcat_instances', 'tomcat_init' ]
|
||||||
|
|
||||||
- name: Install the tomcat instances default file
|
- name: Install the tomcat instances default file
|
||||||
template: src=tomcat-default.j2 dest=/etc/default/tomcat-instance-{{ item.http_port }} mode=0640 owner=root group={{ item.user }}
|
template: src=tomcat-default.j2 dest=/etc/default/tomcat-instance-{{ item.http_port }} mode=0640 owner=root group={{ item.user }}
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
register: restart_needed
|
register: restart_needed
|
||||||
notify:
|
notify:
|
||||||
- tomcat restart instances with changed configs
|
- tomcat restart instances with changed configs
|
||||||
tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf' ]
|
tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf', 'tomcat_default' ]
|
||||||
|
|
||||||
- name: Install a logrotate entry for the access log file
|
- name: Install a logrotate entry for the access log file
|
||||||
template: src=tomcat.logrotate.j2 dest=/etc/logrotate.d/tomcat_instance-{{ item.http_port }} owner=root group=root mode=0644
|
template: src=tomcat.logrotate.j2 dest=/etc/logrotate.d/tomcat_instance-{{ item.http_port }} owner=root group=root mode=0644
|
||||||
|
|
|
@ -13,19 +13,19 @@
|
||||||
template: src=tomcat-default.j2 dest=/etc/default/tomcat{{ tomcat_version }}
|
template: src=tomcat-default.j2 dest=/etc/default/tomcat{{ tomcat_version }}
|
||||||
when: tomcat_install_default_conf
|
when: tomcat_install_default_conf
|
||||||
notify: tomcat restart
|
notify: tomcat restart
|
||||||
tags: tomcat
|
tags: [ 'tomcat', 'tomcat_default' ]
|
||||||
|
|
||||||
- name: Configure tomcat server.xml
|
- name: Configure tomcat server.xml
|
||||||
template: src=tomcat-server.xml.j2 dest={{ tomcat_conf_dir }}/server.xml
|
template: src=tomcat-server.xml.j2 dest={{ tomcat_conf_dir }}/server.xml
|
||||||
when: tomcat_install_server_xml
|
when: tomcat_install_server_xml
|
||||||
notify: tomcat restart
|
notify: tomcat restart
|
||||||
tags: tomcat
|
tags: [ 'tomcat', 'tomcat_serverxml' ]
|
||||||
|
|
||||||
- name: Install a slightly modified catalina.properties
|
- name: Install a slightly modified catalina.properties
|
||||||
copy: src=catalina.properties dest={{ tomcat_conf_dir }}/catalina.properties owner=root group={{ tomcat_user }} mode=0644
|
copy: src=catalina.properties dest={{ tomcat_conf_dir }}/catalina.properties owner=root group={{ tomcat_user }} mode=0644
|
||||||
when: tomcat_install_default_conf
|
when: tomcat_install_default_conf
|
||||||
notify: tomcat restart
|
notify: tomcat restart
|
||||||
tags: tomcat
|
tags: [ 'tomcat', 'tomcat_catalinaprops' ]
|
||||||
|
|
||||||
- name: Create some directories that the package do not creates itself
|
- name: Create some directories that the package do not creates itself
|
||||||
file: dest={{ tomcat_catalina_home_dir }}/{{ item }} state=directory owner={{ tomcat_user }} group={{ tomcat_user }} mode=0755
|
file: dest={{ tomcat_catalina_home_dir }}/{{ item }} state=directory owner={{ tomcat_user }} group={{ tomcat_user }} mode=0755
|
||||||
|
|
|
@ -26,6 +26,7 @@ common_packages:
|
||||||
- bash-completion
|
- bash-completion
|
||||||
- sudo
|
- sudo
|
||||||
- apt-transport-https
|
- apt-transport-https
|
||||||
|
- nano
|
||||||
|
|
||||||
# Set this variable in your playbook
|
# Set this variable in your playbook
|
||||||
# additional_packages:
|
# additional_packages:
|
||||||
|
|
Loading…
Reference in New Issue