summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2019-07-01 12:14:55 -0400
committerJoey Hess2019-07-01 12:14:55 -0400
commit9e372de7d5dda142a73aa8d14263136dfd6a9fe3 (patch)
tree0c9cf3a5eab205b55826e2505a0f0eedbdff653d /src/Propellor/Property
parent394267002a8e63e52035919e4b35ee43cc940019 (diff)
parentccb2c08c1537766338755e4bf97a7d15c2162ef3 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Git.hs2
-rw-r--r--src/Propellor/Property/Libvirt.hs2
-rw-r--r--src/Propellor/Property/Sbuild.hs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/Git.hs b/src/Propellor/Property/Git.hs
index e7dcb80c..a0ed4f02 100644
--- a/src/Propellor/Property/Git.hs
+++ b/src/Propellor/Property/Git.hs
@@ -110,7 +110,7 @@ pulled owner url dir mbranch = go
[ "cd " ++ shellEscape dir
, "git pull"
]
- `changesFile` (dir </> ".git" </> "FETCH_HEAD")
+ `changesFileContent` (dir </> ".git" </> "FETCH_HEAD")
isGitDir :: FilePath -> IO Bool
isGitDir dir = isNothing <$> catchMaybeIO (readProcess "git" ["rev-parse", "--resolve-git-dir", dir])
diff --git a/src/Propellor/Property/Libvirt.hs b/src/Propellor/Property/Libvirt.hs
index 4dad5f39..71f59d65 100644
--- a/src/Propellor/Property/Libvirt.hs
+++ b/src/Propellor/Property/Libvirt.hs
@@ -34,7 +34,7 @@ data DiskImageType = Raw -- TODO: | QCow2
-- | Install basic libvirt components
installed :: Property DebianLike
-installed = Apt.installed ["libvirt-clients", "virtinst"]
+installed = Apt.installed ["libvirt-clients", "virtinst", "libvirt-daemon", "libvirt-daemon-system"]
-- | Ensure that the default libvirt network is set to autostart, and start it.
--
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index 3de82af3..26e7ae8e 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -270,7 +270,7 @@ update = Apt.update `before` Apt.upgrade `before` Apt.autoRemove
-- | Ensure that an sbuild schroot uses the host's Apt proxy.
--
--- This property is standardly used when the host has 'Apt.useLocalCacher'.
+-- This property is typically used when the host has 'Apt.useLocalCacher'.
useHostProxy :: Host -> Property DebianLike
useHostProxy h = property' "use host's apt proxy" $ \w ->
-- Note that we can't look at getProxyInfo outside the property,