add DebianKernel datatype

(cherry picked from commit 3590a1241580ddcdd153e2619a3c02ce18a8db8c
but without the changes to src/Propellor/Precompiled.hs)

13 files changed, 49 insertions, 36 deletions

diff --git a/config-freebsd.hs b/config-freebsd.hs
index 6c92af8a..80abb89d 100644
--- a/config-freebsd.hs
+++ b/config-freebsd.hs
@@ -44,7 +44,7 @@ poudriereZFS = Poudriere.defaultConfig
 -- An example linux host.
 linuxbox :: Host
 linuxbox = host "linuxbox.example.com" $ props
-	& osDebian Unstable X86_64
+	& osDebian' KFreeBSD Unstable X86_64
 	& Apt.stdSourcesList
 	& Apt.unattendedUpgrades
 	& Apt.installed ["etckeeper"]
@@ -59,7 +59,7 @@ linuxbox = host "linuxbox.example.com" $ props
 -- A generic webserver in a Docker container.
 webserverContainer :: Docker.Container
 webserverContainer = Docker.container "webserver" (Docker.latestImage "debian") $ props
-	& osDebian (Stable "jessie") X86_64
+	& osDebian' KFreeBSD (Stable "jessie") X86_64
 	& Apt.stdSourcesList
 	& Docker.publish "80:80"
 	& Docker.volume "/var/www:/var/www"
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index 29175a67..2c8fa95a 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -60,7 +60,7 @@ depsCommand msys = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall])
   where
 	osinstall = case msys of
 		Just (System (FreeBSD _) _) -> map pkginstall fbsddeps
-		Just (System (Debian _) _) -> useapt
+		Just (System (Debian _ _) _) -> useapt
 		Just (System (Buntish _) _) -> useapt
 		-- assume a debian derived system when not specified
 		Nothing -> useapt
@@ -115,7 +115,7 @@ depsCommand msys = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall])
 
 installGitCommand :: Maybe System -> ShellCommand
 installGitCommand msys = case msys of
-	(Just (System (Debian _) _)) -> use apt
+	(Just (System (Debian _ _) _)) -> use apt
 	(Just (System (Buntish _) _)) -> use apt
 	(Just (System (FreeBSD _) _)) -> use
 		[ "ASSUME_ALWAYS_YES=yes pkg update"
@@ -125,7 +125,7 @@ installGitCommand msys = case msys of
 	Nothing -> use apt
   where
 	use cmds = "if ! git --version >/dev/null; then " ++ intercalate " && " cmds ++ "; fi"
-	apt = 
+	apt =
 		[ "apt-get update"
 		, "DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends --no-upgrade -y install git"
 		]
@@ -177,7 +177,7 @@ cabalBuild msys = do
 		( return True
 		, case msys of
 			Nothing -> return False
-			Just sys -> 
+			Just sys ->
 				boolSystem "sh" [Param "-c", Param (depsCommand (Just sys))]
 					<&&> cabal ["configure"]
 		)
diff --git a/src/Propellor/Info.hs b/src/Propellor/Info.hs
index f6c46192..5ccda176 100644
--- a/src/Propellor/Info.hs
+++ b/src/Propellor/Info.hs
@@ -78,8 +78,15 @@ askInfo = asks (fromInfo . hostInfo)
 -- host must support Debian.
 --
 -- > & osDebian (Stable "jessie") X86_64
+--
+-- osDebian' lets specify a different DebianKernel
+--
+-- > & osDebian' KFreeBSD (Stable "jessie") X86_64
 osDebian :: DebianSuite -> Architecture -> Property (HasInfo + Debian)
-osDebian suite arch = tightenTargets $ os (System (Debian suite) arch)
+osDebian = osDebian' Linux
+
+osDebian' :: DebianKernel -> DebianSuite -> Architecture -> Property (HasInfo + Debian)
+osDebian' kernel suite arch = tightenTargets $ os (System (Debian kernel suite) arch)
 
 -- | Specifies that a host's operating system is a well-known Debian
 -- derivative founded by a space tourist.
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 5e185a0e..a99fbefa 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -82,7 +82,7 @@ securityUpdates suite
 -- kernel.org.
 stdSourcesList :: Property Debian
 stdSourcesList = withOS "standard sources.list" $ \w o -> case o of
-	(Just (System (Debian suite) _)) ->
+	(Just (System (Debian _ suite) _)) ->
 		ensureProperty w $ stdSourcesListFor suite
 	_ -> unsupportedOS'
 
@@ -161,7 +161,7 @@ installed' params ps = robustly $ check (isInstallable ps) go
 
 installedBackport :: [Package] -> Property Debian
 installedBackport ps = withOS desc $ \w o -> case o of
-	(Just (System (Debian suite) _)) -> case backportSuite suite of
+	(Just (System (Debian _ suite) _)) -> case backportSuite suite of
 		Nothing -> unsupportedOS'
 		Just bs -> ensureProperty w $
 			runApt (["install", "-t", bs, "-y"] ++ ps)
@@ -257,7 +257,7 @@ unattendedUpgrades = enable <!> disable
 		enableupgrading = withOS "unattended upgrades configured" $ \w o ->
 			case o of
 				-- the package defaults to only upgrading stable
-				(Just (System (Debian suite) _))
+				(Just (System (Debian _ suite) _))
 					| not (isStable suite) -> ensureProperty w $
 						unattendedconfig
 							`File.containsLine`
diff --git a/src/Propellor/Property/Borg.hs b/src/Propellor/Property/Borg.hs
index f5842115..16030562 100644
--- a/src/Propellor/Property/Borg.hs
+++ b/src/Propellor/Property/Borg.hs
@@ -23,7 +23,7 @@ type BorgRepo = FilePath
 
 installed :: Property DebianLike
 installed = withOS desc $ \w o -> case o of
-	(Just (System (Debian (Stable "jessie")) _)) -> ensureProperty w $
+	(Just (System (Debian _ (Stable "jessie")) _)) -> ensureProperty w $
 		Apt.installedBackport ["borgbackup"]
 	_ -> ensureProperty w $
 		Apt.installed ["borgbackup"]
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index bcb7ff47..cb693a73 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -91,7 +91,7 @@ data Debootstrapped = Debootstrapped Debootstrap.DebootstrapConfig
 
 instance ChrootBootstrapper Debootstrapped where
 	buildchroot (Debootstrapped cf) system loc = case system of
-		(Just s@(System (Debian _) _)) -> Right $ debootstrap s
+		(Just s@(System (Debian _ _) _)) -> Right $ debootstrap s
 		(Just s@(System (Buntish _) _)) -> Right $ debootstrap s
 		(Just (System (FreeBSD _) _)) -> Left "FreeBSD not supported by debootstrap."
 		Nothing -> Left "Cannot debootstrap; OS not specified"
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs
index 1503f223..69ac036a 100644
--- a/src/Propellor/Property/Debootstrap.hs
+++ b/src/Propellor/Property/Debootstrap.hs
@@ -90,7 +90,7 @@ built' installprop target system@(System _ arch) config =
 		)
 
 extractSuite :: System -> Maybe String
