Refactor websites

2 files changed, 60 insertions, 62 deletions

diff --git a/modules/private/websites/capitaines/landing_pages.nix b/modules/private/websites/capitaines/landing_pages.nix
new file mode 100644
index 0000000..b94a398
--- /dev/null
+++ b/modules/private/websites/capitaines/landing_pages.nix
@@ -0,0 +1,60 @@
+{ lib, config,  ... }:
+let
+  cfg = config.myServices.websites.capitaines.landing_pages;
+  webappdirs = config.services.websites.webappDirsPaths;
+  certName = "capitaines";
+  domain = "capitaines.fr";
+in {
+  options.myServices.websites.capitaines.landing_pages.enable = lib.mkEnableOption "enable Capitaines's landing pages";
+
+  config = lib.mkIf cfg.enable {
+    services.websites.webappDirs.capitaines_mastodon = ./mastodon_static;
+    services.websites.env.production.vhostConfs.capitaines_mastodon = rec {
+      inherit certName;
+      certMainHost = "mastodon.${domain}";
+      hosts        = [ certMainHost ];
+      root         = webappdirs.capitaines_mastodon;
+      extraConfig  = [
+        ''
+        ErrorDocument 404 /index.html
+        <Directory ${webappdirs.capitaines_mastodon}>
+          DirectoryIndex index.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          Require all granted
+        </Directory>
+          ''
+      ];
+    };
+
+    services.websites.webappDirs.capitaines_discourse = ./discourse_static;
+    services.websites.env.production.vhostConfs.capitaines_discourse = {
+      inherit certName;
+      addToCerts   = true;
+      hosts        = [ "discourse.${domain}" ];
+      root         = webappdirs.capitaines_discourse;
+      extraConfig  = [
+        ''
+        ErrorDocument 404 /index.html
+        <Directory ${webappdirs.capitaines_discourse}>
+          DirectoryIndex index.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          Require all granted
+        </Directory>
+          ''
+      ];
+    };
+
+    services.websites.env.production.vhostConfs.capitaines = {
+      inherit certName;
+      addToCerts = true;
+      hosts      = [ domain ];
+      root       = webappdirs._www;
+      extraConfig = [ ''
+        <Directory ${webappdirs._www}>
+          DirectoryIndex index.htm
+          Require all granted
+        </Directory>
+        '' ];
+    };
+  };
+}
diff --git a/modules/private/websites/capitaines/production.nix b/modules/private/websites/capitaines/production.nix
deleted file mode 100644
index ee1698b..0000000
--- a/modules/private/websites/capitaines/production.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib, pkgs, config,  ... }:
-let
-  cfg = config.myServices.websites.capitaines.production;
-  env = config.myEnv.websites.capitaines;
-in {
-  options.myServices.websites.capitaines.production.enable = lib.mkEnableOption "enable Capitaines's website";
-
-  config = lib.mkIf cfg.enable {
-    myServices.websites.webappDirs.capitaines_mastodon = ./mastodon_static;
-    services.websites.env.production.vhostConfs.capitaines_mastodon = let
-      root = "/run/current-system/webapps/capitaines_mastodon";
-    in {
-      certName     = "capitaines";
-      certMainHost = "mastodon.capitaines.fr";
-      hosts        = [ "mastodon.capitaines.fr" ];
-      root         = root;
-      extraConfig  = [
-        ''
-        ErrorDocument 404 /index.html
-        <Directory ${root}>
-          DirectoryIndex index.html
-          Options Indexes FollowSymLinks MultiViews Includes
-          Require all granted
-        </Directory>
-          ''
-      ];
-    };
-
-    myServices.websites.webappDirs.capitaines_discourse = ./discourse_static;
-    services.websites.env.production.vhostConfs.capitaines_discourse = let
-      root = "/run/current-system/webapps/capitaines_discourse";
-    in {
-      certName     = "capitaines";
-      addToCerts   = true;
-      hosts        = [ "discourse.capitaines.fr" ];
-      root         = root;
-      extraConfig  = [
-        ''
-        ErrorDocument 404 /index.html
-        <Directory ${root}>
-          DirectoryIndex index.html
-          Options Indexes FollowSymLinks MultiViews Includes
-          Require all granted
-        </Directory>
-          ''
-      ];
-    };
-
-    services.websites.env.production.vhostConfs.capitaines = {
-      certName   = "capitaines";
-      addToCerts = true;
-      hosts      = [ "capitaines.fr" ];
-      root       = "/run/current-system/webapps/_www";
-      extraConfig = [ ''
-        <Directory /run/current-system/webapps/_www>
-          DirectoryIndex index.htm
-          Require all granted
-        </Directory>
-        '' ];
-    };
-  };
-}