From 750fe5a43b957b91a26069cf8a4fe19fc7b2633c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 22 Oct 2021 20:07:14 +0200
Subject: Remove webappdirs

---
 modules/private/websites/tools/tools/adminer.nix      | 11 +++++------
 modules/private/websites/tools/tools/default.nix      | 19 +------------------
 .../private/websites/tools/tools/dmarc_reports.nix    |  3 +--
 modules/private/websites/tools/tools/dokuwiki.nix     |  3 +--
 modules/private/websites/tools/tools/grocy.nix        |  3 +--
 modules/private/websites/tools/tools/kanboard.nix     |  3 +--
 modules/private/websites/tools/tools/ldap.nix         |  3 +--
 modules/private/websites/tools/tools/phpbb.nix        |  3 +--
 modules/private/websites/tools/tools/rompr.nix        |  3 +--
 modules/private/websites/tools/tools/shaarli.nix      |  3 +--
 modules/private/websites/tools/tools/ttrss.nix        |  3 +--
 modules/private/websites/tools/tools/wallabag.nix     |  3 +--
 modules/private/websites/tools/tools/yourls.nix       |  3 +--
 13 files changed, 17 insertions(+), 46 deletions(-)

(limited to 'modules/private/websites/tools/tools')

diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix
index a4ba344..c280684 100644
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -1,4 +1,4 @@
-{ adminer, php74, myPhpPackages, lib, forcePhpSocket ? null }:
+{ webapps, php74, myPhpPackages, lib, forcePhpSocket ? null }:
 rec {
   activationScript = {
     deps = [ "httpd" ];
@@ -6,7 +6,7 @@ rec {
       install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/adminer
       '';
   };
-  webRoot = adminer;
+  webRoot = webapps.adminer;
   phpFpm = rec {
     user = apache.user;
     group = apache.group;
@@ -28,11 +28,10 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "_adminer";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
-      Alias /adminer ${root}
-      <Directory ${root}>
+      Alias /adminer ${webRoot}
+      <Directory ${webRoot}>
         DirectoryIndex index.php
         <FilesMatch "\.php$">
           SetHandler "proxy:unix:${if forcePhpSocket != null then forcePhpSocket else socket}|fcgi://localhost"
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 1f499fb..499ef91 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -2,9 +2,7 @@
 let
   flakeCompat = import ../../../../../lib/flake-compat.nix;
 
-  adminer = pkgs.callPackage ./adminer.nix {
-    inherit (pkgs.webapps) adminer;
-  };
+  adminer = pkgs.callPackage ./adminer.nix {};
   ympd = pkgs.callPackage ./ympd.nix {
     env = config.myEnv.tools.ympd;
   };
@@ -429,21 +427,6 @@ in {
       ldap = ldap.activationScript;
     };
 
-    services.websites.webappDirs = {
-      _adminer = adminer.webRoot;
-      "${dmarc-reports.apache.webappName}" = dmarc-reports.webRoot;
-      "${dokuwiki.apache.webappName}" = dokuwiki.webRoot;
-      "${phpbb.apache.webappName}" = phpbb.webRoot;
-      "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs";
-      "${rompr.apache.webappName}" = rompr.webRoot;
-      "${shaarli.apache.webappName}" = shaarli.webRoot;
-      "${ttrss.apache.webappName}" = ttrss.webRoot;
-      "${wallabag.apache.webappName}" = wallabag.webRoot;
-      "${yourls.apache.webappName}" = yourls.webRoot;
-      "${kanboard.apache.webappName}" = kanboard.webRoot;
-      "${grocy.apache.webappName}" = grocy.webRoot;
-    };
-
     services.websites.env.tools.watchPaths = [
       config.secrets.fullPaths."webapps/tools-shaarli"
     ];
diff --git a/modules/private/websites/tools/tools/dmarc_reports.nix b/modules/private/websites/tools/tools/dmarc_reports.nix
index 89da246..8a77b13 100644
--- a/modules/private/websites/tools/tools/dmarc_reports.nix
+++ b/modules/private/websites/tools/tools/dmarc_reports.nix
@@ -20,8 +20,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_dmarc_reports";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /dmarc-reports "${root}"
       <Directory "${root}">
diff --git a/modules/private/websites/tools/tools/dokuwiki.nix b/modules/private/websites/tools/tools/dokuwiki.nix
index 6175a68..1bcd852 100644
--- a/modules/private/websites/tools/tools/dokuwiki.nix
+++ b/modules/private/websites/tools/tools/dokuwiki.nix
@@ -25,8 +25,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_dokuwiki";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /dokuwiki "${root}"
       <Directory "${root}">
diff --git a/modules/private/websites/tools/tools/grocy.nix b/modules/private/websites/tools/tools/grocy.nix
index a98d8ac..3c33170 100644
--- a/modules/private/websites/tools/tools/grocy.nix
+++ b/modules/private/websites/tools/tools/grocy.nix
@@ -16,8 +16,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_grocy";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /grocy "${root}"
       <Directory "${root}">
diff --git a/modules/private/websites/tools/tools/kanboard.nix b/modules/private/websites/tools/tools/kanboard.nix
index b2e7b65..54bbe01 100644
--- a/modules/private/websites/tools/tools/kanboard.nix
+++ b/modules/private/websites/tools/tools/kanboard.nix
@@ -46,8 +46,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_kanboard";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
     Alias /kanboard "${root}"
     <Directory "${root}">
diff --git a/modules/private/websites/tools/tools/ldap.nix b/modules/private/websites/tools/tools/ldap.nix
index 14920f4..2ca59f7 100644
--- a/modules/private/websites/tools/tools/ldap.nix
+++ b/modules/private/websites/tools/tools/ldap.nix
@@ -36,8 +36,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_ldap";
-    root = "/run/current-system/webapps/${webappName}";
+    root = "${webRoot}/htdocs";
     vhostConf = socket: ''
       Alias /ldap "${root}"
       <Directory "${root}">
diff --git a/modules/private/websites/tools/tools/phpbb.nix b/modules/private/websites/tools/tools/phpbb.nix
index fa26069..e341a64 100644
--- a/modules/private/websites/tools/tools/phpbb.nix
+++ b/modules/private/websites/tools/tools/phpbb.nix
@@ -20,8 +20,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_phpbb";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /forum "${root}"
       <Directory "${root}">
diff --git a/modules/private/websites/tools/tools/rompr.nix b/modules/private/websites/tools/tools/rompr.nix
index 106164c..9765df5 100644
--- a/modules/private/websites/tools/tools/rompr.nix
+++ b/modules/private/websites/tools/tools/rompr.nix
@@ -13,8 +13,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "headers" "mime" "proxy_fcgi" ];
-    webappName = "tools_rompr";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /rompr ${root}
 
diff --git a/modules/private/websites/tools/tools/shaarli.nix b/modules/private/websites/tools/tools/shaarli.nix
index b7126cc..f63c722 100644
--- a/modules/private/websites/tools/tools/shaarli.nix
+++ b/modules/private/websites/tools/tools/shaarli.nix
@@ -16,8 +16,7 @@ in rec {
     user = "wwwrun";
     group = "wwwrun";
     modules =  [ "proxy_fcgi" "rewrite" "env" ];
-    webappName = "tools_shaarli";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /Shaarli "${root}"
 
diff --git a/modules/private/websites/tools/tools/ttrss.nix b/modules/private/websites/tools/tools/ttrss.nix
index f6abae9..bee26c8 100644
--- a/modules/private/websites/tools/tools/ttrss.nix
+++ b/modules/private/websites/tools/tools/ttrss.nix
@@ -96,8 +96,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_ttrss";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /ttrss "${root}"
       <Directory "${root}">
diff --git a/modules/private/websites/tools/tools/wallabag.nix b/modules/private/websites/tools/tools/wallabag.nix
index b6ad151..ceb061f 100644
--- a/modules/private/websites/tools/tools/wallabag.nix
+++ b/modules/private/websites/tools/tools/wallabag.nix
@@ -80,8 +80,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_wallabag";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /wallabag "${root}"
       <Directory "${root}">
diff --git a/modules/private/websites/tools/tools/yourls.nix b/modules/private/websites/tools/tools/yourls.nix
index 01ef548..3717520 100644
--- a/modules/private/websites/tools/tools/yourls.nix
+++ b/modules/private/websites/tools/tools/yourls.nix
@@ -44,8 +44,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_yourls";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /url "${root}"
       <Directory "${root}">
-- 
cgit v1.2.3