Move tools websites to stable web directories

9 files changed, 55 insertions, 27 deletions

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 2060c79..7781928 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -118,6 +118,18 @@ in {
       dokuwiki = dokuwiki.activationScript;
     };
 
+    system.extraSystemBuilderCmds = ''
+      mkdir -p $out/webapps
+      ln -s ${dokuwiki.webRoot} $out/webapps/${dokuwiki.apache.webappName}
+      ln -s ${ldap.webRoot}/htdocs $out/webapps/${ldap.apache.webappName}
+      ln -s ${rompr.webRoot} $out/webapps/${rompr.apache.webappName}
+      ln -s ${roundcubemail.webRoot} $out/webapps/${roundcubemail.apache.webappName}
+      ln -s ${shaarli.webRoot} $out/webapps/${shaarli.apache.webappName}
+      ln -s ${ttrss.webRoot} $out/webapps/${ttrss.apache.webappName}
+      ln -s ${wallabag.webRoot} $out/webapps/${wallabag.apache.webappName}
+      ln -s ${yourls.webRoot} $out/webapps/${yourls.apache.webappName}
+      '';
+
     nixpkgs.config.packageOverrides = oldpkgs: rec {
       ympd = oldpkgs.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json);
     };
diff --git a/nixops/modules/websites/tools/tools/dokuwiki.nix b/nixops/modules/websites/tools/tools/dokuwiki.nix
index 5affddb..ad1497f 100644
--- a/nixops/modules/websites/tools/tools/dokuwiki.nix
+++ b/nixops/modules/websites/tools/tools/dokuwiki.nix
@@ -55,13 +55,15 @@ let
         )}
       '';
     });
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_dokuwiki";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /dokuwiki "${webRoot}"
-        <Directory "${webRoot}">
+        Alias /dokuwiki "${root}"
+        <Directory "${root}">
           DirectoryIndex index.php
           <FilesMatch "\.php$">
             SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
diff --git a/nixops/modules/websites/tools/tools/ldap.nix b/nixops/modules/websites/tools/tools/ldap.nix
index 82615a7..6cde881 100644
--- a/nixops/modules/websites/tools/tools/ldap.nix
+++ b/nixops/modules/websites/tools/tools/ldap.nix
@@ -42,13 +42,15 @@ rec {
       ln -sf ${config} $out/config/config.php
     '';
   };
-  apache = {
+  apache = rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
+    webappName = "tools_ldap";
+    root = "/run/current-system/webapps/${webappName}";
     vhostConf = ''
-      Alias /ldap "${webRoot}/htdocs"
-      <Directory "${webRoot}/htdocs">
+      Alias /ldap "${root}"
+      <Directory "${root}">
         DirectoryIndex index.php
         <FilesMatch "\.php$">
           SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
diff --git a/nixops/modules/websites/tools/tools/rompr.nix b/nixops/modules/websites/tools/tools/rompr.nix
index 98c48a7..baee2eb 100644
--- a/nixops/modules/websites/tools/tools/rompr.nix
+++ b/nixops/modules/websites/tools/tools/rompr.nix
@@ -14,14 +14,16 @@ let
         ln -sf ../../../../../../${varDir}/albumart $out/albumart
       '';
     });
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "headers" "mime" "proxy_fcgi" ];
+      webappName = "tools_rompr";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /rompr ${webRoot}
+        Alias /rompr ${root}
 
-        <Directory ${webRoot}>
+        <Directory ${root}>
           Options Indexes FollowSymLinks
           DirectoryIndex index.php
           AllowOverride all
@@ -36,12 +38,12 @@ let
           </FilesMatch>
         </Directory>
 
-        <Directory ${webRoot}/albumart/small>
+        <Directory ${root}/albumart/small>
             Header Set Cache-Control "max-age=0, no-store"
             Header Set Cache-Control "no-cache, must-revalidate"
         </Directory>
 
-        <Directory ${webRoot}/albumart/asdownloaded>
+        <Directory ${root}/albumart/asdownloaded>
             Header Set Cache-Control "max-age=0, no-store"
             Header Set Cache-Control "no-cache, must-revalidate"
         </Directory>
