From a952acc4347d5d77b3c67283ca6249b49a6c9231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 28 Jan 2019 09:57:25 +0100 Subject: Cleanup balancers for httpd Fixes https://git.immae.eu/mantisbt/view.php?id=91 --- nixops/modules/websites/tools/diaspora/default.nix | 9 ++------ nixops/modules/websites/tools/ether/default.nix | 2 -- nixops/modules/websites/tools/mastodon/default.nix | 24 +++++----------------- .../modules/websites/tools/mediagoblin/default.nix | 10 +++------ 4 files changed, 10 insertions(+), 35 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 { }; 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] - - - BalancerMember unix://${diaspora.railsSocket}|http:// - + RewriteRule ^/(.*)$ unix://${diaspora.railsSocket}|http://diaspora.immae.eu/%{REQUEST_URI} [P,NE,QSA,L] ProxyRequests Off ProxyVia On diff --git a/nixops/modules/websites/tools/ether/default.nix b/nixops/modules/websites/tools/ether/default.nix index 5ee3433..c4a9932 100644 --- a/nixops/modules/websites/tools/ether/default.nix +++ b/nixops/modules/websites/tools/ether/default.nix @@ -75,8 +75,6 @@ in { ProxyPreserveHost On ProxyPass / http://localhost:${etherpad.listenPort}/ ProxyPassReverse / http://localhost:${etherpad.listenPort}/ - ProxyPass /socket.io ws://localhost:${etherpad.listenPort}/socket.io - ProxyPassReverse /socket.io ws://localhost:${etherpad.listenPort}/socket.io Options FollowSymLinks MultiViews AllowOverride None diff --git a/nixops/modules/websites/tools/mastodon/default.nix b/nixops/modules/websites/tools/mastodon/default.nix index 3740a49..0aaff70 100644 --- a/nixops/modules/websites/tools/mastodon/default.nix +++ b/nixops/modules/websites/tools/mastodon/default.nix @@ -135,8 +135,7 @@ in { }; services.myWebsites.tools.modules = [ - "headers" "proxy" "proxy_wstunnel" "proxy_http" "proxy_balancer" - "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat" + "headers" "proxy" "proxy_wstunnel" "proxy_http" ]; security.acme.certs."eldiron".extraDomains."mastodon.immae.eu" = null; services.myWebsites.tools.vhostConfs.mastodon = { @@ -167,23 +166,10 @@ in { ProxyPassMatch ^(/.*\.(png|ico|gif)$) ! ProxyPassMatch ^/(assets|avatars|emoji|headers|packs|sounds|system|.well-known/acme-challenge) ! - ProxyPassMatch /api/v1/streaming/(.+)$ balancer://node_servers_http/api/v1/streaming/$1 - ProxyPass /api/v1/streaming/ balancer://node_servers/ - ProxyPassReverse /api/v1/streaming/ balancer://node_servers/ - ProxyPass / balancer://puma_servers/ - ProxyPassReverse / balancer://puma_servers/ - - - BalancerMember unix://${mastodon.railsSocket}|http:// - - - - BalancerMember unix://${mastodon.nodeSocket}|ws://localhost - - - - BalancerMember unix://${mastodon.nodeSocket}|http://localhost - + RewriteRule ^/api/v1/streaming/(.+)$ unix://${mastodon.nodeSocket}|http://mastodon.immae.eu/api/v1/streaming/$1 [P,NE,QSA,L] + RewriteRule ^/api/v1/streaming/$ unix://${mastodon.nodeSocket}|ws://mastodon.immae.eu/ [P,NE,QSA,L] + ProxyPass / unix://${mastodon.railsSocket}|http://mastodon.immae.eu/ + ProxyPassReverse / unix://${mastodon.railsSocket}|http://mastodon.immae.eu/ Alias /system ${mastodon.varDir} diff --git a/nixops/modules/websites/tools/mediagoblin/default.nix b/nixops/modules/websites/tools/mediagoblin/default.nix index 90b115e..54c0478 100644 --- a/nixops/modules/websites/tools/mediagoblin/default.nix +++ b/nixops/modules/websites/tools/mediagoblin/default.nix @@ -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 - - BalancerMember unix://${mediagoblin.socketsDir}/mediagoblin.sock|http:// - + ProxyPass / unix://${mediagoblin.socketsDir}/mediagoblin.sock|http://mgoblin.immae.eu/ + ProxyPassReverse / unix://${mediagoblin.socketsDir}/mediagoblin.sock|http://mgoblin.immae.eu/ '' ]; }; }; -- cgit v1.2.3