From a82a41dba3d6cc3356f502e54a6435bc184e135d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Jun 2017 13:22:31 -0400 Subject: add OS for branchable --- joeyconfig.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 2b679342..ecc7e7d0 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -468,6 +468,7 @@ pell = host "pell.branchable.com" $ props & alias "dist-bugs.kitenet.net" & alias "family.kitenet.net" + & osDebian (Stable "jessie") X86_64 & Apt.installed ["linux-image-amd64"] & Apt.unattendedUpgrades & Branchable.server hosts -- cgit v1.3-2-g0d8e From ff2d2f8ed7bd6aed76fd104fca50756d66d7785c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Jun 2017 13:46:02 -0400 Subject: propellor spin --- joeyconfig.hs | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index ecc7e7d0..6412ea0e 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -50,7 +50,6 @@ hosts = -- (o) ` , gnu , dragon , clam - , mayfly , orca , baleen , honeybee @@ -124,7 +123,7 @@ clam :: Host clam = host "clam.kitenet.net" $ props & standardSystem Unstable X86_64 ["Unreliable server. Anything here may be lost at any time!" ] - & ipv4 "64.137.231.62" + & ipv4 "64.137.246.222" & CloudAtCost.decruft & Ssh.hostKeys hostContext @@ -147,22 +146,6 @@ clam = host "clam.kitenet.net" $ props & alias "scroll.joeyh.name" & alias "us.scroll.joeyh.name" -mayfly :: Host -mayfly = host "mayfly.kitenet.net" $ props - & standardSystem (Stable "jessie") X86_64 - [ "Scratch VM. Contents can change at any time!" ] - & ipv4 "167.88.36.193" - - & CloudAtCost.decruft - & Apt.unattendedUpgrades - & Network.ipv6to4 - & Systemd.persistentJournal - & Journald.systemMaxUse "500MiB" - - & Tor.isRelay - & Tor.named "kite3" - & Tor.bandwidthRate (Tor.PerMonth "400 GB") - baleen :: Host baleen = host "baleen.kitenet.net" $ props & standardSystem Unstable X86_64 [ "New git-annex build box." ] -- cgit v1.3-2-g0d8e From 39dc799b1481472e2e47194b959a77ac271b1243 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Jun 2017 14:13:07 -0400 Subject: propellor spin --- joeyconfig.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 6412ea0e..72c83f30 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -123,7 +123,7 @@ clam :: Host clam = host "clam.kitenet.net" $ props & standardSystem Unstable X86_64 ["Unreliable server. Anything here may be lost at any time!" ] - & ipv4 "64.137.246.222" + & ipv4 "64.137.239.3" & CloudAtCost.decruft & Ssh.hostKeys hostContext -- cgit v1.3-2-g0d8e From fd6c949ca6d2300045ae5174cef0b35632ecbd46 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Jun 2017 15:43:34 -0400 Subject: propellor spin --- joeyconfig.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 72c83f30..6db1dfc5 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -132,7 +132,6 @@ clam = host "clam.kitenet.net" $ props , (SshEcdsa, "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPhfvcOuw0Yt+MnsFc4TI2gWkKi62Eajxz+TgbHMO/uRTYF8c5V8fOI3o+J/3m5+lT0S5o8j8a7xIC3COvi+AVw=") ] & Apt.unattendedUpgrades - & Network.ipv6to4 & Systemd.persistentJournal & Journald.systemMaxUse "50MiB" @@ -462,7 +461,7 @@ keysafe :: Host keysafe = host "keysafe.joeyh.name" $ props & ipv4 "139.59.17.168" & Hostname.sane - & osDebian (Stable "jessie") X86_64 + & osDebian (Stable "stretch") X86_64 & Apt.stdSourcesList `onChange` Apt.upgrade & Apt.unattendedUpgrades & DigitalOcean.distroKernel -- cgit v1.3-2-g0d8e From e002e3e2385f32ec8b5999da0626d3016d8efc61 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Jun 2017 15:53:59 -0400 Subject: propellor spin --- joeyconfig.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 6db1dfc5..559c6cf3 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -550,7 +550,7 @@ oldusenetShellBox = Systemd.debContainer "oldusenet-shellbox" $ props kiteShellBox :: Systemd.Container kiteShellBox = Systemd.debContainer "kiteshellbox" $ props - & standardContainer (Stable "jessie") + & standardContainer (Stable "stretch") & JoeySites.kiteShellBox type Motd = [String] -- cgit v1.3-2-g0d8e