05/05: hydra: berlin: Use new nginx-configuration.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit a94e1be87429b943ad9e0ffcddc84bb889711c2b
Author: Ricardo Wurmus <address@hidden>
Date:   Sat Dec 29 11:16:34 2018 +0100

    hydra: berlin: Use new nginx-configuration.
    
    * hydra/berlin.scm <services>: Override nginx-service-type
    configuration.
---
 hydra/berlin.scm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 4171632..1b8f8bf 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -18,6 +18,7 @@
                   (full-name "Andreas Enge")
                   (ssh-public-key (local-file "keys/ssh/andreas.pub")))))
 
+;; TODO: We don't use this any more.
 (define %nginx-config
   ;; Our nginx configuration directory.  It expects 'guix publish' to be
   ;; running on port 3000.
@@ -37,6 +38,8 @@
                          (("@WWWROOT@")
                           #$(local-file "nginx/html/berlin" #:recursive? 
#t)))))))
 
+(include "nginx/berlin.scm")
+
 
 
 ;;;
@@ -182,10 +185,14 @@ Happy hacking!\n"))
                                    (443 "127.0.0.1:443")))
              (tor-service)
 
-             (frontend-services %sysadmins
-                                #:systems '("x86_64-linux" "i686-linux"
-                                            "aarch64-linux")
-                                #:motd %motd
-                                #:nginx-config-file
-                                (file-append %nginx-config "/berlin.conf")
-                                #:max-jobs 20))))
+             (modify-services
+                 (frontend-services %sysadmins
+                                    #:systems '("x86_64-linux" "i686-linux"
+                                                "aarch64-linux")
+                                    #:motd %motd
+                                    ;; We don't use this.
+                                    #:nginx-config-file
+                                    (file-append %nginx-config "/berlin.conf")
+                                    #:max-jobs 20)
+               (nginx-service-type
+                config => %nginx-configuration)))))