diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-28 09:57:25 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-28 09:57:25 +0100 |
commit | a952acc4347d5d77b3c67283ca6249b49a6c9231 (patch) | |
tree | 60f36b7e69cabb0fc0675d08aec7afa08f58c656 /nixops/modules/websites/tools/mediagoblin | |
parent | 6533428a7b06fef01bebf1b8f93052884f77ea68 (diff) | |
download | Nix-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/mediagoblin')
-rw-r--r-- | nixops/modules/websites/tools/mediagoblin/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
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 { | |||
101 | }; | 101 | }; |
102 | 102 | ||
103 | services.myWebsites.tools.modules = [ | 103 | services.myWebsites.tools.modules = [ |
104 | "proxy" "proxy_http" "proxy_balancer" | 104 | "proxy" "proxy_http" |
105 | "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat" | ||
106 | ]; | 105 | ]; |
107 | users.users.wwwrun.extraGroups = [ "mediagoblin" ]; | 106 | users.users.wwwrun.extraGroups = [ "mediagoblin" ]; |
108 | security.acme.certs."eldiron".extraDomains."mgoblin.immae.eu" = null; | 107 | security.acme.certs."eldiron".extraDomains."mgoblin.immae.eu" = null; |
@@ -136,11 +135,8 @@ in { | |||
136 | ProxyPass /theme_static ! | 135 | ProxyPass /theme_static ! |
137 | ProxyPass /plugin_static ! | 136 | ProxyPass /plugin_static ! |
138 | ProxyPassMatch ^/.well-known/acme-challenge ! | 137 | ProxyPassMatch ^/.well-known/acme-challenge ! |
139 | ProxyPass / balancer://paster_server/ | 138 | ProxyPass / unix://${mediagoblin.socketsDir}/mediagoblin.sock|http://mgoblin.immae.eu/ |
140 | ProxyPassReverse / balancer://paster_server | 139 | ProxyPassReverse / unix://${mediagoblin.socketsDir}/mediagoblin.sock|http://mgoblin.immae.eu/ |
141 | <Proxy balancer://paster_server> | ||
142 | BalancerMember unix://${mediagoblin.socketsDir}/mediagoblin.sock|http:// | ||
143 | </Proxy> | ||
144 | '' ]; | 140 | '' ]; |
145 | }; | 141 | }; |
146 | }; | 142 | }; |