aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2021-05-17 15:11:19 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2021-05-17 15:11:19 +0200
commit83e79a89399a0cbf8bae81e338c466abf4517e18 (patch)
tree53f18a9dbe012a86666a034f6e308502d9d8c4be
parenta3ef18acd6c73b943f9f54e618f9e72e017ff748 (diff)
downloadNix-83e79a89399a0cbf8bae81e338c466abf4517e18.tar.gz
Nix-83e79a89399a0cbf8bae81e338c466abf4517e18.tar.zst
Nix-83e79a89399a0cbf8bae81e338c466abf4517e18.zip
Add weechat relay client
-rw-r--r--modules/private/system/dilion.nix4
-rw-r--r--modules/private/websites/tools/im/default.nix7
-rw-r--r--modules/private/websites/tools/im/www/index.html1
3 files changed, 11 insertions, 1 deletions
diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix
index 3e01af3..be8269e 100644
--- a/modules/private/system/dilion.nix
+++ b/modules/private/system/dilion.nix
@@ -152,6 +152,10 @@
152 152
153 myServices.monitoring.enable = true; 153 myServices.monitoring.enable = true;
154 myServices.certificates.enable = true; 154 myServices.certificates.enable = true;
155 security.acme.certs."${name}-immae" = config.myServices.certificates.certConfig // {
156 user = "immae";
157 domain = "dilion.immae.eu";
158 };
155 security.acme.certs."${name}" = { 159 security.acme.certs."${name}" = {
156 user = config.services.nginx.user; 160 user = config.services.nginx.user;
157 group = config.services.nginx.group; 161 group = config.services.nginx.group;
diff --git a/modules/private/websites/tools/im/default.nix b/modules/private/websites/tools/im/default.nix
index 9744d8e..94dc4f8 100644
--- a/modules/private/websites/tools/im/default.nix
+++ b/modules/private/websites/tools/im/default.nix
@@ -1,4 +1,4 @@
1{ config, lib, ... }: 1{ config, lib, pkgs, ... }:
2let 2let
3 cfg = config.myServices.websites.tools.im; 3 cfg = config.myServices.websites.tools.im;
4in 4in
@@ -15,6 +15,7 @@ in
15 root = ./www; 15 root = ./www;
16 extraConfig = [ 16 extraConfig = [
17 '' 17 ''
18 Alias /glowing-bear ${pkgs.glowing-bear}
18 Alias /converse ${./www}/converse.html 19 Alias /converse ${./www}/converse.html
19 ProxyPreserveHost On 20 ProxyPreserveHost On
20 <Location "/bosh"> 21 <Location "/bosh">
@@ -30,6 +31,10 @@ in
30 ProxyPassReverse /admin http://localhost:5280/admin 31 ProxyPassReverse /admin http://localhost:5280/admin
31 ProxyPass /api http://localhost:5280/api 32 ProxyPass /api http://localhost:5280/api
32 ProxyPassReverse /api http://localhost:5280/api 33 ProxyPassReverse /api http://localhost:5280/api
34 <Directory ${pkgs.glowing-bear}>
35 AllowOverride none
36 Require all granted
37 </Directory>
33 '' 38 ''
34 ]; 39 ];
35 }; 40 };
diff --git a/modules/private/websites/tools/im/www/index.html b/modules/private/websites/tools/im/www/index.html
index 15e09f2..90c5458 100644
--- a/modules/private/websites/tools/im/www/index.html
+++ b/modules/private/websites/tools/im/www/index.html
@@ -33,6 +33,7 @@
33 Pre-configured clients: 33 Pre-configured clients:
34 <ul> 34 <ul>
35 <li><a href="converse">Converse client</a></li> 35 <li><a href="converse">Converse client</a></li>
36 <li><a href="glowing-bear">Weechat relay client</a></li>
36 </ul> 37 </ul>
37 </p> 38 </p>
38 <p> 39 <p>