Merge branch 'joeyconfig'

4 files changed, 23 insertions, 4 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"]
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 4c437664..7d2ea8b2 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
@@ -50,6 +51,7 @@ hosts =                 --                  (o)  `
 	, mayfly
 	, oyster
 	, orca
+	, baleen
 	, honeybee
 	, kite
 	, elephant
@@ -182,6 +184,22 @@ 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.
+	& 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
+	& Apt.serviceInstalledRunning "ntp"
+	& Systemd.persistentJournal
+
 orca :: Host
 orca = host "orca.kitenet.net" $ props
 	& standardSystem Unstable X86_64 [ "Main git-annex build box." ]
@@ -638,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"
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"
 --
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