aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2020-08-23 07:41:15 -0300
committerEuAndreh <eu@euandre.org>2020-08-23 07:41:15 -0300
commit80000d43125203d927f79993970d78795ebd4eb0 (patch)
tree47d379f76c08ad67dd8f13fe2c604399e4adc7c3
parentServe favicon from repo in cgit (diff)
downloadtoph-80000d43125203d927f79993970d78795ebd4eb0.tar.gz
toph-80000d43125203d927f79993970d78795ebd4eb0.tar.xz
Add favicon to conversejs page
-rw-r--r--TODOs.org2
-rw-r--r--favicons/conversejs.icobin0 -> 1150 bytes
-rw-r--r--vps-configuration.env.nix16
3 files changed, 9 insertions, 9 deletions
diff --git a/TODOs.org b/TODOs.org
index d52ce20..98d6eea 100644
--- a/TODOs.org
+++ b/TODOs.org
@@ -6,8 +6,6 @@ https://github.com/42wim/matterbridge/issues/1061
** TODO Add Prosody DNS record to allow me to use eu@euandreh.xyz as an XMPP address
** TODO Configure MUC on Prosody
** TODO Fix conversejs login
-** TODO Add favicon to conversejs
-: wget https://cdn.conversejs.org/6.0.1/dist/favicon.ico
** TODO Terraform restore from backup when provisioning
** TODO cron: borg, PostgreSQL backup and NixOS update and collect gargabe
** TODO snapshot with swap: nixos-rebuild switch takes too much memory
diff --git a/favicons/conversejs.ico b/favicons/conversejs.ico
new file mode 100644
index 0000000..edadbfc
--- /dev/null
+++ b/favicons/conversejs.ico
Binary files differ
diff --git a/vps-configuration.env.nix b/vps-configuration.env.nix
index 3f99e1a..8fca172 100644
--- a/vps-configuration.env.nix
+++ b/vps-configuration.env.nix
@@ -134,19 +134,21 @@ in {
location = / {
return 301 master/;
}
- root = ${envsubstConfiguration.staticRoot}/songbooks/;
+ root ${envsubstConfiguration.staticRoot}/songbooks/;
'';
};
"${envsubstConfiguration.prosodyTLD}" = {
forceSSL = true;
enableACME = true;
serverAliases = [ envsubstConfiguration.prosodyMUCTLD ];
- locations = {
- "/" = {
- proxyPass =
- "http://localhost:${envsubstConfiguration.prosodyHTTPPort}/conversejs";
- };
- };
+ extraConfig = ''
+ location = /favicon.ico {
+ alias ${envsubstConfiguration.dataRoot}/favicons/conversejs.ico;
+ }
+ location / {
+ proxy_pass http://localhost:${envsubstConfiguration.prosodyHTTPPort}/conversejs;
+ }
+ '';
};
};
};