-extractSuite (System (Debian s) _) = Just $ Apt.showSuite s
+extractSuite (System (Debian _ s) _) = Just $ Apt.showSuite s
 extractSuite (System (Buntish r) _) = Just r
 extractSuite (System (FreeBSD _) _) = Nothing
 
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index f651ed52..d974cfbc 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -85,7 +85,7 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
 
 	osbootstrapped :: Property Linux
 	osbootstrapped = withOS (newOSDir ++ " bootstrapped") $ \w o -> case o of
-		(Just d@(System (Debian _) _)) -> ensureProperty w $
+		(Just d@(System (Debian _ _) _)) -> ensureProperty w $
 			debootstrap d
 		(Just u@(System (Buntish _) _)) -> ensureProperty w $
 			debootstrap u
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index 5bb6c8b7..50825a0c 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -383,7 +383,7 @@ schrootFromSystem system@(System _ arch) =
 	>>= \suite -> return $ SbuildSchroot suite arch
 
 stdMirror :: System -> Maybe Apt.Url
-stdMirror (System (Debian _) _) = Just "http://httpredir.debian.org/debian"
+stdMirror (System (Debian _ _) _) = Just "http://httpredir.debian.org/debian"
 stdMirror (System (Buntish _) _) = Just "mirror://mirrors.ubuntu.com/"
 stdMirror _ = Nothing
 
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index d1771dde..90c9c7bf 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -143,7 +143,7 @@ stackAutoBuilder suite arch flavor =
 stackInstalled :: Property Linux
 stackInstalled = withOS "stack installed" $ \w o ->
 	case o of
-		(Just (System (Debian (Stable "jessie")) X86_32)) ->
+		(Just (System (Debian Linux (Stable "jessie")) X86_32)) ->
 			ensureProperty w $ manualinstall X86_32
 		_ -> ensureProperty w $ Apt.installed ["haskell-stack"]
   where
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index e3bef900..652a7141 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -103,7 +103,7 @@ oldUseNetServer hosts = propertyList "olduse.net server" $ props
 	& oldUseNetInstalled "oldusenet-server"
 	& oldUseNetBackup
 	& spoolsymlink
