summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2014-06-05 17:30:39 -0400
committerJoey Hess2014-06-05 17:30:39 -0400
commitdc25de234c822f7139e0e11d0c62760ceca5bf83 (patch)
treeb66ed6bcb1344ebe1d99233aaa0b9bdf80463ba5 /doc
parent4fdd1b9ea4082c4005ded2bf650f349090da6aea (diff)
parentc0616ca8ce34ddb3d86131b89a38086110a604b3 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'doc')
-rw-r--r--doc/haskell_newbie.mdwn16
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/haskell_newbie.mdwn b/doc/haskell_newbie.mdwn
index 8e14b351..f1a81e40 100644
--- a/doc/haskell_newbie.mdwn
+++ b/doc/haskell_newbie.mdwn
@@ -41,22 +41,24 @@ stub to go run itself. No need to ever change this part.
hosts :: [Host]
hosts =
[ host "mybox.example.com"
- & Apt.stdSourcesList Unstable
+ & os (System (Debian Unstable) "amd64")
+ & Apt.stdSourcesList
, host "server.example.com"
- & Apt.stdSourcesList Stable
+ & os (System (Debian Stable) "amd64")
+ & Apt.stdSourcesList
& Apt.installed ["ssh"]
]
"""]]
This defines a list of hosts, with two hosts in it.
-The configuration for the mybox host tells propellor to configure its
-`/etc/apt/sources.list` to use Debian `Unstable`.
-Of course you might want to change that to `Stable`.
+The configuration for the mybox host first tells propellor what
+OS it's running. Then the `stdSourcesList` line tells propellor to
+configure its `/etc/apt/sources.list`, using its OS.
+(Of course you might want to change that `Unstable` to `Stable`.)
Each property of the host is prefixed with an "&" operator. This just makes
-a list of properties. Above, the first host has only 1 property, while
-the second host has 2 properties.
+a list of properties.
Some other properties you may find in your config.hs, or want to add: