nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Liberate nkagami.me domains from Cloudflare origin cert requirement

Browse source
This commit is contained in:
Natsu Kagami 2023-09-03 20:51:52 +02:00
parent 2aa0ee2023
commit 6eb0b818f1
Signed by: nki
GPG key ID: 55A032EB38B49ADB
5 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/cloud/bitwarden/default.nix
View file

@ -35,11 +35,13 @@ in
# traefik # traefik
cloud.traefik.hosts.bitwarden = { cloud.traefik.hosts.bitwarden = {
inherit port host; inherit port host;
noCloudflare = true;
}; };
cloud.traefik.hosts.bitwarden-notifications = { cloud.traefik.hosts.bitwarden-notifications = {
inherit host; inherit host;
port = notificationsPort; port = notificationsPort;
path = "/notifications/hub"; path = "/notifications/hub";
noCloudflare = true;
}; };
# systemd unit # systemd unit
systemd.services.bitwarden-server = { systemd.services.bitwarden-server = {
@ -73,6 +75,7 @@ in
AmbientCapabilities = "CAP_NET_BIND_SERVICE"; AmbientCapabilities = "CAP_NET_BIND_SERVICE";
StateDirectory = "bitwarden-server"; StateDirectory = "bitwarden-server";
}; };
requires = [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
}; };
}; };

6
modules/cloud/conduit/default.nix
View file

@ -45,6 +45,10 @@ with lib;
port = mkOption { port = mkOption {
type = types.int; type = types.int;
}; };
noCloudflare = mkOption {
type = types.bool;
default = false;
};
allow_registration = mkOption { allow_registration = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -145,7 +149,7 @@ with lib;
config.cloud.traefik.hosts = mkIf cfg.enable ( config.cloud.traefik.hosts = mkIf cfg.enable (
(lib.attrsets.mapAttrs' (lib.attrsets.mapAttrs'
(name: instance: lib.attrsets.nameValuePair "conduit-${name}" ({ (name: instance: lib.attrsets.nameValuePair "conduit-${name}" ({
inherit (instance) host port; inherit (instance) host port noCloudflare;
})) }))
cfg.instances) cfg.instances)
// (lib.attrsets.mapAttrs' // (lib.attrsets.mapAttrs'

1
modules/cloud/mail/default.nix
View file

@ -268,6 +268,7 @@ in
cloud.traefik.hosts.maddy-mta-sts = { cloud.traefik.hosts.maddy-mta-sts = {
port = mtaStsPort; port = mtaStsPort;
host = "mta-sts.nkagami.me"; host = "mta-sts.nkagami.me";
noCloudflare = true;
}; };
# maddy itself # maddy itself

1
modules/cloud/writefreely/default.nix
View file

@ -13,7 +13,6 @@ in
}; };
host = mkOption { host = mkOption {
type = types.str; type = types.str;
default = "write.nkagami.me";
description = "The hostname for the instance"; description = "The hostname for the instance";
}; };
site.title = mkOption { site.title = mkOption {

6
nki-personal-do/configuration.nix
View file

@ -96,7 +96,7 @@
settings.HOST = "127.0.0.1"; settings.HOST = "127.0.0.1";
settings.PORT = "16904"; settings.PORT = "16904";
}; };
cloud.traefik.hosts.uptime-kuma = { host = "status.nkagami.me"; port = 16904; }; cloud.traefik.hosts.uptime-kuma = { host = "status.nkagami.me"; port = 16904; noCloudflare = true; };
cloud.traefik.hosts.uptime-kuma-dtth = { host = "status.dtth.ch"; port = 16904; }; cloud.traefik.hosts.uptime-kuma-dtth = { host = "status.dtth.ch"; port = 16904; };
cloud.traefik.hosts.uptime-kuma-codefun = { host = "status.codefun.vn"; port = 16904; }; cloud.traefik.hosts.uptime-kuma-codefun = { host = "status.codefun.vn"; port = 16904; };
@ -115,6 +115,7 @@
host = "m.nkagami.me"; host = "m.nkagami.me";
port = 6167; port = 6167;
well-known_port = 6168; well-known_port = 6168;
noCloudflare = true;
}; };
}; };
cloud.conduit.heisenbridge = { cloud.conduit.heisenbridge = {
@ -138,6 +139,7 @@
host = "navidrome.nkagami.me"; host = "navidrome.nkagami.me";
port = 4533; port = 4533;
localHost = "11.0.0.2"; localHost = "11.0.0.2";
noCloudflare = true;
}; };
# Mail # Mail
@ -251,7 +253,7 @@
system.stateVersion = "21.11"; system.stateVersion = "21.11";
# ntfy # ntfy
cloud.traefik.hosts.ntfy-sh = { host = "ntfy.nkagami.me"; port = 11161; }; cloud.traefik.hosts.ntfy-sh = { host = "ntfy.nkagami.me"; port = 11161; noCloudflare = true; };
services.ntfy-sh = { services.ntfy-sh = {
enable = true; enable = true;
settings = { settings = {