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(+) 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.2.3 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(+) 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.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 From 467f5f9959ab9ce13e9e6bf65e3a2bbe461a0984 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Jan 2017 11:57:24 -0400 Subject: add missing props to Host definitions --- doc/haskell_newbie.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/haskell_newbie.mdwn b/doc/haskell_newbie.mdwn index d6e339ed..dc3c54a7 100644 --- a/doc/haskell_newbie.mdwn +++ b/doc/haskell_newbie.mdwn @@ -47,12 +47,12 @@ Finally, you need to define the configuration for each host in the list: [[!format haskell """ mylaptop :: Host -mylaptop = host "mylaptop.example.com" +mylaptop = host "mylaptop.example.com" $ props & osDebian Unstable X86_64 & Apt.stdSourcesList myserver :: Host -myserver = host "server.example.com" +myserver = host "server.example.com" $ props & osDebian (Stable "jessie") X86_64 & Apt.stdSourcesList & Apt.installed ["ssh"] -- cgit v1.2.3 From d1e5b88edaebd6a06d1745de893a273a1e6aba65 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Jan 2017 20:32:56 -0400 Subject: fix type in example --- src/Propellor/Property.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index 8f51035b..06145333 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -263,7 +263,7 @@ isNewerThan x y = do -- -- For example: -- --- > upgraded :: UnixLike +-- > upgraded :: Property (DebianLike + FreeBSD) -- > upgraded = (Apt.upgraded `pickOS` Pkg.upgraded) -- > `describe` "OS upgraded" -- -- cgit v1.2.3 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(+) 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.2.3 From ec3b4dc95590e89d066edf445f35bdbc1aee40e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jan 2017 14:58:34 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 408fadad..4f8b48af 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -370,7 +370,7 @@ tmp = propertyList "tmp.joeyh.name" $ props -- (Obsolete; need to revert this.) pumpRss :: Property DebianLike pumpRss = Cron.job "pump rss" (Cron.Times "15 * * * *") (User "joey") "/srv/web/tmp.joeyh.name/" - "wget https://rss.io.jpope.org/feed/joeyh@identi.ca.atom -O pump.atom.new --no-check-certificate 2>/dev/null; sed 's/ & / /g' pump.atom.new > pump.atom" + "wget https://pump2rss.com/feed/joeyh@identi.ca.atom -O pump.atom.new --no-check-certificate 2>/dev/null; sed 's/ & / /g' pump.atom.new > pump.atom" ircBouncer :: Property (HasInfo + DebianLike) ircBouncer = propertyList "IRC bouncer" $ props -- cgit v1.2.3