summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs3
2 files changed, 3 insertions, 2 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 08a01e09..7581b3ec 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -183,8 +183,6 @@ honeybee = host "honeybee.kitenet.net" $ props
`setSize` MegaBytes 8000
)
& JoeySites.cubieTruckOneWire
- & Apt.installed ["i2c-tools"]
- & User "joey" `hasGroup` Group "i2c"
& Apt.installed ["firmware-brcm80211"]
-- Workaround for https://bugs.debian.org/844056
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 7845e226..07a595d7 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -932,6 +932,9 @@ homePower user hosts ctx sshkey = propertyList "home power" $ props
& User.hasGroup user (Group "dialout")
& Group.exists (Group "gpio") Nothing
& User.hasGroup user (Group "gpio")
+ & Apt.installed ["i2c-tools"]
+ & User.hasGroup user (Group "i2c")
+ & "/etc/modules-load.d/homepower.conf" `File.hasContent` ["i2c-dev"]
& Cron.niceJob "homepower upload"
(Cron.Times "1 * * * *") user d rsynccommand
`requires` Ssh.userKeyAt (Just sshkeyfile) user ctx sshkey