summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-10-20 21:00:08 -0400
committerJoey Hess2018-10-20 21:00:08 -0400
commit7d5bebac0110ee4245cff8f1a02a620b9a74bde5 (patch)
tree55d555a939f44faf7a978d40cd003dfd52dc5b5c
parentbe447e4c9380055dd43b1cfbde0545f790cf5b27 (diff)
parentfdb0a1872300fdd35e6dc8dab10104c17b320cb8 (diff)
Merge branch 'joeyconfig'
-rw-r--r--joeyconfig.hs14
1 files changed, 9 insertions, 5 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 911df553..20c53ff7 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -52,6 +52,7 @@ hosts = -- (o) `
, honeybee
, kite
, beaver
+ , sow
, mouse
, peregrine
, pell
@@ -185,7 +186,6 @@ honeybee = host "honeybee.kitenet.net" $ props
-- Workaround for https://bugs.debian.org/844056
`requires` File.hasPrivContent "/lib/firmware/brcm/brcmfmac43362-sdio.txt" anyContext
`requires` File.dirExists "/lib/firmware/brcm"
- & "/etc/default/rcS" `File.containsLine` "FSCKFIX=yes"
& Apt.serviceInstalledRunning "ntp" -- no hardware clock
& bootstrappedFrom GitRepoOutsideChroot
& Ssh.hostKeys hostContext
@@ -322,6 +322,7 @@ kite = host "kite.kitenet.net" $ props
[ (RelDomain "mouse-onion", CNAME $ AbsDomain "htieo6yu2qtcn2j3.onion")
, (RelDomain "beaver-onion", CNAME $ AbsDomain "tl4xsvaxryjylgxs.onion")
, (RelDomain "peregrine-onion", CNAME $ AbsDomain "ahw47zqw6qszoufl.onion")
+ , (RelDomain "sow-onion", CNAME $ AbsDomain "urt4g2tq32qktgtp.onion")
]
& myDnsPrimary "joeyh.name" []
& myDnsPrimary "ikiwiki.info" []
@@ -350,14 +351,17 @@ kite = host "kite.kitenet.net" $ props
beaver :: Host
beaver = host "beaver.kitenet.net" $ props
- & ipv6 "2001:4830:1600:195::2"
& Apt.installed ["ssh"]
& Ssh.hostPubKey SshDsa "ssh-dss AAAAB3NzaC1kc3MAAACBAIrLX260fY0Jjj/p0syNhX8OyR8hcr6feDPGOj87bMad0k/w/taDSOzpXe0Wet7rvUTbxUjH+Q5wPd4R9zkaSDiR/tCb45OdG6JsaIkmqncwe8yrU+pqSRCxttwbcFe+UU+4AAcinjVedZjVRDj2rRaFPc9BXkPt7ffk8GwEJ31/AAAAFQCG/gOjObsr86vvldUZHCteaJttNQAAAIB5nomvcqOk/TD07DLaWKyG7gAcW5WnfY3WtnvLRAFk09aq1EuiJ6Yba99Zkb+bsxXv89FWjWDg/Z3Psa22JMyi0HEDVsOevy/1sEQ96AGH5ijLzFInfXAM7gaJKXASD7hPbVdjySbgRCdwu0dzmQWHtH+8i1CMVmA2/a5Y/wtlJAAAAIAUZj2US2D378jBwyX1Py7e4sJfea3WSGYZjn4DLlsLGsB88POuh32aOChd1yzF6r6C2sdoPBHQcWBgNGXcx4gF0B5UmyVHg3lIX2NVSG1ZmfuLNJs9iKNu4cHXUmqBbwFYQJBvB69EEtrOw4jSbiTKwHFmqdA/mw1VsMB+khUaVw=="
& Tor.installed
& Tor.hiddenServiceAvailable "ssh" (Port 22)
- & Apt.serviceInstalledRunning "anacron"
- & Cron.niceJob "system disk backed up" Cron.Weekly (User "root") "/"
- "rsync -a -x / /home/joey/lib/backup/beaver.kitenet.net/"
+
+sow :: Host
+sow = host "sow.kitenet.net" $ props
+ & Apt.installed ["ssh"]
+ & Ssh.hostPubKey SshDsa "ssh-dss AAAAB3NzaC1kc3MAAACBAIrLX260fY0Jjj/p0syNhX8OyR8hcr6feDPGOj87bMad0k/w/taDSOzpXe0Wet7rvUTbxUjH+Q5wPd4R9zkaSDiR/tCb45OdG6JsaIkmqncwe8yrU+pqSRCxttwbcFe+UU+4AAcinjVedZjVRDj2rRaFPc9BXkPt7ffk8GwEJ31/AAAAFQCG/gOjObsr86vvldUZHCteaJttNQAAAIB5nomvcqOk/TD07DLaWKyG7gAcW5WnfY3WtnvLRAFk09aq1EuiJ6Yba99Zkb+bsxXv89FWjWDg/Z3Psa22JMyi0HEDVsOevy/1sEQ96AGH5ijLzFInfXAM7gaJKXASD7hPbVdjySbgRCdwu0dzmQWHtH+8i1CMVmA2/a5Y/wtlJAAAAIAUZj2US2D378jBwyX1Py7e4sJfea3WSGYZjn4DLlsLGsB88POuh32aOChd1yzF6r6C2sdoPBHQcWBgNGXcx4gF0B5UmyVHg3lIX2NVSG1ZmfuLNJs9iKNu4cHXUmqBbwFYQJBvB69EEtrOw4jSbiTKwHFmqdA/mw1VsMB+khUaVw=="
+ & Tor.installed
+ & Tor.hiddenServiceAvailable "ssh" (Port 22)
mouse :: Host
mouse = host "mouse.kitenet.net" $ props