diff --git a/nixops/modules/websites/tools/tools/roundcubemail.nix b/nixops/modules/websites/tools/tools/roundcubemail.nix
index 877ea8b..c0a1125 100644
--- a/nixops/modules/websites/tools/tools/roundcubemail.nix
+++ b/nixops/modules/websites/tools/tools/roundcubemail.nix
@@ -61,13 +61,15 @@ let
         )}
       '';
     };
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_roundcubemail";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-      Alias /roundcube "${webRoot}"
-      <Directory "${webRoot}">
+      Alias /roundcube "${root}"
+      <Directory "${root}">
           DirectoryIndex index.php
           AllowOverride All
           Options FollowSymlinks
diff --git a/nixops/modules/websites/tools/tools/shaarli.nix b/nixops/modules/websites/tools/tools/shaarli.nix
index 9f3779f..a43d677 100644
--- a/nixops/modules/websites/tools/tools/shaarli.nix
+++ b/nixops/modules/websites/tools/tools/shaarli.nix
@@ -40,14 +40,16 @@ in rec {
       ${varDir}/phpSessions
     '';
   webRoot = shaarli;
-  apache = {
+  apache = rec {
     user = "wwwrun";
     group = "wwwrun";
     modules =  [ "proxy_fcgi" "rewrite" "env" ];
+    webappName = "tools_shaarli";
+    root = "/run/current-system/webapps/${webappName}";
     vhostConf = ''
-      Alias /Shaarli "${webRoot}"
+      Alias /Shaarli "${root}"
 
-      <Directory "${webRoot}">
+      <Directory "${root}">
         SetEnv SHAARLI_LDAP_PASSWORD "${env.ldap.password}"
         SetEnv SHAARLI_LDAP_DN       "${env.ldap.dn}"
         SetEnv SHAARLI_LDAP_HOST     "ldaps://${env.ldap.host}"
diff --git a/nixops/modules/websites/tools/tools/ttrss.nix b/nixops/modules/websites/tools/tools/ttrss.nix
index 9e6f98d..c66b99d 100644
--- a/nixops/modules/websites/tools/tools/ttrss.nix
+++ b/nixops/modules/websites/tools/tools/ttrss.nix
@@ -128,13 +128,15 @@ let
         )}
       '';
     });
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_ttrss";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /ttrss "${webRoot}"
-        <Directory "${webRoot}">
+        Alias /ttrss "${root}"
+        <Directory "${root}">
           DirectoryIndex index.php
           <FilesMatch "\.php$">
             SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
diff --git a/nixops/modules/websites/tools/tools/wallabag.nix b/nixops/modules/websites/tools/tools/wallabag.nix
index 1c08bbf..cd38e19 100644
--- a/nixops/modules/websites/tools/tools/wallabag.nix
+++ b/nixops/modules/websites/tools/tools/wallabag.nix
@@ -125,13 +125,15 @@ let
     webRoot = "${webappDir}/web";
     # Domain migration: Table wallabag_entry contains whole
     # https://tools.immae.eu/wallabag domain name in preview_picture
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_wallabag";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /wallabag "${webRoot}"
-        <Directory "${webRoot}">
+        Alias /wallabag "${root}"
+        <Directory "${root}">
           AllowOverride None
           Require all granted
           # For OAuth (apps)
@@ -148,7 +150,7 @@ let
             RewriteRule ^(.*)$ app.php [QSA,L]
           </IfModule>
         </Directory>
-        <Directory "${webRoot}/bundles">
+        <Directory "${root}/bundles">
           <IfModule mod_rewrite.c>
             RewriteEngine Off
           </IfModule>
diff --git a/nixops/modules/websites/tools/tools/yourls.nix b/nixops/modules/websites/tools/tools/yourls.nix
index 66dd2fd..b12edfa 100644
--- a/nixops/modules/websites/tools/tools/yourls.nix
+++ b/nixops/modules/websites/tools/tools/yourls.nix
@@ -52,13 +52,15 @@ let
         )}
       '';
     });
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_yourls";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /url "${webRoot}"
-        <Directory "${webRoot}">
+        Alias /url "${root}"
+        <Directory "${root}">
           <FilesMatch "\.php$">
             SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
           </FilesMatch>