Cleanup balancers for httpd

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

diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix
index ae870b082a2a4c892f185e4861e978951c89240a..87faee848e4d6a2dc7e7dbb01ff13c34c06a97eb 100644 (file)
--- a/nixops/modules/websites/tools/diaspora/default.nix
+++ b/nixops/modules/websites/tools/diaspora/default.nix
@@ -12,8 +12,8 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    ids.uids.diaspora = 398;
-    ids.gids.diaspora = 398;
+    ids.uids.diaspora = myconfig.env.tools.diaspora.user.uid;
+    ids.gids.diaspora = myconfig.env.tools.diaspora.user.gid;
 
     users.users.diaspora = {
       name = "diaspora";
@@ -77,8 +77,7 @@ in {
     };
 
     services.myWebsites.tools.modules = [
-      "headers" "proxy" "proxy_http" "proxy_balancer"
-      "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat"
+      "headers" "proxy" "proxy_http"
     ];
     security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null;
     services.myWebsites.tools.vhostConfs.diaspora = {
@@ -88,11 +87,7 @@ in {
       extraConfig = [ ''
         RewriteEngine On
         RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
-        RewriteRule ^/(.*)$ balancer://thinservers%{REQUEST_URI} [P,QSA,L]
-
-        <Proxy balancer://thinservers>
-            BalancerMember unix://${diaspora.railsSocket}|http://
-        </Proxy>
+        RewriteRule ^/(.*)$ unix://${diaspora.railsSocket}|http://diaspora.immae.eu/%{REQUEST_URI} [P,NE,QSA,L]
 
         ProxyRequests Off
         ProxyVia On