summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-11-17 21:37:22 -0400
committerJoey Hess2017-11-17 21:37:22 -0400
commit8afed0bae31d5f04b96764cdd6a636ef9b57dd52 (patch)
tree1a613348c1aab75cc9ee74597a31efae7584b90b
parentd02b5bcc05f18f28379832d9d87bfd3d972aac86 (diff)
propellor spin
-rw-r--r--joeyconfig.hs1
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs3
2 files changed, 3 insertions, 1 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index daa31bc3..18ccbe73 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -105,7 +105,6 @@ darkstar = host "darkstar.kitenet.net" $ props
`setSize` MegaBytes 200
, partition EXT4
`mountedAt` "/"
- `setSize` MegaBytes 8192
]
gnu :: Host
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index dc091f9d..81705e64 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -922,6 +922,9 @@ homePowerMonitor user ctx sshkey = propertyList "home power monitor" $ props
& Cron.niceJob "homepower upload"
(Cron.Times "1 * * * *") user d rsynccommand
`requires` Ssh.userKeyAt (Just sshkeyfile) user ctx sshkey
+ `requires` File.ownerGroup (takeDirectory sshkeyfile)
+ user (userGroup user)
+ `requires` File.dirExists (takeDirectory sshkeyfile)
where
d = "/var/www/html/homepower"
sshkeyfile = d </> ".ssh/key"