summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-03-01 18:00:27 -0400
committerJoey Hess2017-03-01 18:00:27 -0400
commit1f09af0026ab8c5d070e66108529624e392299e1 (patch)
tree817bb4128152cdad3792a54ebc986544bdb7a6d9
parent42b6aca8c91701c87410a404e5d0be253b72ac4c (diff)
parent3edde4036017ee09c5e43d94097fdbdc9356a7b3 (diff)
Merge branch 'joeyconfig'
l---------config.hs2
-rw-r--r--joeyconfig.hs6
-rw-r--r--privdata/relocate1
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
4 files changed, 7 insertions, 4 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 e9e47179..e1374e4b 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -249,14 +249,16 @@ honeybee = host "honeybee.kitenet.net" $ props
-- No hardware clock.
& Apt.serviceInstalledRunning "ntp"
+ -- Runs only on weekdays.
& Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
GitAnnexBuilder.armAutoBuilder
Unstable ARMEL Nothing
- (Cron.Times "15 6 * * *") "22h")
+ (Cron.Times "15 6 * * 2-5") "23h")
+ -- Runs only on weekends.
& Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
GitAnnexBuilder.stackAutoBuilder
(Stable "jessie") ARMEL (Just "ancient")
- (Cron.Times "15 18 * * *") "22h")
+ (Cron.Times "15 6 * * 6-7") "23h")
-- 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
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 2da1cc05..c4f0e352 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -236,7 +236,7 @@ gitServer hosts = propertyList "git.kitenet.net setup" $ props
& Git.daemonRunning "/srv/git"
& "/etc/gitweb.conf" `File.containsLines`
[ "$projectroot = '/srv/git';"
- , "@git_base_url_list = ('git://git.kitenet.net', 'http://git.kitenet.net/git', 'https://git.kitenet.net/git', 'ssh://git.kitenet.net/srv/git');"
+ , "@git_base_url_list = ('https://git.joeyh.name/git', 'git://git.joeyh.name', 'ssh://git.joeyh.name/srv/git');"
, "# disable snapshot download; overloads server"
, "$feature{'snapshot'}{'default'} = [];"
]