motiejus/config
1
Fork 0
Code Packages Releases Activity

r1.jakstys.lt redirect

Browse Source
This commit is contained in:
Motiejus Jakštys
2025-01-26 00:31:12 +02:00
parent 33e46e59cb
commit f908a78486
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hosts/fwminex/configuration.nix
View File

@@ -109,12 +109,15 @@ in
caddy = caddy =
let let
r1 = config.mj.services.nsd-acme.zones."r1.jakstys.lt";
irc = config.mj.services.nsd-acme.zones."irc.jakstys.lt"; irc = config.mj.services.nsd-acme.zones."irc.jakstys.lt";
grafana = config.mj.services.nsd-acme.zones."grafana.jakstys.lt"; grafana = config.mj.services.nsd-acme.zones."grafana.jakstys.lt";
bitwarden = config.mj.services.nsd-acme.zones."bitwarden.jakstys.lt"; bitwarden = config.mj.services.nsd-acme.zones."bitwarden.jakstys.lt";
in in
{ {
serviceConfig.LoadCredential = [ serviceConfig.LoadCredential = [
"r1.jakstys.lt-cert.pem:${r1.certFile}"
"r1.jakstys.lt-key.pem:${r1.keyFile}"
"irc.jakstys.lt-cert.pem:${irc.certFile}" "irc.jakstys.lt-cert.pem:${irc.certFile}"
"irc.jakstys.lt-key.pem:${irc.keyFile}" "irc.jakstys.lt-key.pem:${irc.keyFile}"
"grafana.jakstys.lt-cert.pem:${grafana.certFile}" "grafana.jakstys.lt-cert.pem:${grafana.certFile}"
@@ -123,11 +126,13 @@ in
"bitwarden.jakstys.lt-key.pem:${bitwarden.keyFile}" "bitwarden.jakstys.lt-key.pem:${bitwarden.keyFile}"
]; ];
after = [ after = [
"nsd-acme-r1.jakstys.lt.service"
"nsd-acme-irc.jakstys.lt.service" "nsd-acme-irc.jakstys.lt.service"
"nsd-acme-grafana.jakstys.lt.service" "nsd-acme-grafana.jakstys.lt.service"
"nsd-acme-bitwarden.jakstys.lt.service" "nsd-acme-bitwarden.jakstys.lt.service"
]; ];
requires = [ requires = [
"nsd-acme-r1.jakstys.lt.service"
"nsd-acme-irc.jakstys.lt.service" "nsd-acme-irc.jakstys.lt.service"
"nsd-acme-grafana.jakstys.lt.service" "nsd-acme-grafana.jakstys.lt.service"
"nsd-acme-bitwarden.jakstys.lt.service" "nsd-acme-bitwarden.jakstys.lt.service"
@@ -174,6 +179,7 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
pathConfig = { pathConfig = {
PathChanged = [ PathChanged = [
config.mj.services.nsd-acme.zones."r1.jakstys.lt".certFile
config.mj.services.nsd-acme.zones."irc.jakstys.lt".certFile config.mj.services.nsd-acme.zones."irc.jakstys.lt".certFile
config.mj.services.nsd-acme.zones."grafana.jakstys.lt".certFile config.mj.services.nsd-acme.zones."grafana.jakstys.lt".certFile
config.mj.services.nsd-acme.zones."bitwarden.jakstys.lt".certFile config.mj.services.nsd-acme.zones."bitwarden.jakstys.lt".certFile
@@ -251,6 +257,10 @@ in
"www.jakstys.lt".extraConfig = '' "www.jakstys.lt".extraConfig = ''
redir https://jakstys.lt redir https://jakstys.lt
''; '';
"r1.jakstys.lt".extraConfig = ''
tls {$CREDENTIALS_DIRECTORY}/r1.jakstys.lt-cert.pem {$CREDENTIALS_DIRECTORY}/r1.jakstys.lt-key.pem
redir https://r1.jakstys.lt:8443
'';
"irc.jakstys.lt".extraConfig = "irc.jakstys.lt".extraConfig =
let let
gamja = pkgs.compressDrvWeb (pkgs.gamja.override { gamja = pkgs.compressDrvWeb (pkgs.gamja.override {