aboutsummaryrefslogtreecommitdiff
path: root/systems/eldiron
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2024-03-03 01:36:23 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2024-03-03 01:47:26 +0100
commitf5ef667f54e37a0652463c04df4fa9b634a75756 (patch)
treec088f58c9ae1bde0c42c86781c4b3263bbae4bcc /systems/eldiron
parenta08b46f287ae2e03071da03e0353493e634dd7b3 (diff)
downloadNix-f5ef667f54e37a0652463c04df4fa9b634a75756.tar.gz
Nix-f5ef667f54e37a0652463c04df4fa9b634a75756.tar.zst
Nix-f5ef667f54e37a0652463c04df4fa9b634a75756.zip
Add patch pages
Diffstat (limited to 'systems/eldiron')
-rw-r--r--systems/eldiron/websites/immae/production.nix10
-rw-r--r--systems/eldiron/websites/tools/landing.nix4
2 files changed, 12 insertions, 2 deletions
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
4 varDir = "/var/lib/buildbot/outputs/immae/blog"; 4 varDir = "/var/lib/buildbot/outputs/immae/blog";
5 historyDir = "/var/lib/buildbot/outputs/immae/history"; 5 historyDir = "/var/lib/buildbot/outputs/immae/history";
6 docsDir = "/var/lib/buildbot/outputs/immae/docs/"; 6 docsDir = "/var/lib/buildbot/outputs/immae/docs/";
7 patchesDir = "/var/lib/buildbot/outputs/immae/patches/";
7in { 8in {
8 options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website"; 9 options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website";
9 10
@@ -19,6 +20,7 @@ in {
19 security.acme.certs.immae.extraDomainNames = [ "immae.eu" ]; 20 security.acme.certs.immae.extraDomainNames = [ "immae.eu" ];
20 services.websites.env.production.bindMounts."${varDir}" = {}; 21 services.websites.env.production.bindMounts."${varDir}" = {};
21 services.websites.env.production.bindMounts."${docsDir}" = {}; 22 services.websites.env.production.bindMounts."${docsDir}" = {};
23 services.websites.env.production.bindMounts."${patchesDir}" = {};
22 services.websites.env.production.bindMounts."${historyDir}" = {}; 24 services.websites.env.production.bindMounts."${historyDir}" = {};
23 services.websites.env.production.vhostConfs.immae_production = { 25 services.websites.env.production.vhostConfs.immae_production = {
24 certName = "immae"; 26 certName = "immae";
@@ -56,6 +58,14 @@ in {
56 Header always set Access-Control-Allow-Origin "*" 58 Header always set Access-Control-Allow-Origin "*"
57 </Directory> 59 </Directory>
58 60
61 Alias /patches ${patchesDir}
62 <Directory ${patchesDir}>
63 DirectoryIndex index.htm index.html
64 Options Indexes FollowSymLinks MultiViews Includes
65 AllowOverride All
66 Require all granted
67 </Directory>
68
59 Alias /docs ${docsDir} 69 Alias /docs ${docsDir}
60 <Directory ${docsDir}> 70 <Directory ${docsDir}>
61 DirectoryIndex index.htm index.html 71 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
3 source = builtins.fetchGit { 3 source = builtins.fetchGit {
4 url = "https://git.immae.eu/github/bastienwirtz/homer.git"; 4 url = "https://git.immae.eu/github/bastienwirtz/homer.git";
5 ref = "gitolite_local/local_changes"; 5 ref = "gitolite_local/local_changes";
6 rev = "bb60c5b869931f305f15c5bfa9cdb3f68702f01f"; 6 rev = "af6db21ee92824ddd9c4b9574018789619326ffc";
7 narHash = "sha256-xBIBUJhQ7KPY0d92pW9ErA9OvGafWcxyuGkbHShF4Bs="; 7 narHash = "sha256-TAf2oIPu5ZfRbxahAjOxwQ/z/g82pXmLPU8LhwxRgXs";
8 }; 8 };
9 yarnModules = yarn2nix-moretea.mkYarnModules rec { 9 yarnModules = yarn2nix-moretea.mkYarnModules rec {
10 nodejs = nodejs_16; 10 nodejs = nodejs_16;