Update to 2022-02-09 17:00

This commit is contained in:
Daniel Berteaud
2022-02-09 17:00:06 +01:00
parent 00b3d728c8
commit 6f6d3b7382
9 changed files with 75 additions and 74 deletions

View File

@@ -1,12 +1,10 @@
#!/bin/bash
{% if system_proxy is defined and system_proxy != '' %}
export http_proxy={{ system_proxy }}
export https_proxy={{ system_proxy }}
export ftp_proxy={{ system_proxy }}
export HTTP_PROXY={{ system_proxy }}
export HTTPS_PROXY={{ system_proxy }}
export FTP_PROXY={{ system_proxy }}
{% for proto in system_proxy_proto %}
export {{ proto }}_proxy={{ system_proxy }}
export {{ proto | upper }}_PROXY={{ system_proxy }}
{% endfor %}
export no_proxy='{{ system_proxy_no_proxy | join(',') }}'
export NO_PROXY='{{ system_proxy_no_proxy | join(',') }}'
{% endif %}

View File

@@ -1,6 +1,6 @@
[Manager]
{% if system_proxy is defined and system_proxy != '' %}
DefaultEnvironment=http_proxy={{ system_proxy }} https_proxy={{ system_proxy }} ftp_proxy={{ system_proxy }} HTTP_PROXY={{ system_proxy }} HTTPS_PROXY={{ system_proxy }} FTP_PROXY={{ system_proxy }} no_proxy={{ system_proxy_no_proxy | join(',') }} NO_PROXY={{ system_proxy_no_proxy | join(',') }}
DefaultEnvironment={% for proto in system_proxy_proto %}{{ proto }}_proxy={{ system_proxy }} {{ proto | upper }}_PROXY={{ system_proxy }} {% endfor %}no_proxy={{ system_proxy_no_proxy | join(',') }} NO_PROXY={{ system_proxy_no_proxy | join(',') }}
{% else %}
# No proxy configured
{% endif %}