summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/DotDir.hs3
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs
index 749fcd9f..6c2feb83 100644
--- a/src/Propellor/DotDir.hs
+++ b/src/Propellor/DotDir.hs
@@ -446,9 +446,6 @@ updateUpstreamMaster newref = do
)
Nothing -> return mref
--- And, if there's a remote named "upstream"
--- that does not point at the distrepo, the user must have set that up
--- and is not using the distrepo, so do nothing.
warnoutofdate :: Bool -> IO ()
warnoutofdate havebranch = warningMessage $ unlines
[ "** Your ~/.propellor/ is out of date.."
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 4d8ee240..9d7423d7 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -976,7 +976,7 @@ homePowerMonitor user hosts ctx sshkey = propertyList "home power monitor" $ pro
]
-- Any changes to the rsync command will need my .authorized_keys
-- rsync server command to be updated too.
- rsynccommand = "rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/recent/ joey@kitenet.net:/srv/web/homepower.joeyh.name/rrds/recent/"
+ rsynccommand = "rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/ joey@kitenet.net:/srv/web/homepower.joeyh.name/rrds/"
-- My home router, running hostapd and dnsmasq for wlan0,
-- with eth0 connected to a satellite modem, and a fallback ppp connection.