From 4a42562f8ae40994fd80c9e6fd7f16cd3ac643d5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Feb 2017 14:05:30 -0400 Subject: setting up joeyconfig after merge --- config.hs | 2 +- privdata/relocate | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 privdata/relocate 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/privdata/relocate b/privdata/relocate new file mode 100644 index 00000000..271692d8 --- /dev/null +++ b/privdata/relocate @@ -0,0 +1 @@ +.joeyconfig -- cgit v1.2.3 From 5bc65afa0ffeb081d36a2db4d5bf32422a213132 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Feb 2017 15:07:04 -0400 Subject: run armel and armelancient builds on different days It takes more than 12 hours per build, and two builds running at once will probably fail. --- joeyconfig.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From 3edde4036017ee09c5e43d94097fdbdc9356a7b3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Mar 2017 18:00:21 -0400 Subject: use git.joeyh.name --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 445bce07..4de6c5d3 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'} = [];" ] -- cgit v1.2.3