From 52a0937a9df965952e747aa513f358ef241a415a Mon Sep 17 00:00:00 2001 From: baldo Date: Sun, 30 Aug 2015 13:06:59 +0200 Subject: [PATCH] =?UTF-8?q?nginx=20und=20ffnord.net=20Config=20=C3=BCberar?= =?UTF-8?q?beitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/nginx/handlers/main.yml | 3 +++ roles/website/ffnord/handlers/main.yml | 3 --- roles/website/ffnord/main.yml | 4 ++++ roles/website/ffnord/tasks/main.yml | 19 ++++++++++++++----- 4 files changed, 21 insertions(+), 8 deletions(-) delete mode 100644 roles/website/ffnord/handlers/main.yml create mode 100644 roles/website/ffnord/main.yml diff --git a/roles/nginx/handlers/main.yml b/roles/nginx/handlers/main.yml index 92971d2..0a08d0a 100644 --- a/roles/nginx/handlers/main.yml +++ b/roles/nginx/handlers/main.yml @@ -1,3 +1,6 @@ --- - name: restart nginx service: name=nginx state=restarted + +- name: reload nginx config + service: name=nginx state=reloaded diff --git a/roles/website/ffnord/handlers/main.yml b/roles/website/ffnord/handlers/main.yml deleted file mode 100644 index 934dccb..0000000 --- a/roles/website/ffnord/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: reload ffnord - service: name=nginx state=reloaded diff --git a/roles/website/ffnord/main.yml b/roles/website/ffnord/main.yml new file mode 100644 index 0000000..da44096 --- /dev/null +++ b/roles/website/ffnord/main.yml @@ -0,0 +1,4 @@ +--- +handlers: + - include: ../../nginx/handlers/main.yml + diff --git a/roles/website/ffnord/tasks/main.yml b/roles/website/ffnord/tasks/main.yml index 9c517c8..4abaf44 100644 --- a/roles/website/ffnord/tasks/main.yml +++ b/roles/website/ffnord/tasks/main.yml @@ -6,8 +6,11 @@ owner=root group=root mode=0644 - notify: reload ffnord - tags: nginx + notify: reload nginx config + tags: + - nginx + - website + - ffnord - name: enable ffnord.net site file: > @@ -17,10 +20,16 @@ group=root mode=0644 state=link - notify: reload ffnord - tags: nginx + notify: reload nginx config + tags: + - nginx + - website + - ffnord - name: clone ffnord.net repository git: repo=https://github.com/ffnord/ffnord.net.git dest=/var/www/ffnord.net - tags: nginx + tags: + - nginx + - website + - ffnord