diff options
-rw-r--r-- | deploy/flake.lock | 4 | ||||
-rw-r--r-- | flake.lock | 4 | ||||
-rw-r--r-- | flakes/flake.lock | 2 | ||||
-rw-r--r-- | systems/eldiron/websites/immae/production.nix | 10 | ||||
-rw-r--r-- | 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 @@ | |||
2783 | }, | 2783 | }, |
2784 | "locked": { | 2784 | "locked": { |
2785 | "lastModified": 1, | 2785 | "lastModified": 1, |
2786 | "narHash": "sha256-YCnvttJd1LKqwvXPN68mBrm8o5UG+uatTnjiboaPHEQ=", | 2786 | "narHash": "sha256-BSLDSxgA1/hX6EBS+dDIlBB3ogb3d8hP6gLNb99Z/oo=", |
2787 | "path": "../flakes", | 2787 | "path": "../flakes", |
2788 | "type": "path" | 2788 | "type": "path" |
2789 | }, | 2789 | }, |
@@ -3903,7 +3903,7 @@ | |||
3903 | }, | 3903 | }, |
3904 | "locked": { | 3904 | "locked": { |
3905 | "lastModified": 1, | 3905 | "lastModified": 1, |
3906 | "narHash": "sha256-/e9AQdrzAEVNHPWELMzlnx3BVItZYsEXGQ7hExGssWI=", | 3906 | "narHash": "sha256-QCaeTC61eUGcWqLsPhkHg15UJYZk1CxvxpKR7SNJ0ic=", |
3907 | "path": "../systems/eldiron", | 3907 | "path": "../systems/eldiron", |
3908 | "type": "path" | 3908 | "type": "path" |
3909 | }, | 3909 | }, |
@@ -2664,7 +2664,7 @@ | |||
2664 | }, | 2664 | }, |
2665 | "locked": { | 2665 | "locked": { |
2666 | "lastModified": 1, | 2666 | "lastModified": 1, |
2667 | "narHash": "sha256-YCnvttJd1LKqwvXPN68mBrm8o5UG+uatTnjiboaPHEQ=", | 2667 | "narHash": "sha256-BSLDSxgA1/hX6EBS+dDIlBB3ogb3d8hP6gLNb99Z/oo=", |
2668 | "path": "./flakes", | 2668 | "path": "./flakes", |
2669 | "type": "path" | 2669 | "type": "path" |
2670 | }, | 2670 | }, |
@@ -3919,7 +3919,7 @@ | |||
3919 | }, | 3919 | }, |
3920 | "locked": { | 3920 | "locked": { |
3921 | "lastModified": 1, | 3921 | "lastModified": 1, |
3922 | "narHash": "sha256-/e9AQdrzAEVNHPWELMzlnx3BVItZYsEXGQ7hExGssWI=", | 3922 | "narHash": "sha256-QCaeTC61eUGcWqLsPhkHg15UJYZk1CxvxpKR7SNJ0ic=", |
3923 | "path": "../systems/eldiron", | 3923 | "path": "../systems/eldiron", |
3924 | "type": "path" | 3924 | "type": "path" |
3925 | }, | 3925 | }, |
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 @@ | |||
3824 | }, | 3824 | }, |
3825 | "locked": { | 3825 | "locked": { |
3826 | "lastModified": 1, | 3826 | "lastModified": 1, |
3827 | "narHash": "sha256-/e9AQdrzAEVNHPWELMzlnx3BVItZYsEXGQ7hExGssWI=", | 3827 | "narHash": "sha256-QCaeTC61eUGcWqLsPhkHg15UJYZk1CxvxpKR7SNJ0ic=", |
3828 | "path": "../systems/eldiron", | 3828 | "path": "../systems/eldiron", |
3829 | "type": "path" | 3829 | "type": "path" |
3830 | }, | 3830 | }, |
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/"; | ||
7 | in { | 8 | in { |
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; |