aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/tools/diaspora/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixops/modules/websites/tools/diaspora/default.nix')
-rw-r--r--nixops/modules/websites/tools/diaspora/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix
index 87faee8..cd35385 100644
--- a/nixops/modules/websites/tools/diaspora/default.nix
+++ b/nixops/modules/websites/tools/diaspora/default.nix
@@ -5,6 +5,7 @@ let
5 env = myconfig.env.tools.diaspora; 5 env = myconfig.env.tools.diaspora;
6 }; 6 };
7 7
8 root = "/run/current-system/webapps/tools_diaspora";
8 cfg = config.services.myWebsites.tools.diaspora; 9 cfg = config.services.myWebsites.tools.diaspora;
9in { 10in {
10 options.services.myWebsites.tools.diaspora = { 11 options.services.myWebsites.tools.diaspora = {
@@ -80,10 +81,14 @@ in {
80 "headers" "proxy" "proxy_http" 81 "headers" "proxy" "proxy_http"
81 ]; 82 ];
82 security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null; 83 security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null;
84 system.extraSystemBuilderCmds = ''
85 mkdir -p $out/webapps
86 ln -s ${diaspora.railsRoot}/public/ $out/webapps/tools_diaspora
87 '';
83 services.myWebsites.tools.vhostConfs.diaspora = { 88 services.myWebsites.tools.vhostConfs.diaspora = {
84 certName = "eldiron"; 89 certName = "eldiron";
85 hosts = [ "diaspora.immae.eu" ]; 90 hosts = [ "diaspora.immae.eu" ];
86 root = "${diaspora.railsRoot}/public/"; 91 root = root;
87 extraConfig = [ '' 92 extraConfig = [ ''
88 RewriteEngine On 93 RewriteEngine On
89 RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f 94 RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
@@ -98,7 +103,7 @@ in {
98 Require all granted 103 Require all granted
99 </Proxy> 104 </Proxy>
100 105
101 <Directory ${diaspora.railsRoot}/public> 106 <Directory ${root}>
102 Require all granted 107 Require all granted
103 Options -MultiViews 108 Options -MultiViews
104 </Directory> 109 </Directory>