-	& "/etc/news/leafnode/config" `File.hasContent` 
+	& "/etc/news/leafnode/config" `File.hasContent`
 		[ "# olduse.net configuration (deployed by propellor)"
 		, "expire = 1000000" -- no expiry via texpire
 		, "server = " -- no upstream server
@@ -134,7 +134,7 @@ oldUseNetServer hosts = propertyList "olduse.net server" $ props
 		, Apache.allowAll
 		, "  </Directory>"
 		]
-	
+
 	spoolsymlink :: Property UnixLike
 	spoolsymlink = check (not . isSymbolicLink <$> getSymbolicLinkStatus newsspool)
 		(property "olduse.net spool in place" $ makeChange $ do
@@ -177,7 +177,7 @@ oldUseNetInstalled pkg = check (not <$> Apt.isInstalled pkg) $
 			]
 			`assume` MadeChange
 			`describe` "olduse.net built"
- 
+
 kgbServer :: Property (HasInfo + Debian)
 kgbServer = propertyList desc $ props
 	& installed
@@ -187,7 +187,7 @@ kgbServer = propertyList desc $ props
 	desc = "kgb.kitenet.net setup"
 	installed :: Property Debian
 	installed = withOS desc $ \w o -> case o of
-		(Just (System (Debian Unstable) _)) ->
+		(Just (System (Debian _ Unstable) _)) ->
 			ensureProperty w $ propertyList desc $ props
 				& Apt.serviceInstalledRunning "kgb-bot"
 				& "/etc/default/kgb-bot" `File.containsLine` "BOT_ENABLED=1"
@@ -289,7 +289,7 @@ annexWebSite origin hn uuid remotes = propertyList (hn ++" website using git-ann
 	postupdatehook = dir </> ".git/hooks/post-update"
 	setup = userScriptProperty (User "joey") setupscript
 		`assume` MadeChange
-	setupscript = 
+	setupscript =
 		[ "cd " ++ shellEscape dir
 		, "git annex reinit " ++ shellEscape uuid
 		] ++ map addremote remotes ++
@@ -316,7 +316,7 @@ apacheSite :: HostName -> Apache.ConfigFile -> RevertableProperty DebianLike Deb
 apacheSite hn middle = Apache.siteEnabled hn $ apachecfg hn middle
 
 apachecfg :: HostName -> Apache.ConfigFile -> Apache.ConfigFile
-apachecfg hn middle = 
+apachecfg hn middle =
 	[ "<VirtualHost *:"++show port++">"
 	, "  ServerAdmin grue@joeyh.name"
 	, "  ServerName "++hn++":"++show port
@@ -333,7 +333,7 @@ apachecfg hn middle =
 	]
 	  where
 		port = 80 :: Int
-		
+
 gitAnnexDistributor :: Property (HasInfo + DebianLike)
 gitAnnexDistributor = combineProperties "git-annex distributor, including rsync server and signer" $ props
 	& Apt.installed ["rsync"]
@@ -360,7 +360,7 @@ downloads hosts = annexWebSite "/srv/git/downloads.git"
 	"840760dc-08f0-11e2-8c61-576b7e66acfd"
 	[("eubackup", "ssh://eubackup.kitenet.net/~/lib/downloads/")]
 	`requires` Ssh.knownHost hosts "eubackup.kitenet.net" (User "joey")
-	
+
 tmp :: Property (HasInfo + DebianLike)
 tmp = propertyList "tmp.kitenet.net" $ props
 	& annexWebSite "/srv/git/joey/tmp.git"
@@ -384,7 +384,7 @@ twitRss = combineProperties "twitter rss" $ props
 		"./twitRss " ++ shellEscape url ++ " > " ++ shellEscape ("../" ++ desc ++ ".rss")
 	compiled = userScriptProperty (User "joey")
 		[ "cd " ++ dir
-		, "ghc --make twitRss" 
+		, "ghc --make twitRss"
 		]
 		`assume` NoChange
 		`requires` Apt.installed
@@ -447,7 +447,7 @@ githubBackup = propertyList "github-backup box" $ props
 	gitriddance (r, msg) = "(cd " ++ r ++ " && gitriddance " ++ shellEscape msg ++ ")"
 
 githubKeys :: Property (HasInfo + UnixLike)
-githubKeys = 
+githubKeys =
 	let f = "/home/joey/.github-keys"
 	in File.hasPrivContent f anyContext
 		`onChange` File.ownerGroup f (User "joey") (Group "joey")
@@ -511,14 +511,14 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
 		] `onChange` Service.restarted "spamassassin"
 		`describe` "spamd enabled"
 		`requires` Apt.serviceInstalledRunning "cron"
-	
+
 	& Apt.serviceInstalledRunning "spamass-milter"
 	-- Add -m to prevent modifying messages Subject or body.
 	& "/etc/default/spamass-milter" `File.containsLine`
 		"OPTIONS=\"-m -u spamass-milter -i 127.0.0.1\""
 		`onChange` Service.restarted "spamass-milter"
 		`describe` "spamass-milter configured"
