Browse Source

Split tomcat-instance in tomcat + tomcat-instance

samba
Victor LABORIE 4 years ago
committed by Jérémy Lecour
parent
commit
c3db08e6db
  1. 1
      tomcat-instance/README.md
  2. 2
      tomcat-instance/defaults/main.yml
  3. 7
      tomcat-instance/meta/main.yml
  4. 9
      tomcat-instance/tasks/main.yml
  5. 28
      tomcat/.kitchen.yml
  6. 7
      tomcat/README.md
  7. 2
      tomcat/defaults/main.yml
  8. 0
      tomcat/files/tomcat.service
  9. 0
      tomcat/handlers/main.yml
  10. 19
      tomcat/meta/main.yml
  11. 3
      tomcat/tasks/main.yml
  12. 2
      tomcat/tasks/nagios.yml
  13. 2
      tomcat/tasks/packages.yml
  14. 0
      tomcat/templates/check_tomcat_instance.sh.j2

1
tomcat-instance/README.md

@ -5,7 +5,6 @@ Install a Tomcat Instance with an independent Unix user and use of systemd user
## Available variables
**tomcat_instance_name **: Name of Tomcat instance and proprietary user and group (***required***)
**tomcat_instance_root:** Root dir for Tomcat instance (default: /srv/tomcat)
**tomcat_instance_port**: HTTP port for Tomcat instance and uid/gid for Tomcat user and group (default: 8080)
**tomcat_instance_shutdown**: Port for Tomcat shutdown (default: HTTP port + 1)
**tomcat_instance_ram**: Max memory for Tomcat instance (default: 512)

2
tomcat-instance/defaults/main.yml

@ -1,4 +1,2 @@
---
tomcat_instance_root: '/srv/tomcat'
tomcat_instance_port: 8080
tomcat_instance_ram: 512

7
tomcat-instance/meta/main.yml

@ -1,3 +1,4 @@
---
galaxy_info:
author: Evolix
description: Configuration of a Tomcat instance.
@ -13,7 +14,5 @@ galaxy_info:
versions:
- jessie
dependencies: []
# List your role dependencies here, one per line.
# Be sure to remove the '[]' above if you add dependencies
# to this list.
dependencies:
- tomcat

9
tomcat-instance/tasks/main.yml

@ -1,15 +1,6 @@
---
- include: tomcat.yml
- include: nagios.yml
- include: check.yml
- include: user.yml
- include: systemd.yml
- include: alias.yml
- include: bootstrap.yml

28
tomcat/.kitchen.yml

@ -0,0 +1,28 @@
---
driver:
name: docker
privileged: true
use_sudo: false
provisioner:
name: ansible_playbook
hosts: test-kitchen
roles_path: ../
ansible_verbose: true
require_ansible_source: false
require_chef_for_busser: false
idempotency_test: true
platforms:
- name: debian
driver_config:
image: evolix/ansible:2.2.1
suites:
- name: default
provisioner:
name: ansible_playbook
playbook: ./tests/test.yml
transport:
max_ssh_sessions: 6

7
tomcat/README.md

@ -0,0 +1,7 @@
# tomcat
Install a Tomcat depndancies for multiple tomcat instance.
## Available variables
**tomcat_instance_root:** Root dir for Tomcat instance (default: /srv/tomcat)

2
tomcat/defaults/main.yml

@ -0,0 +1,2 @@
---
tomcat_instance_root: '/srv/tomcat'

0
tomcat-instance/files/tomcat.service → tomcat/files/tomcat.service

0
tomcat-instance/handlers/main.yml → tomcat/handlers/main.yml

19
tomcat/meta/main.yml

@ -0,0 +1,19 @@
galaxy_info:
author: Evolix
description: Installation of a Tomcat.
issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues
license: GPLv2
min_ansible_version: 2.2
platforms:
- name: Debian
versions:
- jessie
dependencies: []
# List your role dependencies here, one per line.
# Be sure to remove the '[]' above if you add dependencies
# to this list.

3
tomcat/tasks/main.yml

@ -0,0 +1,3 @@
---
- include: packages.yml
- include: nagios.yml

2
tomcat-instance/tasks/nagios.yml → tomcat/tasks/nagios.yml

@ -27,6 +27,6 @@
- name: Copy Tomcat instance check
template:
src: templates/check_tomcat_instance.sh.j2
src: check_tomcat_instance.sh.j2
dest: /usr/local/lib/nagios/plugins/check_tomcat_instance.sh
mode: "0755"

2
tomcat-instance/tasks/tomcat.yml → tomcat/tasks/packages.yml

@ -18,7 +18,7 @@
- name: Copy systemd unit
copy:
src: 'files/tomcat.service'
src: 'tomcat.service'
dest: "/etc/systemd/user/tomcat.service"
mode: "0755"
notify: systemd reload

0
tomcat-instance/templates/check_tomcat_instance.sh.j2 → tomcat/templates/check_tomcat_instance.sh.j2

Loading…
Cancel
Save