summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/JoeySites.hs
diff options
context:
space:
mode:
authorJoey Hess2017-12-30 13:25:06 -0400
committerJoey Hess2017-12-30 13:25:06 -0400
commit26821b8a3467d665fd670550356e14386aaa83c4 (patch)
tree03eadb93d12c6194e988650bdfad9bf7346c942a /src/Propellor/Property/SiteSpecific/JoeySites.hs
parent5ff410e1e8ed9c62f9f27dc1fcc416234f14a2d5 (diff)
parentb9f9692a7d847c8d71f42754b0a9775416ab4cf3 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 466b6b10..9385493c 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -906,8 +906,8 @@ alarmClock oncalendar (User user) command = combineProperties "goodmorning timer
("Login", "LidSwitchIgnoreInhibited", "no")
-- My home power monitor.
-homePowerMonitor :: IsContext c => User -> c -> (SshKeyType, Ssh.PubKeyText) -> Property (HasInfo + DebianLike)
-homePowerMonitor user ctx sshkey = propertyList "home power monitor" $ props
+homePowerMonitor :: IsContext c => User -> [Host] -> c -> (SshKeyType, Ssh.PubKeyText) -> Property (HasInfo + DebianLike)
+homePowerMonitor user hosts ctx sshkey = propertyList "home power monitor" $ props
& Apache.installed
& Apt.installed ["python", "python-pymodbus", "rrdtool", "rsync"]
& File.ownerGroup "/var/www/html" user (userGroup user)
@@ -923,6 +923,7 @@ homePowerMonitor user ctx sshkey = propertyList "home power monitor" $ props
`requires` File.ownerGroup (takeDirectory sshkeyfile)
user (userGroup user)
`requires` File.dirExists (takeDirectory sshkeyfile)
+ `requires` Ssh.knownHost hosts "kitenet.net" user
where
d = "/var/www/html/homepower"
sshkeyfile = d </> ".ssh/key"
@@ -1057,7 +1058,7 @@ laptopSoftware = Apt.installed
, "vim-syntastic", "vim-fugitive"
, "adb", "gthumb"
, "w3m", "sm", "weechat"
- , "borgbackup"
+ , "borgbackup", "wipe"
]
`requires` baseSoftware
`requires` devSoftware