-	
+
 	& Apt.serviceInstalledRunning "amavisd-milter"
 	& "/etc/default/amavisd-milter" `File.containsLines`
 		[ "# Propellor deployed"
@@ -642,7 +642,7 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
 		`onChange` Postfix.dedupMainCf
 		`onChange` Postfix.reloaded
 		`describe` "postfix configured"
-	
+
 	& Apt.serviceInstalledRunning "dovecot-imapd"
 	& Apt.serviceInstalledRunning "dovecot-pop3d"
 	& "/etc/dovecot/conf.d/10-mail.conf" `File.containsLine`
@@ -679,7 +679,7 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
 		, "inbox-path={localhost/novalidate-cert/NoRsh}inbox"
 		]
 		`describe` "pine configured to use local imap server"
-	
+
 	& Apt.serviceInstalledRunning "mailman"
 
 	& Postfix.service ssmtp
@@ -690,7 +690,7 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
 	pinescript = "/usr/local/bin/pine"
 	dovecotusers = "/etc/dovecot/users"
 
-	ssmtp = Postfix.Service 
+	ssmtp = Postfix.Service
 		(Postfix.InetService Nothing "ssmtp")
 		"smtpd" Postfix.defServiceOpts
 
@@ -827,7 +827,7 @@ legacyWebSites = propertyList "legacy web sites" $ props
 		, "RewriteRule ^/joey/index.html http://www.kitenet.net/joey/ [R]"
 		, "RewriteRule ^/wifi http://www.kitenet.net/wifi/ [R]"
 		, "RewriteRule ^/wifi/index.html http://www.kitenet.net/wifi/ [R]"
-		
+
 		, "# Old ikiwiki filenames for kitenet.net wiki."
 		, "rewritecond $1 !^/~"
 		, "rewritecond $1 !^/doc/"
@@ -914,7 +914,7 @@ legacyWebSites = propertyList "legacy web sites" $ props
 
 		, "rewritecond $1 !.*/index$"
 		, "rewriterule (.+).rss$ http://joeyh.name/$1/index.rss [l]"
-		
+
 		, "# Redirect all to joeyh.name."
 		, "rewriterule (.*) http://joeyh.name$1 [r]"
 		]
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index dd7dfe05..78529f73 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -204,7 +204,7 @@ machined :: Property Linux
 machined = withOS "machined installed" $ \w o ->
 	case o of
 		-- Split into separate debian package since systemd 225.
-		(Just (System (Debian suite) _))
+		(Just (System (Debian _ suite) _))
 			| not (isStable suite) -> ensureProperty w $
 				Apt.installed ["systemd-container"]
 		_ -> noChange
diff --git a/src/Propellor/Types/OS.hs b/src/Propellor/Types/OS.hs
index ad0a7185..b569a6e8 100644
--- a/src/Propellor/Types/OS.hs
+++ b/src/Propellor/Types/OS.hs
@@ -4,6 +4,7 @@ module Propellor.Types.OS (
 	System(..),
 	Distribution(..),
 	TargetOS(..),
+	DebianKernel(..),
 	DebianSuite(..),
 	FreeBSDRelease(..),
 	FBSDVersion(..),
@@ -30,7 +31,7 @@ data System = System Distribution Architecture
 	deriving (Show, Eq, Typeable)
 
 data Distribution
-	= Debian DebianSuite
+	= Debian DebianKernel DebianSuite
 	| Buntish Release -- ^ A well-known Debian derivative founded by a space tourist. The actual name of this distribution is not used in Propellor per <http://joeyh.name/blog/entry/trademark_nonsense/>
 	| FreeBSD FreeBSDRelease
 	deriving (Show, Eq)
@@ -44,10 +45,15 @@ data TargetOS
 	deriving (Show, Eq, Ord)
 
 systemToTargetOS :: System -> TargetOS
-systemToTargetOS (System (Debian _) _) = OSDebian
+systemToTargetOS (System (Debian _ _) _) = OSDebian
 systemToTargetOS (System (Buntish _) _) = OSBuntish
 systemToTargetOS (System (FreeBSD _) _) = OSFreeBSD
 
+-- | Most of Debian ports are based on Linux. There also exist hurd-i386,
+-- kfreebsd-i386, kfreebsd-amd64 ports
+data DebianKernel = Linux | KFreeBSD | Hurd
+	deriving (Show, Eq)
+
 -- | Debian has several rolling suites, and a number of stable releases,
 -- such as Stable "jessie".
 data DebianSuite = Experimental | Unstable | Testing | Stable Release