diff --git a/configuration/services/ntfy-sh/default.nix b/configuration/services/ntfy-sh/default.nix
index 1ed5c3d..6d192d6 100644
--- a/configuration/services/ntfy-sh/default.nix
+++ b/configuration/services/ntfy-sh/default.nix
@@ -48,7 +48,6 @@ in
proxyPass = "http://${config.services.ntfy-sh.settings.listen-http}";
extraConfig = ''
client_max_body_size 0; # Stream request body to backend
- add_header Access-Control-Allow-Origin https://ntfy.sh;
'';
};
@@ -62,9 +61,8 @@ in
proxyPass = "http://${config.services.ntfy-sh.settings.listen-http}";
extraConfig = ''
client_max_body_size 0; # Stream request body to backend
- add_header Access-Control-Allow-Origin https://ntfy.sh;
- limit_except GET {
+ limit_except GET OPTIONS {
deny all;
}
diff --git a/pkgs/packages/webserver/package.nix b/pkgs/packages/webserver/package.nix
index efaabe6..2c79099 100644
--- a/pkgs/packages/webserver/package.nix
+++ b/pkgs/packages/webserver/package.nix
@@ -13,6 +13,7 @@
rustPlatform,
wasm-bindgen-cli_0_2_100,
binaryen,
+ inkscape,
mkShell,
clangStdenv,
@@ -134,12 +135,36 @@ let
});
};
+ icons = stdenvNoCC.mkDerivation (drv: {
+ pname = "tlaternet-icons";
+ version = "1.0";
+
+ src = ./public/icon.svg;
+
+ dontUnpack = true;
+
+ nativeBuildInputs = [
+ inkscape
+ ];
+
+ buildPhase = ''
+ inkscape -w 48 -h 48 $src --export-filename=favicon-48.png
+ '';
+
+ installPhase = ''
+ mkdir -p $out
+ cp $src $out/icon.svg
+ cp favicon-48.png $out/
+ '';
+ });
+
assets = symlinkJoin {
name = "assets-${cargoMetadata.package.name}";
paths = [
sass-dependencies.fontsource-arimo.assets
sass-dependencies.fontsource-nunito.assets
other-dependencies.hack-font
+ icons
];
};
diff --git a/pkgs/packages/webserver/public/icon.svg b/pkgs/packages/webserver/public/icon.svg
new file mode 100644
index 0000000..84ef6b3
--- /dev/null
+++ b/pkgs/packages/webserver/public/icon.svg
@@ -0,0 +1,78 @@
+
+
diff --git a/pkgs/packages/webserver/src/app.rs b/pkgs/packages/webserver/src/app.rs
index 1b5db97..913c640 100644
--- a/pkgs/packages/webserver/src/app.rs
+++ b/pkgs/packages/webserver/src/app.rs
@@ -1,8 +1,8 @@
use leptos::prelude::*;
-use leptos_meta::{MetaTags, Stylesheet, provide_meta_context};
+use leptos_meta::{provide_meta_context, MetaTags, Stylesheet};
use leptos_router::{
- StaticSegment,
components::{Route, Router, Routes},
+ StaticSegment,
};
mod homepage;
@@ -17,6 +17,9 @@ pub fn shell(options: LeptosOptions) -> impl IntoView {
+
+
+