summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/README.mdwn4
-rw-r--r--doc/download.mdwn5
-rw-r--r--doc/index.mdwn2
-rw-r--r--doc/install.mdwn3
-rw-r--r--joeyconfig.hs11
5 files changed, 14 insertions, 11 deletions
diff --git a/doc/README.mdwn b/doc/README.mdwn
index 31d222c1..ea622b3a 100644
--- a/doc/README.mdwn
+++ b/doc/README.mdwn
@@ -12,8 +12,8 @@ repository to each host it manages, in a
[components](http://propellor.branchable.com/components/)
for details.
-Properties are defined using Haskell. Edit `~/.propellor/config.hs`
-to get started. There is fairly complete
+Properties are defined using Haskell in the file `~/.propellor/config.hs`.
+There is fairly complete
[API documentation](http://hackage.haskell.org/package/propellor/),
which includes many built-in Properties for dealing with
[Apt](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Apt.html)
diff --git a/doc/download.mdwn b/doc/download.mdwn
new file mode 100644
index 00000000..6fe1ca33
--- /dev/null
+++ b/doc/download.mdwn
@@ -0,0 +1,5 @@
+Propellor's source code and some example configs are in a git repository:
+
+`git clone git://propellor.branchable.com/propellor`
+
+See the [[README]] for details on installing and configuring propellor.
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 52c23021..1e3af9dd 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,7 +1,7 @@
[[!meta title="propellor: deploying properties to hosts with haskell"]]
[[!sidebar content="""
-[[Install]]
+[[Download]]
[API documentation](http://hackage.haskell.org/package/propellor)
[[Other Documentation|documentation]]
[Sample config file](http://git.joeyh.name/?p=propellor.git;a=blob;f=joeyconfig.hs)
diff --git a/doc/install.mdwn b/doc/install.mdwn
deleted file mode 100644
index 8db966f1..00000000
--- a/doc/install.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-`git clone git://propellor.branchable.com/propellor`
-
-Propellor is also available in Debian.
diff --git a/joeyconfig.hs b/joeyconfig.hs
index e1374e4b..17ad6e4f 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -164,7 +164,7 @@ oyster :: Host
oyster = host "oyster.kitenet.net" $ props
& standardSystem Unstable X86_64
[ "Unreliable server. Anything here may be lost at any time!" ]
- & ipv4 "64.137.221.146"
+ & ipv4 "45.62.245.55"
& CloudAtCost.decruft
& Ssh.hostKeys hostContext
@@ -252,13 +252,14 @@ honeybee = host "honeybee.kitenet.net" $ props
-- Runs only on weekdays.
& Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
GitAnnexBuilder.armAutoBuilder
- Unstable ARMEL Nothing
- (Cron.Times "15 6 * * 2-5") "23h")
+ Unstable ARMEL Nothing weekends "23h")
-- Runs only on weekends.
& Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
GitAnnexBuilder.stackAutoBuilder
- (Stable "jessie") ARMEL (Just "ancient")
- (Cron.Times "15 6 * * 6-7") "23h")
+ (Stable "jessie") ARMEL (Just "ancient") weekdays "23h")
+ where
+ weekdays = Cron.Times "15 6 * * 2-5"
+ weekends = Cron.Times "15 6 * * 6-7"
-- This is not a complete description of kite, since it's a
-- multiuser system with eg, user passwords that are not deployed