aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/tools/diaspora
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-28 09:57:25 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-28 09:57:25 +0100
commita952acc4347d5d77b3c67283ca6249b49a6c9231 (patch)
tree60f36b7e69cabb0fc0675d08aec7afa08f58c656 /nixops/modules/websites/tools/diaspora
parent6533428a7b06fef01bebf1b8f93052884f77ea68 (diff)
downloadNix-a952acc4347d5d77b3c67283ca6249b49a6c9231.tar.gz
Nix-a952acc4347d5d77b3c67283ca6249b49a6c9231.tar.zst
Nix-a952acc4347d5d77b3c67283ca6249b49a6c9231.zip
Cleanup balancers for httpd
Fixes https://git.immae.eu/mantisbt/view.php?id=91
Diffstat (limited to 'nixops/modules/websites/tools/diaspora')
-rw-r--r--nixops/modules/websites/tools/diaspora/default.nix9
1 files changed, 2 insertions, 7 deletions
diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix
index 8d62c7e..87faee8 100644
--- a/nixops/modules/websites/tools/diaspora/default.nix
+++ b/nixops/modules/websites/tools/diaspora/default.nix
@@ -77,8 +77,7 @@ in {
77 }; 77 };
78 78
79 services.myWebsites.tools.modules = [ 79 services.myWebsites.tools.modules = [
80 "headers" "proxy" "proxy_http" "proxy_balancer" 80 "headers" "proxy" "proxy_http"
81 "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat"
82 ]; 81 ];
83 security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null; 82 security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null;
84 services.myWebsites.tools.vhostConfs.diaspora = { 83 services.myWebsites.tools.vhostConfs.diaspora = {
@@ -88,11 +87,7 @@ in {
88 extraConfig = [ '' 87 extraConfig = [ ''
89 RewriteEngine On 88 RewriteEngine On
90 RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f 89 RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
91 RewriteRule ^/(.*)$ balancer://thinservers%{REQUEST_URI} [P,QSA,L] 90 RewriteRule ^/(.*)$ unix://${diaspora.railsSocket}|http://diaspora.immae.eu/%{REQUEST_URI} [P,NE,QSA,L]
92
93 <Proxy balancer://thinservers>
94 BalancerMember unix://${diaspora.railsSocket}|http://
95 </Proxy>
96 91
97 ProxyRequests Off 92 ProxyRequests Off
98 ProxyVia On 93 ProxyVia On