summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-03-07 11:34:30 -0400
committerJoey Hess2017-03-07 11:34:30 -0400
commit1e879fb27290334ee66f551c9c93aa08cb05490d (patch)
tree64a82eab79ac8677589a4c60c7338b1c64bdafa7
parent89ad454e01bcba341366aac3cfef66cfc1b918ea (diff)
parente3cb320d1b2e000274ac0d61b48c2a57a08f1c89 (diff)
Merge branch 'joeyconfig'
l---------config.hs2
-rw-r--r--joeyconfig.hs11
-rw-r--r--privdata/relocate1
3 files changed, 8 insertions, 6 deletions
diff --git a/config.hs b/config.hs
index ec313725..97d90636 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+joeyconfig.hs \ No newline at end of file
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
diff --git a/privdata/relocate b/privdata/relocate
new file mode 100644
index 00000000..271692d8
--- /dev/null
+++ b/privdata/relocate
@@ -0,0 +1 @@
+.joeyconfig