Cleanup balancers for httpd

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / mediagoblin / default.nix

diff --git a/nixops/modules/websites/tools/mediagoblin/default.nix b/nixops/modules/websites/tools/mediagoblin/default.nix
index 5f60503d32e204272283dc2d9c434139a402dd9e..54c0478d022cc6779466134f615f134d7fb6a70d 100644 (file)
--- a/nixops/modules/websites/tools/mediagoblin/default.nix
+++ b/nixops/modules/websites/tools/mediagoblin/default.nix
@@ -12,8 +12,8 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    ids.uids.mediagoblin = 397;
-    ids.gids.mediagoblin = 397;
+    ids.uids.mediagoblin = myconfig.env.tools.mediagoblin.user.uid;
+    ids.gids.mediagoblin = myconfig.env.tools.mediagoblin.user.gid;
 
     users.users.mediagoblin = {
       name = "mediagoblin";
@@ -101,8 +101,7 @@ in {
     };
 
     services.myWebsites.tools.modules = [
-      "proxy" "proxy_http" "proxy_balancer"
-      "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat"
+      "proxy" "proxy_http"
     ];
     users.users.wwwrun.extraGroups = [ "mediagoblin" ];
     security.acme.certs."eldiron".extraDomains."mgoblin.immae.eu" = null;
@@ -136,11 +135,8 @@ in {
         ProxyPass /theme_static !
         ProxyPass /plugin_static !
         ProxyPassMatch ^/.well-known/acme-challenge !
-        ProxyPass / balancer://paster_server/
-        ProxyPassReverse / balancer://paster_server
-        <Proxy balancer://paster_server>
-          BalancerMember unix://${mediagoblin.socketsDir}/mediagoblin.sock|http://
-        </Proxy>
+        ProxyPass / unix://${mediagoblin.socketsDir}/mediagoblin.sock|http://mgoblin.immae.eu/
+        ProxyPassReverse / unix://${mediagoblin.socketsDir}/mediagoblin.sock|http://mgoblin.immae.eu/
       '' ];
     };
   };