From 92d28b629763d846e6a0df4b01e5a54fcd462841 Mon Sep 17 00:00:00 2001 From: Andrea Cimbalo Date: Fri, 12 Aug 2016 18:57:37 +0200 Subject: [PATCH] fix vars --- roles/apache/defaults/main.yml | 2 ++ roles/apache/tasks/main.yaml | 16 ++++++++++++++++ roles/dokuwiki/meta/main.yaml | 1 - roles/dokuwiki/vars/main.yml | 1 + roles/roundcube/meta/main.yaml | 1 - roles/roundcube/tasks/main.yaml | 8 ++------ roles/roundcube/vars/main.yml | 1 + roles/sympa/meta/main.yaml | 1 - roles/sympa/tasks/main.yaml | 11 ++++------- roles/sympa/vars/main.yml | 1 + 10 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 roles/apache/defaults/main.yml create mode 100644 roles/apache/tasks/main.yaml create mode 100644 roles/dokuwiki/vars/main.yml create mode 100644 roles/roundcube/vars/main.yml create mode 100644 roles/sympa/vars/main.yml diff --git a/roles/apache/defaults/main.yml b/roles/apache/defaults/main.yml new file mode 100644 index 0000000..c8c6b89 --- /dev/null +++ b/roles/apache/defaults/main.yml @@ -0,0 +1,2 @@ +--- + php: false diff --git a/roles/apache/tasks/main.yaml b/roles/apache/tasks/main.yaml new file mode 100644 index 0000000..c6dc758 --- /dev/null +++ b/roles/apache/tasks/main.yaml @@ -0,0 +1,16 @@ +--- +- include: service.yaml + vars: + service_name: apache2 + service_packages: + - apache2 +- name: validate apache2 configuration + command: nginx -t -c /etc/nginx/nginx.conf + changed_when: False + +- name: enable apache configuration + file: + src: "/etc/apache2/sites-available/{{ config_name }}" + dest: "/etc/apache2/sites-enabled/{{ config_name }}" + state: link + notify: restart apache2 diff --git a/roles/dokuwiki/meta/main.yaml b/roles/dokuwiki/meta/main.yaml index ced5045..8b662c9 100644 --- a/roles/dokuwiki/meta/main.yaml +++ b/roles/dokuwiki/meta/main.yaml @@ -1,4 +1,3 @@ --- dependencies: - role: nginx - config_name: docuwiki.conf diff --git a/roles/dokuwiki/vars/main.yml b/roles/dokuwiki/vars/main.yml new file mode 100644 index 0000000..a600fe9 --- /dev/null +++ b/roles/dokuwiki/vars/main.yml @@ -0,0 +1 @@ +config_name: docuwiki.conf diff --git a/roles/roundcube/meta/main.yaml b/roles/roundcube/meta/main.yaml index 854f8e8..8b662c9 100644 --- a/roles/roundcube/meta/main.yaml +++ b/roles/roundcube/meta/main.yaml @@ -1,4 +1,3 @@ --- dependencies: - role: nginx - config_name: roundcube.conf diff --git a/roles/roundcube/tasks/main.yaml b/roles/roundcube/tasks/main.yaml index 2ea981b..16c0225 100644 --- a/roles/roundcube/tasks/main.yaml +++ b/roles/roundcube/tasks/main.yaml @@ -10,14 +10,10 @@ - roundcube-sqlite3 - roundcube - roundcube-plugins - - name: add nginx config for roundcube template: - dest=/etc/nginx/sites-available/roundcube.conf - src=roundcube_config.j2 - owner=root - group=root - mode=0700 + src: roundcube_nginx.j2 + dest: "/etc/nginx/sites-available/{{ config_name }}" notify: - enable nginx configuration - restart nginx diff --git a/roles/roundcube/vars/main.yml b/roles/roundcube/vars/main.yml new file mode 100644 index 0000000..99a5b37 --- /dev/null +++ b/roles/roundcube/vars/main.yml @@ -0,0 +1 @@ +config_name: roundcube.conf diff --git a/roles/sympa/meta/main.yaml b/roles/sympa/meta/main.yaml index a8b917c..8b662c9 100644 --- a/roles/sympa/meta/main.yaml +++ b/roles/sympa/meta/main.yaml @@ -1,4 +1,3 @@ --- dependencies: - role: nginx - config_name: sympa.conf diff --git a/roles/sympa/tasks/main.yaml b/roles/sympa/tasks/main.yaml index 6eab77b..dd02096 100644 --- a/roles/sympa/tasks/main.yaml +++ b/roles/sympa/tasks/main.yaml @@ -3,13 +3,13 @@ vars: service_name: nginx service_packages: - - nginx + - nginx - name: install sympa and associated packages apt: name={{ item }} state=latest with_items: - - sympa - - wwsympa - - fcgiwrap + - sympa + - wwsympa + - fcgiwrap - name: add nginx config for sympa template: src: sympa_nginx.j2 @@ -17,6 +17,3 @@ notify: - enable nginx configuration - restart nginx - notify: - - enable nginx configuration - - restart nginx diff --git a/roles/sympa/vars/main.yml b/roles/sympa/vars/main.yml new file mode 100644 index 0000000..aeeb603 --- /dev/null +++ b/roles/sympa/vars/main.yml @@ -0,0 +1 @@ +config_name: sympa.conf