From 50d8edf7269cfc2b30f386a23d96fc854039ee51 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 3 Jan 2017 10:36:22 -0400 Subject: propellor spin --- joeyconfig.hs | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 4c437664..549fdcf9 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -50,6 +50,7 @@ hosts = -- (o) ` , mayfly , oyster , orca + , baleen , honeybee , kite , elephant @@ -182,6 +183,16 @@ oyster = host "oyster.kitenet.net" $ props -- block 22. & Ssh.listenPort (Port 80) +baleen :: Host +baleen = host "baleen.kitenet.net" $ props + & standardSystem Unstable X86_64 [ "New git-annex build box." ] + -- Not on public network; ssh access via bounce host. + + & Apt.unattendedUpgrades + & Postfix.satellite + & Apt.serviceInstalledRunning "ntp" + & Systemd.persistentJournal + orca :: Host orca = host "orca.kitenet.net" $ props & standardSystem Unstable X86_64 [ "Main git-annex build box." ] -- cgit v1.3-2-g0d8e From d996522663e3ffdd7f616aa929763d022be1fb14 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 3 Jan 2017 10:47:29 -0400 Subject: propellor spin --- joeyconfig.hs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 549fdcf9..28c21f3c 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -13,6 +13,7 @@ import qualified Propellor.Property.Cron as Cron import qualified Propellor.Property.Sudo as Sudo import qualified Propellor.Property.User as User import qualified Propellor.Property.Hostname as Hostname +import qualified Propellor.Property.Fstab as Fstab import qualified Propellor.Property.Tor as Tor import qualified Propellor.Property.Dns as Dns import qualified Propellor.Property.OpenId as OpenId @@ -186,7 +187,13 @@ oyster = host "oyster.kitenet.net" $ props baleen :: Host baleen = host "baleen.kitenet.net" $ props & standardSystem Unstable X86_64 [ "New git-annex build box." ] + -- Not on public network; ssh access via bounce host. + & ipv4 "138.38.77.40" + + -- The root filesystem content may be lost if the VM is resized. + -- /dev/vdb contains persistent storage. + & Fstab.mounted "auto" "/dev/vdb" "/var/lib/container" mempty & Apt.unattendedUpgrades & Postfix.satellite -- cgit v1.3-2-g0d8e From 150211305acf5c4ec4d200c6441d239747b7b3f4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 8 Jan 2017 18:34:13 -0400 Subject: propellor spin --- joeyconfig.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 28c21f3c..7d2ea8b2 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -656,6 +656,7 @@ monsters = -- but do want to track their public keys etc. & ipv6 "2001:4978:f:2d9::2" , host "mouse.kitenet.net" $ props & ipv6 "2001:4830:1600:492::2" + & ipv4 "67.223.19.96" , host "animx" $ props & ipv4 "76.7.162.101" & ipv4 "76.7.162.186" -- cgit v1.3-2-g0d8e