From f5ef667f54e37a0652463c04df4fa9b634a75756 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 3 Mar 2024 01:36:23 +0100 Subject: [PATCH] Add patch pages --- deploy/flake.lock | 4 ++-- flake.lock | 4 ++-- flakes/flake.lock | 2 +- systems/eldiron/websites/immae/production.nix | 10 ++++++++++ systems/eldiron/websites/tools/landing.nix | 4 ++-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/deploy/flake.lock b/deploy/flake.lock index f82d371..984a670 100644 --- 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 fe2f963..af87a2a 100644 --- 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 16026b5..53e0808 100644 --- 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 e4060ba..2ed4a7d 100644 --- 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 "*" + Alias /patches ${patchesDir} + + DirectoryIndex index.htm index.html + Options Indexes FollowSymLinks MultiViews Includes + AllowOverride All + Require all granted + + Alias /docs ${docsDir} DirectoryIndex index.htm index.html diff --git a/systems/eldiron/websites/tools/landing.nix b/systems/eldiron/websites/tools/landing.nix index f5d851e..692eaae 100644 --- 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; -- 2.41.0