[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: hydra: berlin: Use files from this repository.
From: |
Ricardo Wurmus |
Subject: |
01/01: hydra: berlin: Use files from this repository. |
Date: |
Thu, 20 Jul 2017 17:50:28 -0400 (EDT) |
rekado pushed a commit to branch master
in repository maintenance.
commit 641142d10a1737a5d49ad32d3333a5e188b11de5
Author: Ricardo Wurmus <address@hidden>
Date: Thu Jul 20 23:49:14 2017 +0200
hydra: berlin: Use files from this repository.
* hydra/berlin.scm (maintenance-file): Remove procedure.
(%sysadmins, %nginx-config, %cuirass-specs): Use local-file.
---
hydra/berlin.scm | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 44b4796..0d34100 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -5,23 +5,20 @@
(use-service-modules base networking admin mcron shepherd ssh web cuirass)
(use-package-modules admin emacs linux ssh tls vim package-management web wget
ci)
-(define (maintenance-file name)
- (local-file (string-append "/root/maintenance/hydra/" name)))
-
(define %sysadmins
;; The sysadmins.
(list (sysadmin (name "ludo")
(full-name "Ludovic Courtès")
- (lsh-public-key (maintenance-file "keys/lsh/ludo.pub")))
+ (lsh-public-key (local-file "keys/lsh/ludo.pub")))
(sysadmin (name "rekado")
(full-name "Ricardo Wurmus")
- (lsh-public-key (maintenance-file "keys/lsh/rekado.pub")))
+ (lsh-public-key (local-file "keys/lsh/rekado.pub")))
(sysadmin (name "andreas")
(full-name "Andreas Enge")
- (lsh-public-key (maintenance-file "keys/lsh/andreas.pub")))
+ (lsh-public-key (local-file "keys/lsh/andreas.pub")))
;; (sysadmin (name "bi-admin")
;; (full-name "MDC admin")
- ;; (lsh-public-key (maintenance-file
"keys/lsh/bi-admin.pub")))
+ ;; (lsh-public-key (local-file "keys/lsh/bi-admin.pub")))
))
@@ -97,13 +94,14 @@
(mkdir #$output)
(chdir #$output)
- (symlink #$(local-file "/root/berlin-nginx.conf")
"berlin.conf")
+ (symlink #$(local-file "nginx/berlin.conf")
+ "berlin.conf")
(copy-file #$(local-file
-
"/root/maintenance/hydra/nginx/bayfront-locations.conf")
+ "nginx/bayfront-locations.conf")
"berlin-locations.conf")
(substitute* "berlin-locations.conf"
(("@WWWROOT@")
- #$(local-file "/root/maintenance/hydra/nginx/html"
#:recursive? #t)))))))
+ #$(local-file "nginx/html" #:recursive? #t)))))))
(define %nginx-mime-types
;; Provide /etc/nginx/mime.types (and a bunch of other files.)
@@ -136,7 +134,7 @@
;; the 'evaluate' command of Cuirass loads it with
;; 'primitive-load'.
;; Use our own variant of Cuirass' 'examples/gnu-system.scm'.
- (#:file . #$(local-file
"/root/maintenance/hydra/cuirass-jobs.scm"))
+ (#:file . #$(local-file "cuirass-jobs.scm"))
(#:no-compile? #t) ;don't try to run ./bootstrap etc.
(#:proc . hydra-jobs)