Skip to content

Commit d05b4ae

Browse files
committed
fix proxy var logic
1 parent bd878f0 commit d05b4ae

File tree

2 files changed

+4
-3
lines changed
  • ansible/roles/proxy/tasks
  • environments/common/inventory/group_vars/all

2 files changed

+4
-3
lines changed

ansible/roles/proxy/tasks/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
- name: Validate http_proxy definition
22
ansible.builtin.assert:
3-
that: proxy_http_proxy != '' # this is default if squid not active
3+
that: proxy_http_proxy != ''
44
fail_msg: >-
55
Variable proxy_http_proxy cannot be the empty string for hosts in the
6-
proxy group. See environment/common/inventory/group_vars/all/proxy.yml.
6+
proxy group. See environments/common/inventory/group_vars/all/proxy.yml
7+
for convenience variables to set this.
78
- name: Define configuration in /etc/environment
89
tags: proxy
910
lineinfile:

environments/common/inventory/group_vars/all/proxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ proxy_remove: false
2020

2121
# full http proxy string - override if the above don't provide enough control:
2222
proxy_http_proxy: >-
23-
{% if groups['squid'] | length > 0 %}
23+
{% if proxy_http_address != '' %}
2424
http://
2525
{%- if proxy_basic_password -%}
2626
{{ proxy_basic_user }}:{{ proxy_basic_password }}@

0 commit comments

Comments
 (0)