diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-01-03 16:26:16 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-03 16:26:16 -0400 |
| commit | 3f5cc046915a9f64c31a6d48aaef5254f5eb7598 (patch) | |
| tree | 110bd5acac6adf0c08111efb9f9cd2dc07701b30 /config-joey.hs | |
| parent | 299d478dfd96037c660109c4f0519fd1cc37a887 (diff) | |
| parent | 93ee9e6966783368fa41fb75c7e287bee04f9c16 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 47 |
1 files changed, 42 insertions, 5 deletions
diff --git a/config-joey.hs b/config-joey.hs index df6e40dc..d18b4a7b 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -46,6 +46,8 @@ hosts = -- (o) ` [ darkstar , gnu , clam + , mayfly + , oyster , orca , honeybee , kite @@ -118,6 +120,8 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64" ] & Apt.unattendedUpgrades & Network.ipv6to4 + & Systemd.persistentJournal + & Journald.systemMaxUse "500MiB" & Tor.isRelay & Tor.named "kite1" @@ -134,14 +138,44 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64" & JoeySites.scrollBox & alias "scroll.joeyh.name" & alias "us.scroll.joeyh.name" + +mayfly :: Host +mayfly = standardSystem "mayfly.kitenet.net" (Stable "jessie") "amd64" + [ "Scratch VM. Contents can change at any time!" ] + & ipv4 "104.167.118.15" + + & CloudAtCost.decruft + & Apt.unattendedUpgrades + & Network.ipv6to4 + & Systemd.persistentJournal + & Journald.systemMaxUse "500MiB" - -- ssh on some extra ports to deal with horrible networks - -- while travelling - & alias "travelling.kitenet.net" - ! Ssh.listenPort 80 - ! Ssh.listenPort 443 + & Tor.isRelay + & Tor.named "kite3" + & Tor.bandwidthRate (Tor.PerMonth "400 GB") +oyster :: Host +oyster = standardSystem "oyster.kitenet.net" Unstable "amd64" + [ "Unreliable server. Anything here may be lost at any time!" ] + & ipv4 "104.167.117.109" + + & CloudAtCost.decruft + & Ssh.hostKeys hostContext + [ (SshEcdsa, "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP0ws/IxQegVU0RhqnIm5A/vRSPTO70wD4o2Bd1jL970dTetNyXzvWGe1spEbLjIYSLIO7WvOBSE5RhplBKFMUU=") + ] + & Apt.unattendedUpgrades + & Network.ipv6to4 & Systemd.persistentJournal + & Journald.systemMaxUse "500MiB" + + & Tor.isRelay + & Tor.named "kite2" + & Tor.bandwidthRate (Tor.PerMonth "400 GB") + + -- Nothing is using http port 80, so listen on + -- that port for ssh, for traveling on bad networks that + -- block 22. + & Ssh.listenPort 80 orca :: Host orca = standardSystem "orca.kitenet.net" Unstable "amd64" @@ -184,6 +218,9 @@ honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf" -- ipv6 used for remote access thru firewalls & Apt.serviceInstalledRunning "aiccu" & ipv6 "2001:4830:1600:187::2" + -- restart to deal with failure to connect, tunnel issues, etc + & Cron.job "aiccu restart daily" Cron.Daily (User "root") "/" + "service aiccu stop; service aiccu start" -- In case compiler needs more than available ram & Apt.serviceInstalledRunning "swapspace" |