Selaa lähdekoodia

Updated nginx_vhost_path to move /*

Mark Wilde 10 vuotta sitten
vanhempi
commit
3e8df12f7a
3 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 1 1
      templates/nginx.conf.j2
  2. 1 1
      vars/Debian.yml
  3. 1 1
      vars/RedHat.yml

+ 1 - 1
templates/nginx.conf.j2

@@ -51,6 +51,6 @@ http {
     include {{ nginx_conf_path }};
 {% endif %}
 {% if nginx_vhost_path is defined %}
-    include {{ nginx_vhost_path }};
+    include {{ nginx_vhost_path }}/*;
 {% endif %}
 }

+ 1 - 1
vars/Debian.yml

@@ -1,5 +1,5 @@
 ---
 nginx_conf_path: /etc/nginx/conf.d/*.conf
-nginx_vhost_path: /etc/nginx/sites-enabled/*
+nginx_vhost_path: /etc/nginx/sites-enabled
 nginx_default_vhost_path: /etc/nginx/sites-enabled/default
 __nginx_user: "www-data"

+ 1 - 1
vars/RedHat.yml

@@ -1,4 +1,4 @@
 ---
-nginx_vhost_path: /etc/nginx/conf.d/*
+nginx_vhost_path: /etc/nginx/conf.d
 nginx_default_vhost_path: /etc/nginx/conf.d/default.conf
 __nginx_user: "nginx"