From 87c1fe982a391461d66efa99688ada9a0c808226 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 19 Apr 2014 22:22:23 -0400 Subject: propellor spin --- config-joey.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 5dd466ee..98e8f6b6 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -64,6 +64,9 @@ hosts = -- (o) ` -- I'd rather this were on diatom, but it needs unstable. & alias "kgb.kitenet.net" & JoeySites.kgbServer + + & alias "mumble.kitenet.net" + & JoeySites.mumbleServer hosts & alias "ns9.kitenet.net" & myDnsSecondary @@ -168,7 +171,7 @@ hosts = -- (o) ` , standardContainer "ancient-kitenet" Stable "amd64" & Docker.publish "1994:80" & Apt.serviceInstalledRunning "apache2" - & Git.cloned "root" "git://git.kitenet.net/kitewiki" "/var/www" + & Git.cloned "root" "git://kitenet-net.branchable.com/" "/var/www" (Just "remotes/origin/old-kitenet.net") -- git-annex autobuilder containers -- cgit v1.3-2-g0d8e From 3be3f3f6ef8bc69b145344dc2e28eab26af780c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Apr 2014 21:55:40 -0400 Subject: propellor spin --- Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- config-joey.hs | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs index 139e8dc6..fa8a4c6d 100644 --- a/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/Propellor/Property/SiteSpecific/JoeySites.hs @@ -111,7 +111,7 @@ mumbleServer hosts = combineProperties "mumble.debian.net" ] Obnam.OnlyClient `requires` Ssh.keyImported SshRsa "root" `requires` Ssh.knownHost hosts "turtle.kitenet.net" "root" - , cmdProperty "chown" ["-R", "mumble-server:mumble-server", "/var/lib/mumble-server"] + , trivial $ cmdProperty "chown" ["-R", "mumble-server:mumble-server", "/var/lib/mumble-server"] , Apt.serviceInstalledRunning "mumble-server" ] diff --git a/config-joey.hs b/config-joey.hs index 98e8f6b6..4962f72e 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -133,6 +133,22 @@ hosts = -- (o) ` & alias "ns2.kitenet.net" & myDnsSecondary + & Dns.primary hosts "joeyh.name" + (Dns.mkSOA "ns2.kitenet.net" 100) + [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") + , (RootDomain, NS $ AbsDomain "ns6.gandi.net") + , (RootDomain, NS $ AbsDomain "ns9.kitenet.net") + , (RootDomain, MX 0 $ AbsDomain "kitenet.net") + , (RootDomain, TXT "v=spf1 a mx ip4:80.68.85.49 ~all") + ] + & Dns.primary hosts "ikiwiki.info" + (Dns.mkSOA "ns2.kitenet.net" 100) + [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") + , (RootDomain, NS $ AbsDomain "ns6.gandi.net") + , (RootDomain, NS $ AbsDomain "ns9.kitenet.net") + , (RootDomain, MX 0 $ AbsDomain "kitenet.net") + , (RootDomain, TXT "v=spf1 a -all") + ] & Dns.primary hosts "olduse.net" (Dns.mkSOA "ns2.kitenet.net" 100) [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") @@ -301,4 +317,8 @@ monsters = -- but do want to track their public keys etc. & alias "olduse.net" & alias "www.olduse.net" & alias "git.olduse.net" + & alias "joeyh.name" + & alias "campaign.joeyh.name" + & alias "ikiwiki.info" + & alias "l10n.ikiwiki.info" ] -- cgit v1.3-2-g0d8e From cb219a9850e9053ee79e6d5de37bd975ecb2c485 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Apr 2014 22:21:55 -0400 Subject: propellor spin --- config-joey.hs | 68 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 28 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 4962f72e..41edcdb3 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -132,32 +132,13 @@ hosts = -- (o) ` & JoeySites.oldUseNetServer hosts & alias "ns2.kitenet.net" - & myDnsSecondary - & Dns.primary hosts "joeyh.name" - (Dns.mkSOA "ns2.kitenet.net" 100) - [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") - , (RootDomain, NS $ AbsDomain "ns6.gandi.net") - , (RootDomain, NS $ AbsDomain "ns9.kitenet.net") - , (RootDomain, MX 0 $ AbsDomain "kitenet.net") - , (RootDomain, TXT "v=spf1 a mx ip4:80.68.85.49 ~all") - ] - & Dns.primary hosts "ikiwiki.info" - (Dns.mkSOA "ns2.kitenet.net" 100) - [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") - , (RootDomain, NS $ AbsDomain "ns6.gandi.net") - , (RootDomain, NS $ AbsDomain "ns9.kitenet.net") - , (RootDomain, MX 0 $ AbsDomain "kitenet.net") - , (RootDomain, TXT "v=spf1 a -all") - ] - & Dns.primary hosts "olduse.net" - (Dns.mkSOA "ns2.kitenet.net" 100) - [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") - , (RootDomain, NS $ AbsDomain "ns6.gandi.net") - , (RootDomain, NS $ AbsDomain "ns9.kitenet.net") - , (RootDomain, MX 0 $ AbsDomain "kitenet.net") - , (RootDomain, TXT "v=spf1 a -all") - , (RelDomain "article", CNAME $ AbsDomain "virgil.koldfront.dk") - ] + & myDnsPrimary "kitenet.net" + [] + & myDnsPrimary "joeyh.name" [] + & myDnsPrimary "ikiwiki.info" [] + & myDnsPrimary "olduse.net" + [ (RelDomain "article", + CNAME $ AbsDomain "virgil.koldfront.dk") ] & Apt.installed ["ntop"] @@ -282,6 +263,17 @@ myDnsSecondary = propertyList "dns secondary for all my domains" $ map toProp wren = ["wren.kitenet.net"] branchable = ["branchable.com"] +-- Currently using diatom (ns2) and clam (ns9), with gandi supplimenting; +-- kite handles all mail. +myDnsPrimary :: Domain -> [(BindDomain, Record)] -> RevertableProperty +myDnsPrimary domain extras = Dns.primary hosts domain + (Dns.mkSOA "ns2.kitenet.net" 100) $ + [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") + , (RootDomain, NS $ AbsDomain "ns6.gandi.net") + , (RootDomain, NS $ AbsDomain "ns9.kitenet.net") + , (RootDomain, MX 0 $ AbsDomain "kitenet.net") + , (RootDomain, TXT "v=spf1 a ?all") + ] ++ extras -- o @@ -304,21 +296,41 @@ monsters = -- but do want to track their public keys etc. , host "turtle.kitenet.net" & ipv4 "67.223.19.96" & ipv6 "2001:4978:f:2d9::2" + & alias "backup.kitenet.net" & sshPubKey "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAokMXQiX/NZjA1UbhMdgAscnS5dsmy+Q7bWrQ6tsTZ/o+6N/T5cbjoBHOdpypXJI3y/PiJTDJaQtXIhLa8gFg/EvxMnMz/KG9skADW1361JmfCc4BxicQIO2IOOe6eilPr+YsnOwiHwL0vpUnuty39cppuMWVD25GzxXlS6KQsLCvXLzxLLuNnGC43UAM0q4UwQxDtAZEK1dH2o3HMWhgMP2qEQupc24dbhpO3ecxh2C9678a3oGDuDuNf7mLp3s7ptj5qF3onitpJ82U5o7VajaHoygMaSRFeWxP2c13eM57j3bLdLwxVXFhePcKXARu1iuFTLS5uUf3hN6MkQcOGw==" , host "wren.kitenet.net" & ipv4 "80.68.85.49" & ipv6 "2001:41c8:125:49::10" - & alias "kite.kitenet.net" & alias "kitenet.net" + & alias "kite.kitenet.net" & alias "ns1.kitenet.net" + & alias "ftp.kitenet.net" + & alias "mail.kitenet.net" + & alias "smtp.kitenet.net" + & alias "sows-ear.kitenet.net" + & alias "www.sows-ear.kitenet.net" + & alias "wortroot.kitenet.net" + & alias "www.wortroot.kitenet.net" + & alias "joey.kitenet.net" + & alias "annex.kitenet.net" + & alias "ipv6.kitenet.net" + , host "mouse.kitenet.net" + & ipv6 "2001:4830:1600:492::2" + , host "beaver.litenet.net" + & ipv6 "2001:4830:1600:195::2" + , host "hydra.kitenet.net" + & ipv4 "192.25.206.60" , host "branchable.com" & ipv4 "66.228.46.55" & ipv6 "2600:3c03::f03c:91ff:fedf:c0e5" & alias "olduse.net" & alias "www.olduse.net" - & alias "git.olduse.net" + & alias "www.kitenet.net" & alias "joeyh.name" & alias "campaign.joeyh.name" & alias "ikiwiki.info" + & alias "git.ikiwiki.info" & alias "l10n.ikiwiki.info" + & alias "dist-bugs.kitenet.net" + & alias "family.kitenet.net" ] -- cgit v1.3-2-g0d8e From cf6182f95b921626c19b684c0e12935610392968 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Apr 2014 22:38:59 -0400 Subject: propellor spin --- config-joey.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 41edcdb3..752beb25 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -132,13 +132,15 @@ hosts = -- (o) ` & JoeySites.oldUseNetServer hosts & alias "ns2.kitenet.net" - & myDnsPrimary "kitenet.net" - [] + & myDnsPrimary "kitenet.net" [] & myDnsPrimary "joeyh.name" [] & myDnsPrimary "ikiwiki.info" [] & myDnsPrimary "olduse.net" [ (RelDomain "article", CNAME $ AbsDomain "virgil.koldfront.dk") ] + + & alias "ns3.branchable.com" + & myDnsSecondary & Apt.installed ["ntop"] @@ -263,7 +265,8 @@ myDnsSecondary = propertyList "dns secondary for all my domains" $ map toProp wren = ["wren.kitenet.net"] branchable = ["branchable.com"] --- Currently using diatom (ns2) and clam (ns9), with gandi supplimenting; +-- Currently using diatom (ns2) as primary with secondaries +-- clam (ns9) and gandi. -- kite handles all mail. myDnsPrimary :: Domain -> [(BindDomain, Record)] -> RevertableProperty myDnsPrimary domain extras = Dns.primary hosts domain -- cgit v1.3-2-g0d8e From 873a1231f300dde07132734c9cb1ba3c59d4777b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Apr 2014 22:42:20 -0400 Subject: propellor spin --- config-joey.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 752beb25..88247a1c 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -140,7 +140,7 @@ hosts = -- (o) ` CNAME $ AbsDomain "virgil.koldfront.dk") ] & alias "ns3.branchable.com" - & myDnsSecondary + & branchableSecondary & Apt.installed ["ntop"] @@ -259,11 +259,12 @@ myDnsSecondary = propertyList "dns secondary for all my domains" $ map toProp , Dns.secondaryFor wren hosts "joeyh.name" , Dns.secondaryFor wren hosts "ikiwiki.info" , Dns.secondary hosts "olduse.net" - , Dns.secondaryFor branchable hosts "branchable.com" ] where wren = ["wren.kitenet.net"] - branchable = ["branchable.com"] + +branchableSecondary :: RevertableProperty +branchableSecondary = Dns.secondaryFor ["branchable.com"] hosts "branchable.com" -- Currently using diatom (ns2) as primary with secondaries -- clam (ns9) and gandi. -- cgit v1.3-2-g0d8e From a80baa86d252e9bfff6fc1963ddadc1da07dad51 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Apr 2014 22:52:18 -0400 Subject: propellor spin --- config-joey.hs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 88247a1c..0ddf30f2 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -255,13 +255,11 @@ cleanCloudAtCost = propertyList "cloudatcost cleanup" myDnsSecondary :: Property myDnsSecondary = propertyList "dns secondary for all my domains" $ map toProp - [ Dns.secondaryFor wren hosts "kitenet.net" - , Dns.secondaryFor wren hosts "joeyh.name" - , Dns.secondaryFor wren hosts "ikiwiki.info" + [ Dns.secondary hosts "kitenet.net" + , Dns.secondary hosts "joeyh.name" + , Dns.secondary hosts "ikiwiki.info" , Dns.secondary hosts "olduse.net" ] - where - wren = ["wren.kitenet.net"] branchableSecondary :: RevertableProperty branchableSecondary = Dns.secondaryFor ["branchable.com"] hosts "branchable.com" -- cgit v1.3-2-g0d8e From bfdacd4b8870e78bd97de45b55847ae5932013a7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Apr 2014 23:02:46 -0400 Subject: propellor spin --- config-joey.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 0ddf30f2..0ce78cda 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -318,7 +318,7 @@ monsters = -- but do want to track their public keys etc. & alias "ipv6.kitenet.net" , host "mouse.kitenet.net" & ipv6 "2001:4830:1600:492::2" - , host "beaver.litenet.net" + , host "beaver.kitenet.net" & ipv6 "2001:4830:1600:195::2" , host "hydra.kitenet.net" & ipv4 "192.25.206.60" -- cgit v1.3-2-g0d8e From b5ab37ad5bda2eed62a1236cf067ab23a5f59164 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 21 Apr 2014 00:13:55 -0400 Subject: propellor spin --- config-joey.hs | 2 -- 1 file changed, 2 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 0ce78cda..f0aaba54 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -142,8 +142,6 @@ hosts = -- (o) ` & alias "ns3.branchable.com" & branchableSecondary - & Apt.installed ["ntop"] - --' __|II| ,. ---- __|II|II|__ ( \_,/\ -- cgit v1.3-2-g0d8e From 7d59a568a3dcc9649c4d12239d01ab92a2b8ef1f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 21 Apr 2014 01:00:59 -0400 Subject: propellor spin --- Propellor/Property/SiteSpecific/JoeySites.hs | 10 ++++++++++ config-joey.hs | 1 + 2 files changed, 11 insertions(+) (limited to 'config-joey.hs') diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs index fa8a4c6d..74c47be7 100644 --- a/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/Propellor/Property/SiteSpecific/JoeySites.hs @@ -115,6 +115,16 @@ mumbleServer hosts = combineProperties "mumble.debian.net" , Apt.serviceInstalledRunning "mumble-server" ] +obnamLowMem :: Property +obnamLowMem = propertyList "obnam tuned for low memory use" + [ Obnam.latestVersion + , "/etc/obnam.conf" `File.containsLines` + [ "# Suggested by liw to keep Obnam memory consumption down (at some speed cost)." + , "upload-queue-size = 128" + , "lru-size = 128" + ] + ] + -- git.kitenet.net and git.joeyh.name gitServer :: [Host] -> Property gitServer hosts = propertyList "git.kitenet.net setup" diff --git a/config-joey.hs b/config-joey.hs index f0aaba54..e95e05d4 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -100,6 +100,7 @@ hosts = -- (o) ` & Apt.unattendedUpgrades & Apt.serviceInstalledRunning "ntp" & Postfix.satellite + & JoeySites.obnamLowMem & Apt.serviceInstalledRunning "apache2" & File.hasPrivContent "/etc/ssl/certs/web.pem" -- cgit v1.3-2-g0d8e From 789d2580ae4bc7d0826117502849b61ed176737b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 21 Apr 2014 11:10:14 -0400 Subject: propellor spin --- Propellor/Property/SiteSpecific/JoeySites.hs | 8 ++++---- config-joey.hs | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'config-joey.hs') diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs index 74c47be7..cef64e23 100644 --- a/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/Propellor/Property/SiteSpecific/JoeySites.hs @@ -116,7 +116,7 @@ mumbleServer hosts = combineProperties "mumble.debian.net" ] obnamLowMem :: Property -obnamLowMem = propertyList "obnam tuned for low memory use" +obnamLowMem = combineProperties "obnam tuned for low memory use" [ Obnam.latestVersion , "/etc/obnam.conf" `File.containsLines` [ "# Suggested by liw to keep Obnam memory consumption down (at some speed cost)." @@ -252,9 +252,8 @@ mainhttpscert True = , " SSLCertificateChainFile /etc/ssl/certs/startssl.pem" ] - -annexRsyncServer :: Property -annexRsyncServer = combineProperties "rsync server for git-annex autobuilders" +gitAnnexDistributor :: Property +gitAnnexDistributor = combineProperties "git-annex distributor, including rsync server and signer" [ Apt.installed ["rsync"] , File.hasPrivContent "/etc/rsyncd.conf" , File.hasPrivContent "/etc/rsyncd.secrets" @@ -262,6 +261,7 @@ annexRsyncServer = combineProperties "rsync server for git-annex autobuilders" `onChange` Service.running "rsync" , endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild" , endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks" + , Gpg.keyImported "89C809CB" "joey" ] where endpoint d = combineProperties ("endpoint " ++ d) diff --git a/config-joey.hs b/config-joey.hs index e95e05d4..842da803 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -100,7 +100,10 @@ hosts = -- (o) ` & Apt.unattendedUpgrades & Apt.serviceInstalledRunning "ntp" & Postfix.satellite + + -- Diatom has 500 mb of memory, so tune for that. & JoeySites.obnamLowMem + & Apt.serviceInstalledRunning "swapspace" & Apt.serviceInstalledRunning "apache2" & File.hasPrivContent "/etc/ssl/certs/web.pem" @@ -119,7 +122,7 @@ hosts = -- (o) ` "downloads.kitenet.net" "840760dc-08f0-11e2-8c61-576b7e66acfd" [("turtle", "ssh://turtle.kitenet.net/~/lib/downloads/")] - & JoeySites.annexRsyncServer + & JoeySites.gitAnnexDistributor & alias "tmp.kitenet.net" & JoeySites.annexWebSite hosts "/srv/git/joey/tmp.git" -- cgit v1.3-2-g0d8e