summaryrefslogtreecommitdiff
path: root/config-simple.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 16:43:18 -0400
committerJoey Hess2016-03-07 16:43:18 -0400
commit223c35fe5f85f94d03e7ba3a03b74af3e7eada85 (patch)
tree2d5620323df0a302b7583f99c9afe4ff975edc03 /config-simple.hs
parent88da45113d1b8dc13494706fade0ca0beef1738a (diff)
split config-freebsd back out
Let's keep config-simple quite simple; naive users start by modifying it and probably don't want to be faced with freebsd example, unless they're freebsd users.
Diffstat (limited to 'config-simple.hs')
-rw-r--r--config-simple.hs22
1 files changed, 0 insertions, 22 deletions
diff --git a/config-simple.hs b/config-simple.hs
index ac1b115f..21accd18 100644
--- a/config-simple.hs
+++ b/config-simple.hs
@@ -1,8 +1,6 @@
-- This is the main configuration file for Propellor, and is used to build
-- the propellor program.
-import Data.String (fromString)
-
import Propellor
import qualified Propellor.Property.File as File
import qualified Propellor.Property.Apt as Apt
@@ -15,9 +13,6 @@ import qualified Propellor.Property.User as User
--import qualified Propellor.Property.Hostname as Hostname
--import qualified Propellor.Property.Tor as Tor
import qualified Propellor.Property.Docker as Docker
-import qualified Propellor.Property.FreeBSD.Pkg as Pkg
-import qualified Propellor.Property.ZFS as ZFS
-import qualified Propellor.Property.FreeBSD.Poudriere as Poudriere
main :: IO ()
main = defaultMain hosts
@@ -26,7 +21,6 @@ main = defaultMain hosts
hosts :: [Host]
hosts =
[ mybox
- , freebsd
]
-- An example host.
@@ -52,19 +46,3 @@ webserverContainer = Docker.container "webserver" (Docker.latestImage "debian")
& Docker.publish "80:80"
& Docker.volume "/var/www:/var/www"
& Apt.serviceInstalledRunning "apache2"
-
-poudriereZFS :: Poudriere.Poudriere
-poudriereZFS = Poudriere.defaultConfig {
- Poudriere._zfs = Just $ Poudriere.PoudriereZFS
- (ZFS.ZFS (fromString "zroot") (fromString "poudriere"))
- (ZFS.fromList [ZFS.Mountpoint (fromString "/poudriere"), ZFS.ACLInherit ZFS.AIPassthrough])
- }
-
--- An example host.
-freebsd :: Host
-freebsd = host "192.168.56.10"
- & os (System (FreeBSD (FBSDProduction FBSD102)) "amd64")
- & Pkg.update
- & Pkg.upgrade
- & Poudriere.poudriere poudriereZFS
- & Poudriere.jail (Poudriere.Jail "formail" (fromString "10.2-RELEASE") (fromString "amd64"))