01/01: hydra: berlin: Honor our nginx configuration.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 0861d7ae8f7ca817a45ebb4bd2ec91bf04f08ccb
Author: Ludovic Courtès <address@hidden>
Date:   Wed May 1 18:31:33 2019 +0200

    hydra: berlin: Honor our nginx configuration.
    
    This is a followup to 49c30276ebc95a68b327008ba4698eb9dc87e79c.
    
    * hydra/berlin.scm (services): Add our NGINX-SERVICE-TYPE instance and
    remove use of 'modify-services', which was not matching anything.
---
 hydra/berlin.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index e9c984a..0e32fb5 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -216,11 +216,10 @@ fastcgi_param PHP_VALUE \"post_max_size = 16M
                                    (443 "127.0.0.1:443")))
              (tor-service)
 
-             (modify-services
-                 (frontend-services %sysadmins
-                                    #:systems '("x86_64-linux" "i686-linux"
-                                                "aarch64-linux")
-                                    #:motd %motd
-                                    #:max-jobs 20)
-               (nginx-service-type
-                config => %nginx-configuration)))))
+             (service nginx-service-type %nginx-configuration)
+
+             (frontend-services %sysadmins
+                                #:systems '("x86_64-linux" "i686-linux"
+                                            "aarch64-linux")
+                                #:motd %motd
+                                #:max-jobs 20))))