diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-03-26 15:35:55 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-03-26 15:35:55 -0400 |
commit | e4ac94860bcc4511370e878e14ef9d45b60aeb2a (patch) | |
tree | 3d1abab78e84cf29310c99a77ad414d25fdd3511 /config-freebsd.hs | |
parent | 636c7cf5ba42d3636e06f298feae0b9219be6067 (diff) |
remove `os` property
The new properties let the type checker know what the target OS is.
Diffstat (limited to 'config-freebsd.hs')
-rw-r--r-- | config-freebsd.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config-freebsd.hs b/config-freebsd.hs index b6334c31..07aeb391 100644 --- a/config-freebsd.hs +++ b/config-freebsd.hs @@ -28,7 +28,7 @@ hosts = -- An example freebsd host. freebsdbox :: Host freebsdbox = host "freebsdbox.example.com" - & os (System (FreeBSD (FBSDProduction FBSD102)) "amd64") + & osFreeBSD (FBSDProduction FBSD102) "amd64" & Pkg.update & Pkg.upgrade & Poudriere.poudriere poudriereZFS @@ -44,7 +44,7 @@ poudriereZFS = Poudriere.defaultConfig -- An example linux host. linuxbox :: Host linuxbox = host "linuxbox.example.com" - & os (System (Debian Unstable) "amd64") + & osDebian Unstable "amd64" & Apt.stdSourcesList & Apt.unattendedUpgrades & Apt.installed ["etckeeper"] @@ -59,9 +59,8 @@ linuxbox = host "linuxbox.example.com" -- A generic webserver in a Docker container. webserverContainer :: Docker.Container webserverContainer = Docker.container "webserver" (Docker.latestImage "debian") - & os (System (Debian (Stable "jessie")) "amd64") + & osDebian (Stable "jessie") "amd64" & Apt.stdSourcesList & Docker.publish "80:80" & Docker.volume "/var/www:/var/www" & Apt.serviceInstalledRunning "apache2" - |