cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apt: stable-updates suite 

Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
This commit is contained in:
Félix Sipma 2014-11-11 22:37:39 +01:00 committed by Joey Hess
parent 499cebd3c7
commit 9d6a79bc23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Propellor/Property/Apt.hs
View File

@ -29,6 +29,10 @@ backportSuite :: DebianSuite -> Maybe String
backportSuite (Stable s) = Just (s ++ "-backports") backportSuite (Stable s) = Just (s ++ "-backports")
backportSuite _ = Nothing backportSuite _ = Nothing
stableUpdatesSuite :: DebianSuite -> Maybe String
stableUpdatesSuite (Stable s) = Just (s ++ "-updates")
stableUpdatesSuite _ = Nothing
debLine :: String -> Url -> [Section] -> Line debLine :: String -> Url -> [Section] -> Line
debLine suite mirror sections = unwords $ debLine suite mirror sections = unwords $
["deb", mirror, suite] ++ sections ["deb", mirror, suite] ++ sections
@ -74,9 +78,9 @@ securityUpdates suite
-- Since the CDN is sometimes unreliable, also adds backup lines using -- Since the CDN is sometimes unreliable, also adds backup lines using
-- kernel.org. -- kernel.org.
stdSourcesList :: Property stdSourcesList :: Property
stdSourcesList = withOS ("standard sources.list") $ \o -> stdSourcesList = withOS ("standard sources.list") $ \o ->
case o of case o of
(Just (System (Debian suite) _)) -> (Just (System (Debian suite) _)) ->
ensureProperty $ stdSourcesListFor suite ensureProperty $ stdSourcesListFor suite
_ -> error "os is not declared to be Debian" _ -> error "os is not declared to be Debian"
@ -135,7 +139,7 @@ installedBackport ps = trivial $ withOS desc $ \o -> case o of
Nothing -> error "cannot install backports; os not declared" Nothing -> error "cannot install backports; os not declared"
(Just (System (Debian suite) _)) -> case backportSuite suite of (Just (System (Debian suite) _)) -> case backportSuite suite of
Nothing -> notsupported o Nothing -> notsupported o
Just bs -> ensureProperty $ runApt $ Just bs -> ensureProperty $ runApt $
["install", "-t", bs, "-y"] ++ ps ["install", "-t", bs, "-y"] ++ ps
_ -> notsupported o _ -> notsupported o
where where
@ -218,7 +222,7 @@ unattendedUpgrades = RevertableProperty enable disable
v v
| enabled = "true" | enabled = "true"
| otherwise = "false" | otherwise = "false"
configure = withOS "unattended upgrades configured" $ \o -> configure = withOS "unattended upgrades configured" $ \o ->
case o of case o of
-- the package defaults to only upgrading stable -- the package defaults to only upgrading stable
@ -272,4 +276,4 @@ trustsKey k = RevertableProperty trust untrust
-- space. -- space.
cacheCleaned :: Property cacheCleaned :: Property
cacheCleaned = trivial $ cmdProperty "apt-get" ["clean"] cacheCleaned = trivial $ cmdProperty "apt-get" ["clean"]
`describe` "apt cache cleaned" `describe` "apt cache cleaned"