Add patch pages

diff --git a/deploy/flake.lock b/deploy/flake.lock
index f82d371d86cfa5406cc6373c651f6bdd40a4a499..984a670c75d8d1eba305594347e2e8c27ece3d4b 100644 (file)
--- a/deploy/flake.lock
+++ b/deploy/flake.lock
@@ -2783,7 +2783,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-YCnvttJd1LKqwvXPN68mBrm8o5UG+uatTnjiboaPHEQ=",
+        "narHash": "sha256-BSLDSxgA1/hX6EBS+dDIlBB3ogb3d8hP6gLNb99Z/oo=",
         "path": "../flakes",
         "type": "path"
       },
@@ -3903,7 +3903,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-/e9AQdrzAEVNHPWELMzlnx3BVItZYsEXGQ7hExGssWI=",
+        "narHash": "sha256-QCaeTC61eUGcWqLsPhkHg15UJYZk1CxvxpKR7SNJ0ic=",
         "path": "../systems/eldiron",
         "type": "path"
       },

diff --git a/flake.lock b/flake.lock
index fe2f963b10f7a5b938a8fdfe95061b5786818300..af87a2aea201fbc09d52b0ab30627081969af666 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -2664,7 +2664,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-YCnvttJd1LKqwvXPN68mBrm8o5UG+uatTnjiboaPHEQ=",
+        "narHash": "sha256-BSLDSxgA1/hX6EBS+dDIlBB3ogb3d8hP6gLNb99Z/oo=",
         "path": "./flakes",
         "type": "path"
       },
@@ -3919,7 +3919,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-/e9AQdrzAEVNHPWELMzlnx3BVItZYsEXGQ7hExGssWI=",
+        "narHash": "sha256-QCaeTC61eUGcWqLsPhkHg15UJYZk1CxvxpKR7SNJ0ic=",
         "path": "../systems/eldiron",
         "type": "path"
       },

diff --git a/flakes/flake.lock b/flakes/flake.lock
index 16026b5068c4fa2b8eb013b68563767779b9c67f..53e0808059c24a5f47185d856847191a7966555e 100644 (file)
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -3824,7 +3824,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-/e9AQdrzAEVNHPWELMzlnx3BVItZYsEXGQ7hExGssWI=",
+        "narHash": "sha256-QCaeTC61eUGcWqLsPhkHg15UJYZk1CxvxpKR7SNJ0ic=",
         "path": "../systems/eldiron",
         "type": "path"
       },

diff --git a/systems/eldiron/websites/immae/production.nix b/systems/eldiron/websites/immae/production.nix
index e4060ba4852220ee2cee06359a58800ef0c10fc8..2ed4a7d748a96b6f3eeda91a595a890df3696205 100644 (file)
--- a/systems/eldiron/websites/immae/production.nix
+++ b/systems/eldiron/websites/immae/production.nix
@@ -4,6 +4,7 @@ let
   varDir = "/var/lib/buildbot/outputs/immae/blog";
   historyDir = "/var/lib/buildbot/outputs/immae/history";
   docsDir = "/var/lib/buildbot/outputs/immae/docs/";
+  patchesDir = "/var/lib/buildbot/outputs/immae/patches/";
 in {
   options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website";
 
@@ -19,6 +20,7 @@ in {
     security.acme.certs.immae.extraDomainNames = [ "immae.eu" ];
     services.websites.env.production.bindMounts."${varDir}" = {};
     services.websites.env.production.bindMounts."${docsDir}" = {};
+    services.websites.env.production.bindMounts."${patchesDir}" = {};
     services.websites.env.production.bindMounts."${historyDir}" = {};
     services.websites.env.production.vhostConfs.immae_production = {
       certName     = "immae";
@@ -56,6 +58,14 @@ in {
           Header always set Access-Control-Allow-Origin "*"
         </Directory>
 
+        Alias /patches ${patchesDir}
+        <Directory ${patchesDir}>
+          DirectoryIndex index.htm index.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          AllowOverride All
+          Require all granted
+        </Directory>
+
         Alias /docs ${docsDir}
         <Directory ${docsDir}>
           DirectoryIndex index.htm index.html

diff --git a/systems/eldiron/websites/tools/landing.nix b/systems/eldiron/websites/tools/landing.nix
index f5d851e2adb5f45e38525e7b9f4994a9a1f6a61e..692eaaeaa9f5b12f7644b3d93c507660b53a850a 100644 (file)
--- a/systems/eldiron/websites/tools/landing.nix
+++ b/systems/eldiron/websites/tools/landing.nix
@@ -3,8 +3,8 @@ let
   source = builtins.fetchGit {
     url = "https://git.immae.eu/github/bastienwirtz/homer.git";
     ref = "gitolite_local/local_changes";
-    rev = "bb60c5b869931f305f15c5bfa9cdb3f68702f01f";
-    narHash = "sha256-xBIBUJhQ7KPY0d92pW9ErA9OvGafWcxyuGkbHShF4Bs=";
+    rev = "af6db21ee92824ddd9c4b9574018789619326ffc";
+    narHash = "sha256-TAf2oIPu5ZfRbxahAjOxwQ/z/g82pXmLPU8LhwxRgXs";
   };
   yarnModules = yarn2nix-moretea.mkYarnModules rec {
     nodejs = nodejs_16;