feat: Try to use auth as a caddy import
This commit is contained in:
@@ -27,47 +27,47 @@
|
||||
openFirewall = true;
|
||||
environmentFile = config.sops.templates."craftmine.env".path;
|
||||
servers = {
|
||||
fabric = {
|
||||
inherit whitelist;
|
||||
enable = true;
|
||||
# enable-rcon = true;
|
||||
jvmOpts = "-Xmx4G -Xms4G";
|
||||
package = pkgs.fabricServers.fabric-1_21_1;
|
||||
serverProperties = {
|
||||
motd = "Servius's Fabric Minecraft Server";
|
||||
server-port = 25567;
|
||||
level-seed = "4504535438041489910";
|
||||
view-distance = 24;
|
||||
white-list = true;
|
||||
};
|
||||
};
|
||||
craftmine = {
|
||||
inherit whitelist;
|
||||
enable = true;
|
||||
jvmOpts = "-Xmx4G -Xms4G";
|
||||
package = let
|
||||
getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
|
||||
in
|
||||
pkgs.minecraft-server.override {
|
||||
url = "https://piston-data.mojang.com/v1/objects/4527a9019e37e001770787e4523b505f79cac4c5/server.jar";
|
||||
sha1 = "sha1-RSepAZ434AF3B4fkUjtQX3nKxMU=";
|
||||
version = "25w14craftmine";
|
||||
jre_headless = getJavaVersion 21;
|
||||
};
|
||||
|
||||
serverProperties = {
|
||||
enable-rcon = true;
|
||||
"rcon.password" = "@CRAFTMINE_RCON_PASSWORD@";
|
||||
motd = "Servius's Craftmine Server";
|
||||
server-port = 25570;
|
||||
white-list = true;
|
||||
view-distance = 32;
|
||||
};
|
||||
};
|
||||
# fabric = {
|
||||
# inherit whitelist;
|
||||
# enable = true;
|
||||
# # enable-rcon = true;
|
||||
# jvmOpts = "-Xmx4G -Xms4G";
|
||||
# package = pkgs.fabricServers.fabric-1_21_1;
|
||||
# serverProperties = {
|
||||
# motd = "Servius's Fabric Minecraft Server";
|
||||
# server-port = 25567;
|
||||
# level-seed = "4504535438041489910";
|
||||
# view-distance = 24;
|
||||
# white-list = true;
|
||||
# };
|
||||
# };
|
||||
# craftmine = {
|
||||
# inherit whitelist;
|
||||
# enable = true;
|
||||
# jvmOpts = "-Xmx4G -Xms4G";
|
||||
# package = let
|
||||
# getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
|
||||
# in
|
||||
# pkgs.minecraft-server.override {
|
||||
# url = "https://piston-data.mojang.com/v1/objects/4527a9019e37e001770787e4523b505f79cac4c5/server.jar";
|
||||
# sha1 = "sha1-RSepAZ434AF3B4fkUjtQX3nKxMU=";
|
||||
# version = "25w14craftmine";
|
||||
# jre_headless = getJavaVersion 21;
|
||||
# };
|
||||
#
|
||||
# serverProperties = {
|
||||
# enable-rcon = true;
|
||||
# "rcon.password" = "@CRAFTMINE_RCON_PASSWORD@";
|
||||
# motd = "Servius's Craftmine Server";
|
||||
# server-port = 25570;
|
||||
# white-list = true;
|
||||
# view-distance = 32;
|
||||
# };
|
||||
# };
|
||||
craftmine-v2 = {
|
||||
inherit whitelist;
|
||||
enable = true;
|
||||
jvmOpts = "-Xmx4G -Xms4G";
|
||||
jvmOpts = "-Xmx16G -Xms4G";
|
||||
package = let
|
||||
getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
|
||||
in
|
||||
|
||||
@@ -23,6 +23,12 @@
|
||||
resolvers 1.1.1.1
|
||||
}
|
||||
}
|
||||
(auth) {
|
||||
forward_auth auth.darksailor.dev {
|
||||
uri /api/authz/forward_auth?rd=https://auth.darksailor.dev
|
||||
copy_headers Remote-User Remote-Groups Remote-Name Remote-Email
|
||||
}
|
||||
}
|
||||
'';
|
||||
package = pkgs.caddy.withPlugins {
|
||||
plugins = ["github.com/caddy-dns/hetzner@v1.0.0"];
|
||||
|
||||
@@ -35,37 +35,30 @@
|
||||
package = unstablePkgs.bazarr;
|
||||
group = "media";
|
||||
};
|
||||
caddy.virtualHosts = let
|
||||
auth = ''
|
||||
forward_auth mirai:5555 {
|
||||
uri /api/authz/forward-auth
|
||||
copy_headers Remote-User Remote-Groups Remote-Email Remote-Name
|
||||
}
|
||||
'';
|
||||
in {
|
||||
caddy.virtualHosts = {
|
||||
"sonarr.tsuba.darksailor.dev".extraConfig = ''
|
||||
import hetzner
|
||||
${auth}
|
||||
import auth
|
||||
reverse_proxy localhost:${builtins.toString config.services.sonarr.settings.server.port}
|
||||
'';
|
||||
"radarr.tsuba.darksailor.dev".extraConfig = ''
|
||||
import hetzner
|
||||
${auth}
|
||||
import auth
|
||||
reverse_proxy localhost:${builtins.toString config.services.radarr.settings.server.port}
|
||||
'';
|
||||
"lidarr.tsuba.darksailor.dev".extraConfig = ''
|
||||
import hetzner
|
||||
${auth}
|
||||
import auth
|
||||
reverse_proxy localhost:${builtins.toString config.services.lidarr.settings.server.port}
|
||||
'';
|
||||
"bazarr.tsuba.darksailor.dev".extraConfig = ''
|
||||
import hetzner
|
||||
${auth}
|
||||
import auth
|
||||
reverse_proxy localhost:${builtins.toString config.services.bazarr.listenPort}
|
||||
'';
|
||||
"prowlarr.tsuba.darksailor.dev".extraConfig = ''
|
||||
import hetzner
|
||||
${auth}
|
||||
import auth
|
||||
reverse_proxy mirai.darksailor.dev:9696
|
||||
'';
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user