From 691c47d41c10f1dae0615acc2266b5d950bf6569 Mon Sep 17 00:00:00 2001 From: Lars Beckers <lars.beckers@rwth-aachen.de> Date: Wed, 12 Dec 2018 21:32:09 +0100 Subject: [PATCH] allow disabling built-in nginx deployment --- request-tracker/defaults/main.yml | 3 ++- request-tracker/tasks/main.yml | 24 ++++++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/request-tracker/defaults/main.yml b/request-tracker/defaults/main.yml index 69cb68a..61864f9 100644 --- a/request-tracker/defaults/main.yml +++ b/request-tracker/defaults/main.yml @@ -1,3 +1,4 @@ --- -rt_enable_acmetool: False +rt_enable_acmetool: false +rt_enable_nginx: true rt_workers: 4 diff --git a/request-tracker/tasks/main.yml b/request-tracker/tasks/main.yml index 664787a..fc78921 100644 --- a/request-tracker/tasks/main.yml +++ b/request-tracker/tasks/main.yml @@ -73,10 +73,19 @@ tags: - rt +- name: Have nginx packages installed + apt: + name: nginx + state: present + when: rt_enable_nginx|default(True) + tags: + - rt + - name: Have nginx config for RT installed template: src: nginx-rt.j2 dest: /etc/nginx/sites-available/rt + when: rt_enable_nginx|default(True) tags: - rt notify: @@ -86,6 +95,7 @@ file: path: /etc/nginx/sites-enabled/default state: absent + when: rt_enable_nginx|default(True) tags: - rt notify: @@ -96,6 +106,7 @@ state: link src: /etc/nginx/sites-available/rt dest: /etc/nginx/sites-enabled/rt + when: rt_enable_nginx|default(True) tags: - rt notify: @@ -137,9 +148,14 @@ with_items: - rt4-fcgi - request-tracker4 - - nginx - notify: - - restart RT - - restart nginx + tags: + - rt + +- name: Have nginx up und running + service: + name: nginx + state: started + enabled: yes + when: rt_enable_nginx|default(True) tags: - rt -- GitLab