Merge pull request #26967 from TheBigBear/patch-4

new URL for windows salt downloads
This commit is contained in:
Justin Findlay 2015-09-10 14:51:33 -06:00
commit efaedb8aea

View file

@ -675,7 +675,7 @@ def bootstrap_psexec(hosts='', master=None, version=None, arch='win32',
installer_url
URL of minion installer executable. Defaults to the latest version from
http://docs.saltstack.com/downloads
https://repo.saltstack.com/windows/
username
Optional user name for login on remote computer.
@ -694,7 +694,7 @@ def bootstrap_psexec(hosts='', master=None, version=None, arch='win32',
'''
if not installer_url:
base_url = 'http://docs.saltstack.com/downloads/'
base_url = 'https://repo.saltstack.com/windows/'
source = _urlopen(base_url).read()
salty_rx = re.compile('>(Salt-Minion-(.+?)-(.+)-Setup.exe)</a></td><td align="right">(.*?)\\s*<')
source_list = sorted([[path, ver, plat, time.strptime(date, "%d-%b-%Y %H:%M")]