feat: Try to use auth as a caddy import
This commit is contained in:
@@ -1,6 +1,17 @@
|
|||||||
{pkgs, ...}: {
|
{
|
||||||
home.packages = with pkgs;
|
inputs,
|
||||||
lib.optionals pkgs.stdenv.isLinux [
|
pkgs,
|
||||||
(pkgs.callPackage ./orcaslicer/package.nix {})
|
device,
|
||||||
];
|
...
|
||||||
|
}: let
|
||||||
|
pkgs' = pkgs.applyPatches {
|
||||||
|
name = "nixpkgs-orcaslicer-430171";
|
||||||
|
src = inputs.nixpkgs;
|
||||||
|
patches = [../../patches/430171.patch];
|
||||||
|
};
|
||||||
|
pkgsPatched = import pkgs' {system = device.system;};
|
||||||
|
in {
|
||||||
|
home.packages = [
|
||||||
|
pkgsPatched.orca-slicer
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,47 +27,47 @@
|
|||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
environmentFile = config.sops.templates."craftmine.env".path;
|
environmentFile = config.sops.templates."craftmine.env".path;
|
||||||
servers = {
|
servers = {
|
||||||
fabric = {
|
# fabric = {
|
||||||
inherit whitelist;
|
# inherit whitelist;
|
||||||
enable = true;
|
# enable = true;
|
||||||
# enable-rcon = true;
|
# # enable-rcon = true;
|
||||||
jvmOpts = "-Xmx4G -Xms4G";
|
# jvmOpts = "-Xmx4G -Xms4G";
|
||||||
package = pkgs.fabricServers.fabric-1_21_1;
|
# package = pkgs.fabricServers.fabric-1_21_1;
|
||||||
serverProperties = {
|
# serverProperties = {
|
||||||
motd = "Servius's Fabric Minecraft Server";
|
# motd = "Servius's Fabric Minecraft Server";
|
||||||
server-port = 25567;
|
# server-port = 25567;
|
||||||
level-seed = "4504535438041489910";
|
# level-seed = "4504535438041489910";
|
||||||
view-distance = 24;
|
# view-distance = 24;
|
||||||
white-list = true;
|
# white-list = true;
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
craftmine = {
|
# craftmine = {
|
||||||
inherit whitelist;
|
# inherit whitelist;
|
||||||
enable = true;
|
# enable = true;
|
||||||
jvmOpts = "-Xmx4G -Xms4G";
|
# jvmOpts = "-Xmx4G -Xms4G";
|
||||||
package = let
|
# package = let
|
||||||
getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
|
# getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
|
||||||
in
|
# in
|
||||||
pkgs.minecraft-server.override {
|
# pkgs.minecraft-server.override {
|
||||||
url = "https://piston-data.mojang.com/v1/objects/4527a9019e37e001770787e4523b505f79cac4c5/server.jar";
|
# url = "https://piston-data.mojang.com/v1/objects/4527a9019e37e001770787e4523b505f79cac4c5/server.jar";
|
||||||
sha1 = "sha1-RSepAZ434AF3B4fkUjtQX3nKxMU=";
|
# sha1 = "sha1-RSepAZ434AF3B4fkUjtQX3nKxMU=";
|
||||||
version = "25w14craftmine";
|
# version = "25w14craftmine";
|
||||||
jre_headless = getJavaVersion 21;
|
# jre_headless = getJavaVersion 21;
|
||||||
};
|
# };
|
||||||
|
#
|
||||||
serverProperties = {
|
# serverProperties = {
|
||||||
enable-rcon = true;
|
# enable-rcon = true;
|
||||||
"rcon.password" = "@CRAFTMINE_RCON_PASSWORD@";
|
# "rcon.password" = "@CRAFTMINE_RCON_PASSWORD@";
|
||||||
motd = "Servius's Craftmine Server";
|
# motd = "Servius's Craftmine Server";
|
||||||
server-port = 25570;
|
# server-port = 25570;
|
||||||
white-list = true;
|
# white-list = true;
|
||||||
view-distance = 32;
|
# view-distance = 32;
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
craftmine-v2 = {
|
craftmine-v2 = {
|
||||||
inherit whitelist;
|
inherit whitelist;
|
||||||
enable = true;
|
enable = true;
|
||||||
jvmOpts = "-Xmx4G -Xms4G";
|
jvmOpts = "-Xmx16G -Xms4G";
|
||||||
package = let
|
package = let
|
||||||
getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
|
getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -23,6 +23,12 @@
|
|||||||
resolvers 1.1.1.1
|
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 {
|
package = pkgs.caddy.withPlugins {
|
||||||
plugins = ["github.com/caddy-dns/hetzner@v1.0.0"];
|
plugins = ["github.com/caddy-dns/hetzner@v1.0.0"];
|
||||||
|
|||||||
@@ -35,37 +35,30 @@
|
|||||||
package = unstablePkgs.bazarr;
|
package = unstablePkgs.bazarr;
|
||||||
group = "media";
|
group = "media";
|
||||||
};
|
};
|
||||||
caddy.virtualHosts = let
|
caddy.virtualHosts = {
|
||||||
auth = ''
|
|
||||||
forward_auth mirai:5555 {
|
|
||||||
uri /api/authz/forward-auth
|
|
||||||
copy_headers Remote-User Remote-Groups Remote-Email Remote-Name
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
"sonarr.tsuba.darksailor.dev".extraConfig = ''
|
"sonarr.tsuba.darksailor.dev".extraConfig = ''
|
||||||
import hetzner
|
import hetzner
|
||||||
${auth}
|
import auth
|
||||||
reverse_proxy localhost:${builtins.toString config.services.sonarr.settings.server.port}
|
reverse_proxy localhost:${builtins.toString config.services.sonarr.settings.server.port}
|
||||||
'';
|
'';
|
||||||
"radarr.tsuba.darksailor.dev".extraConfig = ''
|
"radarr.tsuba.darksailor.dev".extraConfig = ''
|
||||||
import hetzner
|
import hetzner
|
||||||
${auth}
|
import auth
|
||||||
reverse_proxy localhost:${builtins.toString config.services.radarr.settings.server.port}
|
reverse_proxy localhost:${builtins.toString config.services.radarr.settings.server.port}
|
||||||
'';
|
'';
|
||||||
"lidarr.tsuba.darksailor.dev".extraConfig = ''
|
"lidarr.tsuba.darksailor.dev".extraConfig = ''
|
||||||
import hetzner
|
import hetzner
|
||||||
${auth}
|
import auth
|
||||||
reverse_proxy localhost:${builtins.toString config.services.lidarr.settings.server.port}
|
reverse_proxy localhost:${builtins.toString config.services.lidarr.settings.server.port}
|
||||||
'';
|
'';
|
||||||
"bazarr.tsuba.darksailor.dev".extraConfig = ''
|
"bazarr.tsuba.darksailor.dev".extraConfig = ''
|
||||||
import hetzner
|
import hetzner
|
||||||
${auth}
|
import auth
|
||||||
reverse_proxy localhost:${builtins.toString config.services.bazarr.listenPort}
|
reverse_proxy localhost:${builtins.toString config.services.bazarr.listenPort}
|
||||||
'';
|
'';
|
||||||
"prowlarr.tsuba.darksailor.dev".extraConfig = ''
|
"prowlarr.tsuba.darksailor.dev".extraConfig = ''
|
||||||
import hetzner
|
import hetzner
|
||||||
${auth}
|
import auth
|
||||||
reverse_proxy mirai.darksailor.dev:9696
|
reverse_proxy mirai.darksailor.dev:9696
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
73
patches/430171.patch
Normal file
73
patches/430171.patch
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
From 3f49f2d9783151520ac0b9a588581454b60fd2ad Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lin Xianyi <iynaix@gmail.com>
|
||||||
|
Date: Sat, 2 Aug 2025 01:15:23 +0800
|
||||||
|
Subject: [PATCH] orca-slicer: remove dependency on libsoup2
|
||||||
|
|
||||||
|
---
|
||||||
|
pkgs/by-name/or/orca-slicer/package.nix | 13 +++++++++++--
|
||||||
|
...stream-CMakeLists-Link-against-webkit2gtk-.patch | 7 +++----
|
||||||
|
2 files changed, 14 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
|
||||||
|
index 7e817859988acd..e1376110dcd38e 100644
|
||||||
|
--- a/pkgs/by-name/or/orca-slicer/package.nix
|
||||||
|
+++ b/pkgs/by-name/or/orca-slicer/package.nix
|
||||||
|
@@ -35,7 +35,7 @@
|
||||||
|
pcre,
|
||||||
|
systemd,
|
||||||
|
tbb_2021,
|
||||||
|
- webkitgtk_4_0,
|
||||||
|
+ webkitgtk_4_1,
|
||||||
|
wxGTK31,
|
||||||
|
xorg,
|
||||||
|
libnoise,
|
||||||
|
@@ -47,8 +47,17 @@ let
|
||||||
|
withCurl = true;
|
||||||
|
withPrivateFonts = true;
|
||||||
|
withWebKit = true;
|
||||||
|
+ webkitgtk_4_0 = webkitgtk_4_1;
|
||||||
|
}).overrideAttrs
|
||||||
|
(old: {
|
||||||
|
+ src = fetchFromGitHub {
|
||||||
|
+ owner = "SoftFever";
|
||||||
|
+ repo = "Orca-deps-wxWidgets";
|
||||||
|
+ rev = "acdc6db5064274405c323c3823eedf559bbe0474";
|
||||||
|
+ hash = "sha256-Rt03VK0AzZyROkya0zRKpckS/OSa74pLTNbZoJiitfo=";
|
||||||
|
+ fetchSubmodules = true;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
configureFlags = old.configureFlags ++ [
|
||||||
|
# Disable noisy debug dialogs
|
||||||
|
"--enable-debug=no"
|
||||||
|
@@ -112,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
openvdb
|
||||||
|
pcre
|
||||||
|
tbb_2021
|
||||||
|
- webkitgtk_4_0
|
||||||
|
+ webkitgtk_4_1
|
||||||
|
wxGTK'
|
||||||
|
xorg.libX11
|
||||||
|
opencv.cxxdev
|
||||||
|
diff --git a/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch b/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
|
||||||
|
index 15f1bf8f0b59e1..8cf3345131449f 100644
|
||||||
|
--- a/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
|
||||||
|
+++ b/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
|
||||||
|
@@ -20,15 +20,14 @@ index 9c5cb96..e92a0e3 100644
|
||||||
|
@@ -175,6 +175,11 @@ if (WIN32)
|
||||||
|
target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)
|
||||||
|
endif ()
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+# We link against webkit2gtk symbols in src/slic3r/GUI/Widgets/WebView.cpp
|
||||||
|
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||||
|
-+ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.0")
|
||||||
|
++ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.1")
|
||||||
|
+endif ()
|
||||||
|
+
|
||||||
|
# Link the resources dir to where Slic3r GUI expects it
|
||||||
|
set(output_dlls_Release "")
|
||||||
|
set(output_dlls_Debug "")
|
||||||
|
---
|
||||||
|
+--
|
||||||
|
2.38.1
|
||||||
|
-
|
||||||
Reference in New Issue
Block a user