diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-01-17 13:04:30 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-01-17 13:04:30 -0400 |
| commit | 38687b0350df5ceff4c1ce2b2ff9dd245c5f4b4e (patch) | |
| tree | 6f8575a48c05c0657a7443bd470fc58897ce0bcd | |
| parent | 1d4b8ff31729c6d0e40ec1e3b429211af661e6a1 (diff) | |
| parent | c18ca91690398c97ce27018cb5ac0b63f63356c4 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | joeyconfig.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index 0627147b..9894a155 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -115,7 +115,7 @@ clam :: Host clam = host "clam.kitenet.net" $ props & standardSystem Unstable X86_64 ["Unreliable server. Anything here may be lost at any time!" ] - & ipv4 "45.62.211.6" + & ipv4 "45.62.211.94" & CloudAtCost.decruft & Ssh.hostKeys hostContext diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 4313fbf3..f6437c64 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -998,7 +998,7 @@ homeRouter = propertyList "home router" $ props & Apt.installed ["ppp"] `before` File.hasContent "/etc/ppp/peers/provider" [ "user \"joeyh@arczip.com\"" - , "connect \"/usr/sbin/chat -v -f /etc/chatscripts/pap -T 9734111\"" + , "connect \"/usr/sbin/chat -v -f /etc/chatscripts/pap -T 3825441\"" , "/dev/ttyACM0" , "115200" , "noipdefault" @@ -1054,7 +1054,8 @@ laptopSoftware = Apt.installed , "apache2", "ikiwiki", "libhighlight-perl" , "pal" , "yeahconsole", "xkbset", "xinput" - , "assword", "pumpa", "vorbis-tools" + , "assword", "pumpa" + , "vorbis-tools", "audacity" , "xul-ext-ublock-origin", "xul-ext-pdf.js", "xul-ext-status4evar" , "vim-syntastic", "vim-fugitive" , "adb", "gthumb" |