wow
This commit is contained in:
parent
6ad3f123b7
commit
9bbceb15fd
9 changed files with 43 additions and 16 deletions
|
|
@ -14,11 +14,9 @@
|
||||||
"imnyang"
|
"imnyang"
|
||||||
];
|
];
|
||||||
substituters = [
|
substituters = [
|
||||||
# "https://cache.mizuki.guru"
|
|
||||||
"https://nix.mizuki.my/public"
|
"https://nix.mizuki.my/public"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
# "cache.mizuki.guru-1:EbUC9b0ryD7BJKqfT8fl4GoS2ojLV+hI9fW1al5Whp0="
|
|
||||||
"public:SnHrtrxbCPcZujbJdgsKFeObTfRKQl5KhrI+LljtZUE="
|
"public:SnHrtrxbCPcZujbJdgsKFeObTfRKQl5KhrI+LljtZUE="
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -300,8 +300,6 @@ in
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
"cache.mizuki.guru".extraConfig = reverseProxy "127.0.0.1:8080";
|
|
||||||
|
|
||||||
"phrygiacomo.mizuki.guru".extraConfig = withErrors ''
|
"phrygiacomo.mizuki.guru".extraConfig = withErrors ''
|
||||||
basic_auth {
|
basic_auth {
|
||||||
imnyang $2a$10$zA83XKt84pcXiwfkuvNmKOpQ5Cw0IP6m/.1AX0ahkVQaPOzrmFlxm
|
imnyang $2a$10$zA83XKt84pcXiwfkuvNmKOpQ5Cw0IP6m/.1AX0ahkVQaPOzrmFlxm
|
||||||
|
|
|
||||||
|
|
@ -98,5 +98,13 @@
|
||||||
|
|
||||||
services.qemuGuest.enable = true;
|
services.qemuGuest.enable = true;
|
||||||
|
|
||||||
|
services.cloud-init = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
preserve_hostname = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
system.stateVersion = "26.05";
|
system.stateVersion = "26.05";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
"github.com/RussellLuo/caddy-ext/ratelimit@v0.3.0"
|
"github.com/RussellLuo/caddy-ext/ratelimit@v0.3.0"
|
||||||
"github.com/neodyme-labs/user_agent_parse@v0.0.1"
|
"github.com/neodyme-labs/user_agent_parse@v0.0.1"
|
||||||
];
|
];
|
||||||
hash = "sha256-YqOyHxPIKreCSkXfJUWTEFi+xOlIIiDqy3bYt7/A6Rg=";
|
hash = "sha256-z9/LF2gws+H0pKL6F62QfklD0W8DKWCccnXLOOs3+jY=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,13 @@ let
|
||||||
mailSecret = key: {
|
mailSecret = key: {
|
||||||
sopsFile = ../secrets/mailserver.yaml;
|
sopsFile = ../secrets/mailserver.yaml;
|
||||||
inherit key;
|
inherit key;
|
||||||
owner = "nginx";
|
# The OAuth client credentials are read by Roundcube's PHP-FPM pool,
|
||||||
group = "nginx";
|
# which runs as the dedicated `roundcube` user (not nginx).
|
||||||
|
owner = "roundcube";
|
||||||
|
group = "roundcube";
|
||||||
mode = "0440";
|
mode = "0440";
|
||||||
restartUnits = [
|
restartUnits = [
|
||||||
"phpfpm-roundcube.service"
|
"phpfpm-roundcube.service"
|
||||||
"dovecot.service"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ nixpkgs.lib.nixosSystem {
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
# ./services/attic.nix
|
# ./services/attic.nix
|
||||||
./services/caddy.nix
|
./services/caddy.nix
|
||||||
|
./services/cfwithoutincident.nix
|
||||||
./services/forgejo-runner.nix
|
./services/forgejo-runner.nix
|
||||||
./services/limbo.nix
|
./services/limbo.nix
|
||||||
./services/stream.nix
|
./services/stream.nix
|
||||||
|
|
|
||||||
|
|
@ -143,10 +143,6 @@ in
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
virtualHosts."cache.mizuki.guru".extraConfig = ''
|
|
||||||
reverse_proxy 127.0.0.1:5000
|
|
||||||
'';
|
|
||||||
|
|
||||||
virtualHosts."paste.mizuki.guru".extraConfig = ''
|
virtualHosts."paste.mizuki.guru".extraConfig = ''
|
||||||
reverse_proxy 10.11.8.102:11108
|
reverse_proxy 10.11.8.102:11108
|
||||||
'';
|
'';
|
||||||
|
|
@ -182,6 +178,10 @@ in
|
||||||
reverse_proxy 127.0.0.1:4321
|
reverse_proxy 127.0.0.1:4321
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
virtualHosts."cfwithoutincident.imnya.ng".extraConfig = ''
|
||||||
|
reverse_proxy 127.0.0.1:31774
|
||||||
|
'';
|
||||||
|
|
||||||
virtualHosts."stream.mizuki.guru".extraConfig = ''
|
virtualHosts."stream.mizuki.guru".extraConfig = ''
|
||||||
handle /live/* {
|
handle /live/* {
|
||||||
reverse_proxy 127.0.0.1:10023
|
reverse_proxy 127.0.0.1:10023
|
||||||
|
|
|
||||||
25
hosts/server/natsu/services/cfwithoutincident.nix
Normal file
25
hosts/server/natsu/services/cfwithoutincident.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
systemd.services.cfwithoutincident = {
|
||||||
|
description = "Cloudflare Status D-Day dashboard";
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
wants = [ "network-online.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "simple";
|
||||||
|
User = "imnyang";
|
||||||
|
Group = "users";
|
||||||
|
WorkingDirectory = "/home/imnyang/git/imnyang/cfwithoutincident";
|
||||||
|
Environment = [
|
||||||
|
"PORT=31774"
|
||||||
|
];
|
||||||
|
ExecStart = "${pkgs.bun}/bin/bun run src/index.ts";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = 5;
|
||||||
|
};
|
||||||
|
|
||||||
|
path = [ pkgs.bun ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -21,14 +21,10 @@
|
||||||
|
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
substituters = [
|
substituters = [
|
||||||
# "https://cache.mizuki.guru/public"
|
|
||||||
# "https://cache.mizuki.guru/imnyang"
|
|
||||||
"https://nix.mizuki.my/public"
|
"https://nix.mizuki.my/public"
|
||||||
"https://vicinae.cachix.org"
|
"https://vicinae.cachix.org"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
# "public:IgipakDD/clr0XbuaIejPYMT5UkTVGKVTxtWXcsbiAg="
|
|
||||||
# "imnyang:x8Oex2DLzZUBxS/3VvkVptT3DiugjsCbQ23VjsxMT5c="
|
|
||||||
"public:SnHrtrxbCPcZujbJdgsKFeObTfRKQl5KhrI+LljtZUE="
|
"public:SnHrtrxbCPcZujbJdgsKFeObTfRKQl5KhrI+LljtZUE="
|
||||||
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
|
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
|
||||||
];
|
];
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue