diff options
| author | Félix Sipma <felix.sipma@no-log.org> | 2015-11-20 15:15:39 +0100 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-20 11:05:16 -0400 |
| commit | 1d38d3d3a17ac0c89d172291e879b91f32f2d9e1 (patch) | |
| tree | b52e973d082739bb378b3e717ac5539bc0678e4a /src | |
| parent | 04ca71e8c8f4ce66c697395a735fa5fa906f1b2f (diff) | |
DebianMirror: debmirror --host argument should be a hostname, not an url
(cherry picked from commit f0e374b4a43db750868f1ca4ccc465cee5691748)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/DebianMirror.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/DebianMirror.hs b/src/Propellor/Property/DebianMirror.hs index 6f1ff7b2..bdcade96 100644 --- a/src/Propellor/Property/DebianMirror.hs +++ b/src/Propellor/Property/DebianMirror.hs @@ -27,8 +27,8 @@ showPriority Standard = "standard" showPriority Optional = "optional" showPriority Extra = "extra" -mirror :: Apt.Url -> FilePath -> [DebianSuite] -> [Architecture] -> [Apt.Section] -> Bool -> [DebianPriority] -> Cron.Times -> Property NoInfo -mirror url dir suites archs sections source priorities crontimes = propertyList +mirror :: HostName -> FilePath -> [DebianSuite] -> [Architecture] -> [Apt.Section] -> Bool -> [DebianPriority] -> Cron.Times -> Property NoInfo +mirror hn dir suites archs sections source priorities crontimes = propertyList ("Debian mirror " ++ dir) [ Apt.installed ["debmirror"] , User.accountFor (User "debmirror") @@ -53,11 +53,11 @@ mirror url dir suites archs sections source priorities crontimes = propertyList ++ (if source then [] else ["--nosource"]) ++ - [ "--host", url + [ "--host", hn , "--method", "http" , "--keyring", "/usr/share/keyrings/debian-archive-keyring.gpg" , dir ] mirrorCdn :: FilePath -> [DebianSuite] -> [Architecture] -> [Apt.Section] -> Bool -> [DebianPriority] -> Cron.Times -> Property NoInfo -mirrorCdn = mirror "http://httpredir.debian.org/debian" +mirrorCdn = mirror "httpredir.debian.org" |