h: disable wallabag, bookmarks to shiori

This commit is contained in:
Aaron Bieber 2024-01-02 10:01:30 -07:00
parent 2bc8a59d4c
commit 55f0957ac7
No known key found for this signature in database

View File

@ -154,11 +154,11 @@ in
owner = "root"; owner = "root";
sopsFile = config.xin-secrets.h.services; sopsFile = config.xin-secrets.h.services;
}; };
wallabag_secret = { #wallabag_secret = {
mode = "400"; # mode = "400";
owner = "wallabag"; # owner = "wallabag";
sopsFile = config.xin-secrets.h.services; # sopsFile = config.xin-secrets.h.services;
}; #};
}; };
networking = { networking = {
@ -305,7 +305,7 @@ in
services = { services = {
wallabag = { wallabag = {
enable = true; enable = false;
secretPath = config.sops.secrets.wallabag_secret.path; secretPath = config.sops.secrets.wallabag_secret.path;
domain = "bookmarks.tapenet.org"; domain = "bookmarks.tapenet.org";
}; };
@ -320,7 +320,7 @@ in
shiori = { shiori = {
enable = true; enable = true;
port = 8967; port = 8967;
address = "100.83.77.133"; address = "127.0.0.1";
package = inputs.unstable.legacyPackages.${pkgs.system}.shiori; package = inputs.unstable.legacyPackages.${pkgs.system}.shiori;
}; };
veilid-server = { veilid-server = {
@ -581,6 +581,19 @@ in
}; };
}; };
"bookmarks.tapenet.org" = {
forceSSL = true;
enableACME = true;
locations = {
"/" = {
proxyPass = "http://${config.services.shiori.address}:${toString config.services.shiori.port}";
proxyWebsockets = true;
priority = 1000;
};
};
};
"git.tapenet.org" = { "git.tapenet.org" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;