Browse Source

set config_names default

update_ca_key
Andrea Cimbalo 8 years ago
parent
commit
e1913297a9
4 changed files with 2 additions and 4 deletions
  1. +1
    -0
      roles/apache2/defaults/main.yml
  2. +0
    -2
      roles/apache2/tasks/main.yaml
  3. +1
    -0
      roles/nginx/defaults/main.yml
  4. +0
    -2
      roles/nginx/tasks/main.yaml

+ 1
- 0
roles/apache2/defaults/main.yml View File

@ -1,3 +1,4 @@
--- ---
php: false php: false
user_dir: false user_dir: false
config_names: []

+ 0
- 2
roles/apache2/tasks/main.yaml View File

@ -26,7 +26,6 @@
template: template:
src: ../../{{ parent_role_path }}/templates/{{ item }}.apache2.j2 src: ../../{{ parent_role_path }}/templates/{{ item }}.apache2.j2
dest: /etc/apache2/sites-available/{{ item }} dest: /etc/apache2/sites-available/{{ item }}
when: config_names is defined
with_items: "{{ config_names }}" with_items: "{{ config_names }}"
- name: enable apache2 configurations - name: enable apache2 configurations
@ -35,7 +34,6 @@
dest: "/etc/apache2/sites-enabled/{{ item }}" dest: "/etc/apache2/sites-enabled/{{ item }}"
state: link state: link
with_items: "{{ config_names }}" with_items: "{{ config_names }}"
when: config_names is defined
notify: restart apache2 notify: restart apache2
- block: - block:


+ 1
- 0
roles/nginx/defaults/main.yml View File

@ -1,3 +1,4 @@
--- ---
is_proxy: false is_proxy: false
php: false php: false
config_names: []

+ 0
- 2
roles/nginx/tasks/main.yaml View File

@ -36,7 +36,6 @@
src: "roles/{{ parent_role_path }}/templates/{{ item }}.conf.nginx.j2" src: "roles/{{ parent_role_path }}/templates/{{ item }}.conf.nginx.j2"
dest: /etc/nginx/sites-available/{{ item }}.conf dest: /etc/nginx/sites-available/{{ item }}.conf
with_items: "{{ config_names }}" with_items: "{{ config_names }}"
when: config_names is defined
- name: enable nginx configurations - name: enable nginx configurations
file: file:
@ -44,5 +43,4 @@
dest: "/etc/nginx/sites-enabled/{{ item }}.conf" dest: "/etc/nginx/sites-enabled/{{ item }}.conf"
state: link state: link
with_items: "{{ config_names }}" with_items: "{{ config_names }}"
when: config_names is defined
notify: restart nginx notify: restart nginx

Loading…
Cancel
Save