X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fdiaspora%2Fdefault.nix;h=b1cb6f2e5ea9c0693b081ffd5f6a1861271d506e;hb=3345e58db4e8364a9561dc3d488da2438aca982a;hp=ae870b082a2a4c892f185e4861e978951c89240a;hpb=01f21083a897b86bf148f1d2bb9c8edca4d3786a;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix
index ae870b0..b1cb6f2 100644
--- a/nixops/modules/websites/tools/diaspora/default.nix
+++ b/nixops/modules/websites/tools/diaspora/default.nix
@@ -5,6 +5,7 @@ let
env = myconfig.env.tools.diaspora;
};
+ root = "/run/current-system/webapps/tools_diaspora";
cfg = config.services.myWebsites.tools.diaspora;
in {
options.services.myWebsites.tools.diaspora = {
@@ -12,15 +13,15 @@ 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";
uid = config.ids.uids.diaspora;
group = "diaspora";
description = "Diaspora user";
- home = diaspora.railsRoot;
+ home = diaspora.varDir;
useDefaultShell = true;
packages = [ diaspora.gems pkgs.nodejs diaspora.gems.ruby ];
};
@@ -77,22 +78,21 @@ 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;
+ system.extraSystemBuilderCmds = ''
+ mkdir -p $out/webapps
+ ln -s ${diaspora.railsRoot}/public/ $out/webapps/tools_diaspora
+ '';
services.myWebsites.tools.vhostConfs.diaspora = {
certName = "eldiron";
hosts = [ "diaspora.immae.eu" ];
- root = "${diaspora.railsRoot}/public/";
+ root = root;
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
@@ -103,7 +103,7 @@ in {
Require all granted
-
+
Require all granted
Options -MultiViews