Merge branch 'itg' into msciciel

2015-08-19 17:02:45 +02:00 · 2015-08-19 17:02:45 +02:00 · 445012023b
commit 445012023b
parent b3113d53ff 1c1d338359
1 changed files with 6 additions and 1 deletions
--- a/nginx/ng/install.sls
+++ b/nginx/ng/install.sls
@ -51,7 +51,12 @@ nginx_zypp_repo:

 {% if salt['grains.get']('os_family') == 'RedHat' %}
 nginx_yum_repo:
-  pkgrepo.managed:
+  pkgrepo:
+    {%- if nginx.install_from_repo %}
+    - managed
+    {%- else %}
+    - absent
+    {%- endif %}
    - name: nginx
    - humanname: nginx repo
    {%- if salt['grains.get']('os') == 'CentOS' %}