summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/OS.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-24 00:51:36 -0400
committerJoey Hess2014-11-24 00:51:36 -0400
commit8d1814a8847f0e498be39a31863e9dd6ffe7e4aa (patch)
tree5817e35badeff0554d2eba369a79d680adc5b381 /src/Propellor/Property/OS.hs
parent9ac4e94625c77f6d799f9fd6f2ba0e6bbb133697 (diff)
move property to ssh module
Diffstat (limited to 'src/Propellor/Property/OS.hs')
-rw-r--r--src/Propellor/Property/OS.hs10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index ed9a31e1..3290f3ba 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -13,10 +13,9 @@ import Propellor
import qualified Propellor.Property.Chroot as Chroot
import qualified Propellor.Property.Debootstrap as Debootstrap
import qualified Propellor.Property.File as File
+import qualified Propellor.Property.Ssh as Ssh
import Utility.FileMode
-import Utility.PosixFiles
-
-- | Replaces whatever OS was installed before with a clean installation
-- of the OS that the Host is configured to have.
--
@@ -95,15 +94,10 @@ rootSshAuthorized :: Property
rootSshAuthorized = check (doesDirectoryExist oldloc) $
property (newloc ++ " copied from old OS") $ do
ks <- liftIO $ lines <$> readFile oldloc
- ensureProperty $
- newloc `File.containsLines` ks
- `requires` File.dirExists (takeDirectory newloc)
- `onChange` File.mode newloc mode
+ ensureProperties (map (Ssh.authorizedKey "root") ks)
where
newloc = "/root/.ssh/authorized_keys"
oldloc = oldOsDir ++ newloc
- -- ssh requires the file mode be locked down
- mode = combineModes [ownerWriteMode, ownerReadMode]
-- Installs an appropriate kernel from the OS distribution.
kernelInstalled :: Property