diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-10-15 15:25:18 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-15 15:25:18 -0400 |
| commit | 9e8f59c9c62a5b2bd8ff3441ebb6143e7a5a95f6 (patch) | |
| tree | a8228f83eca8f569ef55c3a7fa0471be366ff0cf | |
| parent | e695cfc3bbeee0f5126e70ac4a5a689872069c0e (diff) | |
| parent | a6313f639207f01b26009aa6ccfe8a9dab307510 (diff) | |
Merge branch 'joeyconfig'
| l--------- | config.hs | 2 | ||||
| -rw-r--r-- | privdata/relocate | 1 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1 +1 @@ -config-simple.hs
\ No newline at end of file +joeyconfig.hs
\ No newline at end of file diff --git a/privdata/relocate b/privdata/relocate new file mode 100644 index 00000000..271692d8 --- /dev/null +++ b/privdata/relocate @@ -0,0 +1 @@ +.joeyconfig diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 3076cbfd..7812c855 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -912,7 +912,7 @@ alarmClock oncalendar (User user) command = combineProperties "goodmorning timer homePowerMonitor :: IsContext c => User -> c -> (SshKeyType, Ssh.PubKeyText) -> Property (HasInfo + DebianLike) homePowerMonitor user ctx sshkey = propertyList "home power monitor" $ props & Apache.installed - & Apt.installed ["python2", "python-pymodbus"] + & Apt.installed ["python", "python-pymodbus"] & File.ownerGroup "/var/www/html" user (userGroup user) & Git.cloned user "git://git.kitenet.net/joey/homepower" d Nothing `onChange` buildpoller |