diff --git a/all.yaml b/all.yaml index a412deb..43fc970 100644 --- a/all.yaml +++ b/all.yaml @@ -2,6 +2,7 @@ become: yes roles: - { role: apache2config } + - { role: tomcat8 } vars: tmpl: - { file: "101-syncthing", value: 'Use ProxyHost "syncthing.rudolf" "/" "http://localhost:{{ syncthing_port }}/" "syncthing.rudolf"' } diff --git a/roles/apache2/tasks/main.yml b/roles/apache2/tasks/main.yml index 21f12ab..419111d 100644 --- a/roles/apache2/tasks/main.yml +++ b/roles/apache2/tasks/main.yml @@ -26,11 +26,10 @@ - { name: macro , state: present } - { name: auth_openidc , state: present } - { name: ssl , state: present } - - { name: cgi , state: present } + - { name: cgid , state: present } # - { name: ssl , state: absent } notify: - restart apache2 - ignore_errors: True - name: apache running service: diff --git a/roles/jenkins/tasks/main.yaml b/roles/jenkins/tasks/main.yaml index 2ccef73..48c515d 100644 --- a/roles/jenkins/tasks/main.yaml +++ b/roles/jenkins/tasks/main.yaml @@ -21,6 +21,7 @@ detach: True net: default restart_policy: always + memory_limit: 1024MB volumes: - "/var/jenkins:/var/jenkins_home" # - "/var/run/docker.sock:/var/run/docker.sock" diff --git a/roles/tomcat8/handlers/main.yml b/roles/tomcat8/handlers/main.yml new file mode 100644 index 0000000..a555f9b --- /dev/null +++ b/roles/tomcat8/handlers/main.yml @@ -0,0 +1,2 @@ +- name: restart tomcat8 + service: name=tomcat8 state=restarted diff --git a/roles/tomcat8/meta/main.yml b/roles/tomcat8/meta/main.yml new file mode 100644 index 0000000..2e405b5 --- /dev/null +++ b/roles/tomcat8/meta/main.yml @@ -0,0 +1,8 @@ +galaxy_info: + author: your name + description: your description + company: your company (optional) + license: license (GPLv2, CC-BY, etc) + min_ansible_version: 1.2 + galaxy_tags: [] +dependencies: [] diff --git a/roles/tomcat8/tasks/main.yml b/roles/tomcat8/tasks/main.yml new file mode 100644 index 0000000..c320715 --- /dev/null +++ b/roles/tomcat8/tasks/main.yml @@ -0,0 +1,9 @@ +- name: install tomcat8 + apt: name=tomcat8 update_cache=yes state=latest + +- name: tomcat8 running + service: + name: tomcat8 + state: started + enabled: yes +