system.repo: Fix conditions order for Debian proxy
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ linux/system/repo.sls | 55 ++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 47 insertions(+), 8 deletions(-)
diff --git a/linux/system/repo.sls b/linux/system/repo.sls
-index e098a43..c36b3bf 100644
+index 9664129..d9f567e 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
-@@ -5,9 +5,16 @@ linux_repo_prereq_pkgs:
- pkg.installed:
+@@ -7,18 +7,27 @@ linux_repo_prereq_pkgs:
- pkgs: {{ system.pkgs }}
+ {%- endif %}
+ {%- set proxies = {'system': {}, 'repo': {}} %}
+
# global proxy setup
-- {%- if system.proxy.get('pkg', {}).get('enabled', False) %}
-- {%- if grains.os_family == 'Debian' %}
-+ {%- if grains.os_family == 'Debian' %}
+ {%- if grains.os_family == 'Debian' %}
+
-+ {%- if system.proxy.get('pkg', {}).get('enabled', False) %}
+ {%- if system.proxy.get('pkg', {}).get('enabled', False) %}
+
+ {%- do proxies.system.update({'https': system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), true)}) %}
+ {%- do proxies.system.update({'http': system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), true)}) %}
+ {%- do proxies.system.update({'ftp': system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), true)}) %}
-
++
/etc/apt/apt.conf.d/99proxies-salt:
file.managed:
-@@ -15,16 +22,14 @@ linux_repo_prereq_pkgs:
+ - template: jinja
- source: salt://linux/files/apt.conf.d_proxies
- defaults:
external_host: False
{%- else %}
/etc/apt/apt.conf.d/99proxies-salt:
file.absent
- {%- endif %}
-- {%- endif %}
--
-- {% set default_repos = {} %}
-
- {%- if system.purge_repos|default(False) %}
- purge_sources_list_d_repos:
-@@ -33,6 +38,9 @@ purge_sources_list_d_repos:
- - clean: True
- {%- endif %}
-
-+ {%- endif %}
-+
-+ {% set default_repos = {} %}
- {%- for name, repo in system.repo.items() %}
- {%- set name=repo.get('name', name) %}
- {%- if grains.os_family == 'Debian' %}
-@@ -40,16 +48,20 @@ purge_sources_list_d_repos:
+@@ -43,16 +52,20 @@ purge_sources_list_d_repos:
# per repository proxy setup
{%- if repo.get('proxy', {}).get('enabled', False) %}
{%- set external_host = repo.proxy.get('host', None) or repo.source.split('/')[2] %}
/etc/apt/apt.conf.d/99proxies-salt-{{ name }}:
file.absent
{%- endif %}
-@@ -101,6 +113,13 @@ linux_repo_{{ name }}_key:
+@@ -104,6 +117,13 @@ linux_repo_{{ name }}_key:
{% else %}
- pkgrepo: linux_repo_{{ name }}
{% endif %}
{%- endif %}
{%- if repo.get('default', False) %}
-@@ -108,6 +127,9 @@ linux_repo_{{ name }}_key:
+@@ -111,6 +131,9 @@ linux_repo_{{ name }}_key:
{%- else %}
{%- if repo.get('enabled', True) %}
+ repo.key_id is defined and repo.key_server is defined ) %}
linux_repo_{{ name }}:
pkgrepo.managed:
- {%- if repo.ppa is defined %}
-@@ -120,10 +142,10 @@ linux_repo_{{ name }}:
+ - refresh_db: False
+@@ -126,10 +149,10 @@ linux_repo_{{ name }}:
{%- endif %}
- file: /etc/apt/sources.list.d/{{ name }}.list
- - clean_file: {{ repo.clean|default(True) }}
+ - clean_file: {{ repo.get('clean_file', True) }}
- {%- if repo.key_id is defined %}
+ {%- if not use_proxy and repo.key_id is defined %}
- keyid: {{ repo.key_id }}
- keyserver: {{ repo.key_server }}
{%- endif %}
{%- if repo.key_url is defined and (grains['saltversioninfo'] >= [2017, 7] or repo.key_url.startswith('salt://')) %}
-@@ -145,6 +167,22 @@ linux_repo_{{ name }}:
+@@ -143,6 +166,22 @@ linux_repo_{{ name }}:
- file: purge_sources_list_d_repos
{%- endif %}
{%- endif %}
+ {%- endif %}
+ {#- repo.enabled is false #}
{%- else %}
- linux_repo_{{ name }}_absent:
+ linux_repo_{{ name }}:
pkgrepo.absent: