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/tools/default.nix | 20 |
4 files changed, 25 insertions, 5 deletions
diff --git a/deploy/flake.lock b/deploy/flake.lock index e469f5a..071f24f 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-MC76gRRjkPwqZjcPsDrZiVYqUBdRNAeA6bUx6Ru5cWc=", | 2786 | "narHash": "sha256-d0pFztjW1zKsfockL6q1bvRvkDN9A257733dxU3nhmQ=", |
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-QCaeTC61eUGcWqLsPhkHg15UJYZk1CxvxpKR7SNJ0ic=", | 3906 | "narHash": "sha256-Fm13ywWMQlFSAxCWxI+lexO1IetZ1NPrqmBssLMLHpA=", |
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-MC76gRRjkPwqZjcPsDrZiVYqUBdRNAeA6bUx6Ru5cWc=", | 2667 | "narHash": "sha256-d0pFztjW1zKsfockL6q1bvRvkDN9A257733dxU3nhmQ=", |
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-QCaeTC61eUGcWqLsPhkHg15UJYZk1CxvxpKR7SNJ0ic=", | 3922 | "narHash": "sha256-Fm13ywWMQlFSAxCWxI+lexO1IetZ1NPrqmBssLMLHpA=", |
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 5eb06c6..2453924 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-QCaeTC61eUGcWqLsPhkHg15UJYZk1CxvxpKR7SNJ0ic=", | 3827 | "narHash": "sha256-Fm13ywWMQlFSAxCWxI+lexO1IetZ1NPrqmBssLMLHpA=", |
3828 | "path": "../systems/eldiron", | 3828 | "path": "../systems/eldiron", |
3829 | "type": "path" | 3829 | "type": "path" |
3830 | }, | 3830 | }, |
diff --git a/systems/eldiron/websites/tools/default.nix b/systems/eldiron/websites/tools/default.nix index ecfba03..b396d44 100644 --- a/systems/eldiron/websites/tools/default.nix +++ b/systems/eldiron/websites/tools/default.nix | |||
@@ -76,6 +76,19 @@ let | |||
76 | 76 | ||
77 | landing = pkgs.callPackage ./landing.nix { }; | 77 | landing = pkgs.callPackage ./landing.nix { }; |
78 | 78 | ||
79 | matrix = pkgs.element-web.override { | ||
80 | conf = { | ||
81 | default_server_config."m.homeserver" = { | ||
82 | base_url = "https://immae.ems.host"; | ||
83 | server_name = "immae.eu"; | ||
84 | }; | ||
85 | default_server_config."m.identity_server" = { | ||
86 | base_url = "https://vector.im"; | ||
87 | }; | ||
88 | room_directory.servers = [ "immae.eu" "matrix.org" ]; | ||
89 | }; | ||
90 | }; | ||
91 | |||
79 | cfg = config.myServices.websites.tools.tools; | 92 | cfg = config.myServices.websites.tools.tools; |
80 | pcfg = config.services.phpfpm.pools; | 93 | pcfg = config.services.phpfpm.pools; |
81 | in { | 94 | in { |
@@ -273,6 +286,13 @@ in { | |||
273 | SetHandler "proxy:unix:${pcfg.tools.socket}|fcgi://localhost" | 286 | SetHandler "proxy:unix:${pcfg.tools.socket}|fcgi://localhost" |
274 | </FilesMatch> | 287 | </FilesMatch> |
275 | </Directory> | 288 | </Directory> |
289 | |||
290 | Alias /matrix ${matrix} | ||
291 | <Directory "${matrix}"> | ||
292 | DirectoryIndex index.html | ||
293 | AllowOverride None | ||
294 | Require all granted | ||
295 | </Directory> | ||
276 | '' | 296 | '' |
277 | ]; | 297 | ]; |
278 | }; | 298 | }; |