valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add apt key proxy support (#34541)

Browse Source 
* add missing proxy_ config options and defaults

* add support for http proxy for apt-key actions

* Fixes #34360.

* fix lint

* adjust defaults that are strings to empty strings

* change proxy_port to a default of 0 for config validator
This commit is contained in:
mrproper 2016-07-09 01:01:39 +10:00 committed by Nicole Thomas
parent 3e91f3299d
commit 294e76d671
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/config/__init__.py
View File

@ -1075,7 +1075,7 @@ DEFAULT_MINION_OPTS = {
'proxy_host': '',
'proxy_username': '',
'proxy_password': '',
'proxy_port': None,
'proxy_port': 0,
}
DEFAULT_MASTER_OPTS = {