From 4a21279d0b3b61cc3c5ef74c44a88daa2064851a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 4 Oct 2016 18:43:51 -0400 Subject: setting up joeyconfig after merge --- config.hs | 2 +- privdata/relocate | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 privdata/relocate diff --git a/config.hs b/config.hs index ec313725..97d90636 120000 --- a/config.hs +++ b/config.hs @@ -1 +1 @@ -config-simple.hs \ No newline at end of file +joeyconfig.hs \ No newline at end of file diff --git a/privdata/relocate b/privdata/relocate new file mode 100644 index 00000000..271692d8 --- /dev/null +++ b/privdata/relocate @@ -0,0 +1 @@ +.joeyconfig -- cgit v1.3-2-g0d8e -- cgit v1.3-2-g0d8e From 781a660af24535b7e498d06dae5e3c07b3536c8e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Oct 2016 12:55:13 -0400 Subject: propellor spin --- joeyconfig.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/joeyconfig.hs b/joeyconfig.hs index 08ff081b..aeaa092e 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -448,6 +448,7 @@ pell = host "pell.branchable.com" $ props & alias "joeyh.name" & alias "campaign.joeyh.name" & alias "ikiwiki.info" + & alias "www.ikiwiki.info" & alias "git.ikiwiki.info" & alias "l10n.ikiwiki.info" & alias "dist-bugs.kitenet.net" -- cgit v1.3-2-g0d8e From 15456936859166e9ba5043df3ff87edc2e1fe2c9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Oct 2016 13:01:02 -0400 Subject: add --- joeyconfig.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/joeyconfig.hs b/joeyconfig.hs index aeaa092e..944f7896 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -446,6 +446,7 @@ pell = host "pell.branchable.com" $ props & alias "www.olduse.net" & alias "www.kitenet.net" & alias "joeyh.name" + & alias "www.joeyh.name" & alias "campaign.joeyh.name" & alias "ikiwiki.info" & alias "www.ikiwiki.info" -- cgit v1.3-2-g0d8e From 44d851c1cc1f2044d60f2518e3147644f32ff0bd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Oct 2016 13:59:31 -0400 Subject: propellor spin --- joeyconfig.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index 944f7896..a8996be9 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -260,15 +260,13 @@ kite = host "kite.kitenet.net" $ props & Network.static "eth0" `requires` Network.cleanInterfacesFile & Apt.installed ["linux-image-amd64"] - & Linode.chainPVGrub 5 & Linode.mlocateEnabled & Apt.unattendedUpgrades & Systemd.installed & Systemd.persistentJournal & Journald.systemMaxUse "500MiB" & Ssh.passwordAuthentication True - -- Since ssh password authentication is allowed: - & Fail2Ban.installed + & Fail2Ban.installed -- since ssh password authentication is allowed & Apt.serviceInstalledRunning "ntp" & "/etc/timezone" `File.hasContent` ["US/Eastern"] -- cgit v1.3-2-g0d8e From 2c58f2a7df719b1443467aa4c22d12de564c6920 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Oct 2016 14:13:51 -0400 Subject: propellor spin --- debian/changelog | 1 + joeyconfig.hs | 2 ++ src/Propellor/Property/HostingProvider/Linode.hs | 19 ++++++++++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7baa9d79..8d9b6d33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ propellor (3.2.1) unstable; urgency=medium * Simplify Debootstrap.sourceInstall since #770217 was fixed. * Debootstap.installed: Fix inverted logic that made this never install debootstrap. Thanks, mithrandi. + * Added Linode.serialGrub property. -- Joey Hess Mon, 03 Oct 2016 18:06:31 -0400 diff --git a/joeyconfig.hs b/joeyconfig.hs index a8996be9..4a353819 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -260,6 +260,7 @@ kite = host "kite.kitenet.net" $ props & Network.static "eth0" `requires` Network.cleanInterfacesFile & Apt.installed ["linux-image-amd64"] + & Linode.serialGrub & Linode.mlocateEnabled & Apt.unattendedUpgrades & Systemd.installed @@ -456,6 +457,7 @@ pell = host "pell.branchable.com" $ props & Apt.installed ["linux-image-amd64"] & Apt.unattendedUpgrades & Branchable.server hosts + & Linode.serialGrub -- See https://joeyh.name/code/keysafe/servers/ for requirements. keysafe :: Host diff --git a/src/Propellor/Property/HostingProvider/Linode.hs b/src/Propellor/Property/HostingProvider/Linode.hs index 71719d87..fca3df63 100644 --- a/src/Propellor/Property/HostingProvider/Linode.hs +++ b/src/Propellor/Property/HostingProvider/Linode.hs @@ -5,9 +5,22 @@ import qualified Propellor.Property.Grub as Grub import qualified Propellor.Property.File as File import Utility.FileMode --- | Linode's pv-grub-x86_64 does not currently support booting recent --- Debian kernels compressed with xz. This sets up pv-grub chaining to enable --- it. +-- | Configures grub to use the serial console as set up by Linode. +-- Useful when running a distribution supplied kernel. +-- +serialGrub :: Property DebianLike +serialGrub = "/etc/default/grub" `File.containsLines` + [ "GRUB_CMDLINE_LINUX=\"console=ttyS0,19200n8\"" + , "GRUB_DISABLE_LINUX_UUID=true" + , "GRUB_SERIAL_COMMAND=\"serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1\"" + , "GRUB_TERMINAL=serial" + ] + `onChange` Grub.mkConfig + `requires` Grub.installed Grub.PC + +-- | Linode's pv-grub-x86_64 (only used for its older XEN instances) +-- does not support booting recent Debian kernels compressed +-- with xz. This sets up pv-grub chaining to enable it. chainPVGrub :: Grub.TimeoutSecs -> Property DebianLike chainPVGrub = Grub.chainPVGrub "hd0" "xen/xvda" -- cgit v1.3-2-g0d8e From 5e213dc88e028ae1935efe1871c8bd1311d4ff65 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Oct 2016 14:59:27 -0400 Subject: fix changelog --- debian/changelog | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8d9b6d33..99c296d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ +propellor (3.2.2) UNRELEASED; urgency=medium + + * Added Linode.serialGrub property. + + -- Joey Hess Fri, 21 Oct 2016 14:59:09 -0400 + propellor (3.2.1) unstable; urgency=medium * Simplify Debootstrap.sourceInstall since #770217 was fixed. * Debootstap.installed: Fix inverted logic that made this never install debootstrap. Thanks, mithrandi. - * Added Linode.serialGrub property. -- Joey Hess Mon, 03 Oct 2016 18:06:31 -0400 -- cgit v1.3-2-g0d8e From 682f3f15fa142bfae9767593e50a179fd263c763 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Oct 2016 13:13:14 -0400 Subject: propellor spin --- joeyconfig.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index 4a353819..8b4964b4 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -168,7 +168,7 @@ oyster :: Host oyster = host "oyster.kitenet.net" $ props & standardSystem Unstable X86_64 [ "Unreliable server. Anything here may be lost at any time!" ] - & ipv4 "104.167.117.109" + & ipv4 "64.137.222.48" & CloudAtCost.decruft & Ssh.hostKeys hostContext -- cgit v1.3-2-g0d8e From a271e8abe2845461585c94274884d3d616c77595 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Oct 2016 13:39:33 -0400 Subject: propellor spin --- joeyconfig.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index 8b4964b4..49cc05f1 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -168,7 +168,7 @@ oyster :: Host oyster = host "oyster.kitenet.net" $ props & standardSystem Unstable X86_64 [ "Unreliable server. Anything here may be lost at any time!" ] - & ipv4 "64.137.222.48" + & ipv4 "64.137.221.146" & CloudAtCost.decruft & Ssh.hostKeys hostContext -- cgit v1.3-2-g0d8e