chore(etna): move some stuff in default.nix
This commit is contained in:
parent
3df6633d33
commit
9a254038ba
4 changed files with 60 additions and 62 deletions
|
@ -38,6 +38,17 @@ in {
|
||||||
services = {
|
services = {
|
||||||
openssh.openFirewall = true;
|
openssh.openFirewall = true;
|
||||||
|
|
||||||
|
nginx.enable = true;
|
||||||
|
|
||||||
|
frp = {
|
||||||
|
enable = true;
|
||||||
|
role = "client";
|
||||||
|
settings = {
|
||||||
|
serverAddr = "49.13.148.129";
|
||||||
|
serverPort = 7000;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
cloudflared = {
|
cloudflared = {
|
||||||
enable = true;
|
enable = true;
|
||||||
tunnels.${tunnelId} = {
|
tunnels.${tunnelId} = {
|
||||||
|
|
|
@ -59,10 +59,7 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
nginx = {
|
nginx.virtualHosts."m.uku.moe".locations = let
|
||||||
enable = true;
|
|
||||||
|
|
||||||
virtualHosts."m.uku.moe".locations = let
|
|
||||||
server = {"m.server" = "m.uku.moe:443";};
|
server = {"m.server" = "m.uku.moe:443";};
|
||||||
client = {"m.homeserver"."base_url" = "https://m.uku.moe";};
|
client = {"m.homeserver"."base_url" = "https://m.uku.moe";};
|
||||||
in {
|
in {
|
||||||
|
@ -86,5 +83,4 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,15 +63,6 @@ in
|
||||||
lib.recursiveUpdate {
|
lib.recursiveUpdate {
|
||||||
age.secrets = mkSecret "minecraftEnv" {};
|
age.secrets = mkSecret "minecraftEnv" {};
|
||||||
|
|
||||||
services.frp = {
|
|
||||||
enable = true;
|
|
||||||
role = "client";
|
|
||||||
settings = {
|
|
||||||
serverAddr = "49.13.148.129";
|
|
||||||
serverPort = 7000;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
virtualisation.oci-containers.backend = "docker";
|
virtualisation.oci-containers.backend = "docker";
|
||||||
|
|
||||||
systemd.services.restart-minecraft-servers = {
|
systemd.services.restart-minecraft-servers = {
|
||||||
|
|
Loading…
Reference in a new issue