Merge branch 'master' of github.com:freifunkhamburg/ansible-config

This commit is contained in:
Frederik Wille 2015-09-18 20:36:11 +02:00
commit a04ad58543
7 changed files with 7 additions and 7 deletions

View file

@ -1,2 +1,2 @@
---
- include: ../../includes/base-static/handlers/main.yml
- include: "{{ playbook_dir }}/roles/website/includes/base-static/handlers/main.yml"

View file

@ -1,5 +1,5 @@
---
- include: ../../includes/base-static/tasks/main.yml
- include: "{{ playbook_dir }}/roles/website/includes/base-static/tasks/main.yml"
vars:
site: ffnord_site
domains:

View file

@ -1,2 +1,2 @@
---
- include: ../../../../nginx/handlers/main.yml
- include: "{{ playbook_dir }}/roles/nginx/handlers/main.yml"

View file

@ -1,2 +1,2 @@
---
- include: ../../includes/base-static/handlers/main.yml
- include: "{{ playbook_dir }}/roles/website/includes/base-static/handlers/main.yml"

View file

@ -1,5 +1,5 @@
---
- include: ../../includes/base-static/tasks/main.yml
- include: "{{ playbook_dir }}/roles/website/includes/base-static/tasks/main.yml"
vars:
site: ffhh_media
domains:

View file

@ -1,2 +1,2 @@
---
- include: ../../includes/base-static/handlers/main.yml
- include: "{{ playbook_dir }}/roles/website/includes/base-static/handlers/main.yml"

View file

@ -1,5 +1,5 @@
---
- include: ../../includes/base-static/tasks/main.yml
- include: "{{ playbook_dir }}/roles/website/includes/base-static/tasks/main.yml"
vars:
site: ffhh_meta
domains: