diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-02-01 12:27:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-01 12:27:26 -0400 |
| commit | e80ac83657169b973fd8fe25deb42f458da475b9 (patch) | |
| tree | 885f8e981c9ff941ab959cdcc804a90c53c38509 /src/Propellor/Property/SiteSpecific | |
| parent | 81d288629d82e1fa81bb004a74ef9480b3a544a0 (diff) | |
| parent | 5cd0291025b92ee2e408abd73b2cb4225f22465d (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index f6437c64..b48f613b 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -948,10 +948,9 @@ homePowerMonitor user hosts ctx sshkey = propertyList "home power monitor" $ pro , "[Install]" , "WantedBy=multi-user.target" ] - -- Only upload when eth0 is up; eg the satellite internet is up. -- Any changes to the rsync command will need my .authorized_keys -- rsync server command to be updated too. - rsynccommand = "if ip route | grep '^default' | grep -q eth0; then rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/recent/ joey@kitenet.net:/srv/web/homepower.joeyh.name/rrds/recent/; fi" + rsynccommand = "rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/recent/ joey@kitenet.net:/srv/web/homepower.joeyh.name/rrds/recent/" -- My home router, running hostapd and dnsmasq for wlan0, -- with eth0 connected to a satellite modem, and a fallback ppp connection. @@ -1078,5 +1077,4 @@ devSoftware = Apt.installed , "hothasktags", "hdevtools", "hlint" , "gdb", "dpkg-repack", "lintian" , "pristine-tar", "github-backup" - , "kvm" ] |