mirror of
https://github.com/oddlama/nix-config.git
synced 2025-10-10 23:00:39 +02:00
chore: remove firezone again (waiting for upstream PR)
This commit is contained in:
oddlama
parent
a3f74254e7
commit
2406dddd8e
21 changed files with 0 additions and 4208 deletions
|
|
@ -19,13 +19,6 @@ _inputs: [
|
|||
# (_pythonFinal: pythonPrev: {
|
||||
# })
|
||||
# ];
|
||||
firezone-server-domain = prev.callPackage ./firezone-server-domain/package.nix { };
|
||||
firezone-server-web = prev.callPackage ./firezone-server-web/package.nix { };
|
||||
firezone-server-api = prev.callPackage ./firezone-server-api/package.nix { };
|
||||
firezone-gateway = prev.callPackage ./firezone-gateway/package.nix { };
|
||||
firezone-relay = prev.callPackage ./firezone-relay/package.nix { };
|
||||
firezone-gui-client = prev.callPackage ./firezone-gui-client/package.nix { };
|
||||
firezone-headless-client = prev.callPackage ./firezone-headless-client/package.nix { };
|
||||
|
||||
mdns-repeater = prev.callPackage ./mdns-repeater.nix { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firezone-gateway";
|
||||
version = "1.4.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "oddlama";
|
||||
repo = "firezone";
|
||||
rev = "feat/configurable-gateway-interface";
|
||||
hash = "sha256-dsGQubRs/ZHdAd6MHpa+3K4vGm4OnCdf1yMlGG1AIJk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-odrexu5mBGmvHNF4cUu9PDIEdxZC451lWV7dsLYT/Sg=";
|
||||
sourceRoot = "${src.name}/rust";
|
||||
buildAndTestSubdir = "gateway";
|
||||
|
||||
# Required to remove profiling arguments which conflict with this builder
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "WireGuard tunnel server for the Firezone zero-trust access platform";
|
||||
homepage = "https://github.com/firezone/firezone";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
oddlama
|
||||
patrickdag
|
||||
];
|
||||
mainProgram = "firezone-gateway";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,281 +0,0 @@
|
|||
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
|
||||
index 9645ee069..558339b1f 100644
|
||||
--- a/rust/Cargo.lock
|
||||
+++ b/rust/Cargo.lock
|
||||
@@ -951,7 +951,7 @@ dependencies = [
|
||||
"cocoa-foundation 0.1.2",
|
||||
"core-foundation 0.9.4",
|
||||
"core-graphics 0.23.2",
|
||||
- "foreign-types",
|
||||
+ "foreign-types 0.5.0",
|
||||
"libc",
|
||||
"objc",
|
||||
]
|
||||
@@ -967,7 +967,7 @@ dependencies = [
|
||||
"cocoa-foundation 0.2.0",
|
||||
"core-foundation 0.10.0",
|
||||
"core-graphics 0.24.0",
|
||||
- "foreign-types",
|
||||
+ "foreign-types 0.5.0",
|
||||
"libc",
|
||||
"objc",
|
||||
]
|
||||
@@ -1173,7 +1173,7 @@ dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"core-foundation 0.9.4",
|
||||
"core-graphics-types 0.1.3",
|
||||
- "foreign-types",
|
||||
+ "foreign-types 0.5.0",
|
||||
"libc",
|
||||
]
|
||||
|
||||
@@ -1186,7 +1186,7 @@ dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"core-foundation 0.10.0",
|
||||
"core-graphics-types 0.2.0",
|
||||
- "foreign-types",
|
||||
+ "foreign-types 0.5.0",
|
||||
"libc",
|
||||
]
|
||||
|
||||
@@ -1999,6 +1999,7 @@ dependencies = [
|
||||
"firezone-logging",
|
||||
"firezone-telemetry",
|
||||
"futures",
|
||||
+ "hyper-tls",
|
||||
"native-dialog",
|
||||
"nix 0.29.0",
|
||||
"rand 0.8.5",
|
||||
@@ -2281,6 +2282,15 @@ version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
|
||||
|
||||
+[[package]]
|
||||
+name = "foreign-types"
|
||||
+version = "0.3.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
|
||||
+dependencies = [
|
||||
+ "foreign-types-shared 0.1.1",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "foreign-types"
|
||||
version = "0.5.0"
|
||||
@@ -2288,7 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
|
||||
dependencies = [
|
||||
"foreign-types-macros",
|
||||
- "foreign-types-shared",
|
||||
+ "foreign-types-shared 0.3.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2302,6 +2312,12 @@ dependencies = [
|
||||
"syn 2.0.87",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "foreign-types-shared"
|
||||
+version = "0.1.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
|
||||
+
|
||||
[[package]]
|
||||
name = "foreign-types-shared"
|
||||
version = "0.3.1"
|
||||
@@ -3035,6 +3051,22 @@ dependencies = [
|
||||
"tower-service",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "hyper-tls"
|
||||
+version = "0.6.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
|
||||
+dependencies = [
|
||||
+ "bytes",
|
||||
+ "http-body-util",
|
||||
+ "hyper",
|
||||
+ "hyper-util",
|
||||
+ "native-tls",
|
||||
+ "tokio",
|
||||
+ "tokio-native-tls",
|
||||
+ "tower-service",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "hyper-util"
|
||||
version = "0.1.9"
|
||||
@@ -3723,6 +3755,23 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "native-tls"
|
||||
+version = "0.2.12"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+ "log",
|
||||
+ "openssl",
|
||||
+ "openssl-probe",
|
||||
+ "openssl-sys",
|
||||
+ "schannel",
|
||||
+ "security-framework",
|
||||
+ "security-framework-sys",
|
||||
+ "tempfile",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "ndk"
|
||||
version = "0.9.0"
|
||||
@@ -4286,6 +4335,50 @@ dependencies = [
|
||||
"pathdiff",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "openssl"
|
||||
+version = "0.10.68"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
|
||||
+dependencies = [
|
||||
+ "bitflags 2.6.0",
|
||||
+ "cfg-if",
|
||||
+ "foreign-types 0.3.2",
|
||||
+ "libc",
|
||||
+ "once_cell",
|
||||
+ "openssl-macros",
|
||||
+ "openssl-sys",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "openssl-macros"
|
||||
+version = "0.1.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "syn 2.0.87",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "openssl-probe"
|
||||
+version = "0.1.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "openssl-sys"
|
||||
+version = "0.9.104"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
|
||||
+dependencies = [
|
||||
+ "cc",
|
||||
+ "libc",
|
||||
+ "pkg-config",
|
||||
+ "vcpkg",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "opentelemetry"
|
||||
version = "0.26.0"
|
||||
@@ -5385,6 +5478,15 @@ dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "schannel"
|
||||
+version = "0.1.27"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
|
||||
+dependencies = [
|
||||
+ "windows-sys 0.59.0",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "schemars"
|
||||
version = "0.8.21"
|
||||
@@ -5474,6 +5576,29 @@ dependencies = [
|
||||
"zbus",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "security-framework"
|
||||
+version = "2.11.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
|
||||
+dependencies = [
|
||||
+ "bitflags 2.6.0",
|
||||
+ "core-foundation 0.9.4",
|
||||
+ "core-foundation-sys",
|
||||
+ "libc",
|
||||
+ "security-framework-sys",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "security-framework-sys"
|
||||
+version = "2.14.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
|
||||
+dependencies = [
|
||||
+ "core-foundation-sys",
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "selectors"
|
||||
version = "0.22.0"
|
||||
@@ -5947,7 +6072,7 @@ dependencies = [
|
||||
"bytemuck",
|
||||
"cfg_aliases",
|
||||
"core-graphics 0.24.0",
|
||||
- "foreign-types",
|
||||
+ "foreign-types 0.5.0",
|
||||
"js-sys",
|
||||
"log",
|
||||
"objc2",
|
||||
@@ -6786,6 +6911,16 @@ dependencies = [
|
||||
"syn 2.0.87",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "tokio-native-tls"
|
||||
+version = "0.3.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
|
||||
+dependencies = [
|
||||
+ "native-tls",
|
||||
+ "tokio",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "tokio-rustls"
|
||||
version = "0.26.0"
|
||||
@@ -7395,6 +7530,12 @@ version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
|
||||
|
||||
+[[package]]
|
||||
+name = "vcpkg"
|
||||
+version = "0.2.15"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
||||
+
|
||||
[[package]]
|
||||
name = "version-compare"
|
||||
version = "0.2.0"
|
||||
diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml
|
||||
index 32ca56197..f0475e6bf 100644
|
||||
--- a/rust/gui-client/src-tauri/Cargo.toml
|
||||
+++ b/rust/gui-client/src-tauri/Cargo.toml
|
||||
@@ -25,6 +25,7 @@ firezone-headless-client = { workspace = true }
|
||||
firezone-logging = { workspace = true }
|
||||
firezone-telemetry = { workspace = true }
|
||||
futures = { workspace = true }
|
||||
+hyper-tls = "0.6.0"
|
||||
native-dialog = { workspace = true }
|
||||
rand = { workspace = true }
|
||||
rustls = { workspace = true }
|
||||
|
|
@ -1,153 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
dbus,
|
||||
openssl,
|
||||
zenity,
|
||||
cargo-tauri,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
kdialog,
|
||||
libsoup_3,
|
||||
libayatana-appindicator,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook3,
|
||||
stdenvNoCC,
|
||||
git,
|
||||
pnpm_9,
|
||||
nodejs,
|
||||
}:
|
||||
let
|
||||
version = "1.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "firezone";
|
||||
repo = "firezone";
|
||||
tag = "gui-client-${version}";
|
||||
hash = "sha256-gwlkHTFVd1gHwOOIar+5+LEP2ovoyEIMmLfPxYb/OCs=";
|
||||
# FIXME: remove once https://github.com/firezone/firezone/pull/7808 is released
|
||||
# FIXME: somehow still required...
|
||||
postFetch = ''
|
||||
${lib.getExe git} -C $out apply ${./0000-add-hyper-tls-dependency.patch}
|
||||
'';
|
||||
};
|
||||
|
||||
frontend = stdenvNoCC.mkDerivation rec {
|
||||
pname = "firezone-gui-client-frontend";
|
||||
inherit version src;
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version;
|
||||
src = "${src}/rust/gui-client";
|
||||
hash = "sha256-Gc+X4mbpHa8b/Ol6Fee7VFpTPG25LksoAEjFww1WH5I=";
|
||||
};
|
||||
pnpmRoot = "rust/gui-client";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pnpm_9.configHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
cd $pnpmRoot
|
||||
cp node_modules/flowbite/dist/flowbite.min.js src/
|
||||
pnpm tailwindcss -i src/input.css -o src/output.css
|
||||
node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firezone-gui-client";
|
||||
inherit version src;
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-eqkYwP14kca7Q/P9wc+CvTBmKETTmbd06EBNx3MKLro=";
|
||||
sourceRoot = "${src.name}/rust";
|
||||
buildAndTestSubdir = "gui-client";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
dbus
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libsoup_3
|
||||
|
||||
libayatana-appindicator
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
# Required to remove profiling arguments which conflict with this builder
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
ln -s ${frontend} gui-client/dist
|
||||
'';
|
||||
|
||||
# Required to run tests
|
||||
preCheck = ''
|
||||
export XDG_RUNTIME_DIR=$(mktemp -d)
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
# Requires network access
|
||||
"--skip=notifiers"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# Otherwise blank screen, see https://github.com/tauri-apps/tauri/issues/9304
|
||||
--set WEBKIT_DISABLE_DMABUF_RENDERER 1
|
||||
--prefix PATH ":" ${
|
||||
lib.makeBinPath [
|
||||
zenity
|
||||
kdialog
|
||||
]
|
||||
}
|
||||
--prefix LD_LIBRARY_PATH ":" ${
|
||||
lib.makeLibraryPath [
|
||||
libayatana-appindicator
|
||||
]
|
||||
}
|
||||
)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit frontend;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "GUI client for the Firezone zero-trust access platform";
|
||||
homepage = "https://github.com/firezone/firezone";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
oddlama
|
||||
patrickdag
|
||||
];
|
||||
mainProgram = "firezone-gui-client";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firezone-headless-client";
|
||||
version = "1.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "oddlama";
|
||||
repo = "firezone";
|
||||
rev = "feat/configurable-gateway-interface";
|
||||
hash = "sha256-dsGQubRs/ZHdAd6MHpa+3K4vGm4OnCdf1yMlGG1AIJk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-odrexu5mBGmvHNF4cUu9PDIEdxZC451lWV7dsLYT/Sg=";
|
||||
sourceRoot = "${src.name}/rust";
|
||||
buildAndTestSubdir = "headless-client";
|
||||
|
||||
# Required to remove profiling arguments which conflict with this builder
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
|
||||
# Required to run tests
|
||||
preCheck = ''
|
||||
export XDG_RUNTIME_DIR=$(mktemp -d)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "CLI client for the Firezone zero-trust access platform";
|
||||
homepage = "https://github.com/firezone/firezone";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
oddlama
|
||||
patrickdag
|
||||
];
|
||||
mainProgram = "firezone-headless-client";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firezone-relay";
|
||||
version = "unstable-2025-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "firezone";
|
||||
repo = "firezone";
|
||||
rev = "8c9427b7b133e5050be34c2ac0e831c12c08f02c";
|
||||
hash = "sha256-yccplADHRJQQiKrmHcJ5rvouswHrbx4K6ysnIAoZJR0=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-WpJL5ALFMvyYv3QI5gMazAj6BVr4oyGq+zOo40rxqOE=";
|
||||
sourceRoot = "${src.name}/rust";
|
||||
buildAndTestSubdir = "relay";
|
||||
|
||||
# Required to remove profiling arguments which conflict with this builder
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "STUN/TURN server for the Firezone zero-trust access platform";
|
||||
homepage = "https://github.com/firezone/firezone";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
oddlama
|
||||
patrickdag
|
||||
];
|
||||
mainProgram = "firezone-relay";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
import ../firezone-server-domain/generic.nix {
|
||||
mixReleaseName = "api";
|
||||
}
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
diff --git a/apps/domain/lib/domain/config/definitions.ex b/apps/domain/lib/domain/config/definitions.ex
|
||||
index 8cd2e8d0f..de55c8e8f 100644
|
||||
--- a/apps/domain/lib/domain/config/definitions.ex
|
||||
+++ b/apps/domain/lib/domain/config/definitions.ex
|
||||
@@ -120,6 +120,7 @@ defmodule Domain.Config.Definitions do
|
||||
]},
|
||||
{"Instrumentation",
|
||||
[
|
||||
+ :healthz_port,
|
||||
:instrumentation_client_logs_enabled,
|
||||
:instrumentation_client_logs_bucket,
|
||||
:telemetry_metrics_reporter,
|
||||
@@ -474,6 +475,19 @@ defmodule Domain.Config.Definitions do
|
||||
## Telemetry
|
||||
##############################################
|
||||
|
||||
+ @doc """
|
||||
+ The port for the internal healthz endpoint.
|
||||
+ """
|
||||
+ defconfig(:healthz_port, :integer,
|
||||
+ default: 4000,
|
||||
+ changeset: fn changeset, key ->
|
||||
+ Ecto.Changeset.validate_number(changeset, key,
|
||||
+ greater_than: 0,
|
||||
+ less_than_or_equal_to: 65_535
|
||||
+ )
|
||||
+ end
|
||||
+ )
|
||||
+
|
||||
@doc """
|
||||
Enable or disable the Firezone telemetry collection.
|
||||
|
||||
diff --git a/apps/domain/lib/domain/telemetry.ex b/apps/domain/lib/domain/telemetry.ex
|
||||
index af430358d..d154282b4 100644
|
||||
--- a/apps/domain/lib/domain/telemetry.ex
|
||||
+++ b/apps/domain/lib/domain/telemetry.ex
|
||||
@@ -13,7 +13,7 @@ defmodule Domain.Telemetry do
|
||||
|
||||
children = [
|
||||
# We start a /healthz endpoint that is used for liveness probes
|
||||
- {Bandit, plug: Telemetry.HealthzPlug, scheme: :http, port: 4000},
|
||||
+ {Bandit, plug: Telemetry.HealthzPlug, scheme: :http, port: Keyword.get(config, :healthz_port)},
|
||||
|
||||
# Telemetry poller will execute the given period measurements
|
||||
# every 10_000ms. Learn more here: https://hexdocs.pm/telemetry_metrics
|
||||
diff --git a/config/runtime.exs b/config/runtime.exs
|
||||
index 7817942fa..c6dfe9c31 100644
|
||||
--- a/config/runtime.exs
|
||||
+++ b/config/runtime.exs
|
||||
@@ -211,7 +211,9 @@ if config_env() == :prod do
|
||||
otlp_endpoint: System.get_env("OTLP_ENDPOINT")
|
||||
end
|
||||
|
||||
- config :domain, Domain.Telemetry, metrics_reporter: compile_config!(:telemetry_metrics_reporter)
|
||||
+ config :domain, Domain.Telemetry,
|
||||
+ healthz_port: compile_config!(:healthz_port),
|
||||
+ metrics_reporter: compile_config!(:telemetry_metrics_reporter)
|
||||
|
||||
if telemetry_metrics_reporter = compile_config!(:telemetry_metrics_reporter) do
|
||||
config :domain, telemetry_metrics_reporter, compile_config!(:telemetry_metrics_reporter_opts)
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
diff --git a/apps/domain/lib/domain/config.ex b/apps/domain/lib/domain/config.ex
|
||||
index 11fdcc3a1..9254f210d 100644
|
||||
--- a/apps/domain/lib/domain/config.ex
|
||||
+++ b/apps/domain/lib/domain/config.ex
|
||||
@@ -42,6 +42,24 @@ defmodule Domain.Config do
|
||||
end
|
||||
end
|
||||
|
||||
+ @doc """
|
||||
+ Similar to `compile_config/2` but returns nil if the configuration is invalid.
|
||||
+
|
||||
+ This function does not resolve values from the database because it's intended use is during
|
||||
+ compilation and before application boot (in `config/runtime.exs`).
|
||||
+
|
||||
+ If you need to resolve values from the database, use `fetch_config/1` or `fetch_config!/1`.
|
||||
+ """
|
||||
+ def compile_config(module \\ Definitions, key, env_config \\ System.get_env()) do
|
||||
+ case Fetcher.fetch_source_and_config(module, key, %{}, env_config) do
|
||||
+ {:ok, _source, value} ->
|
||||
+ value
|
||||
+
|
||||
+ {:error, reason} ->
|
||||
+ nil
|
||||
+ end
|
||||
+ end
|
||||
+
|
||||
def config_changeset(changeset, schema_key, config_key \\ nil) do
|
||||
config_key = config_key || schema_key
|
||||
|
||||
diff --git a/apps/domain/lib/domain/config/definitions.ex b/apps/domain/lib/domain/config/definitions.ex
|
||||
index 8cd2e8d0f..f27d67c69 100644
|
||||
--- a/apps/domain/lib/domain/config/definitions.ex
|
||||
+++ b/apps/domain/lib/domain/config/definitions.ex
|
||||
@@ -61,6 +61,7 @@ defmodule Domain.Config.Definitions do
|
||||
{"Database",
|
||||
[
|
||||
:database_host,
|
||||
+ :database_socket_dir,
|
||||
:database_port,
|
||||
:database_name,
|
||||
:database_user,
|
||||
@@ -255,6 +256,11 @@ defmodule Domain.Config.Definitions do
|
||||
"""
|
||||
defconfig(:database_host, :string, default: "postgres")
|
||||
|
||||
+ @doc """
|
||||
+ PostgreSQL socket directory (takes precedence over hostname).
|
||||
+ """
|
||||
+ defconfig(:database_socket_dir, :string, default: nil)
|
||||
+
|
||||
@doc """
|
||||
PostgreSQL port.
|
||||
"""
|
||||
diff --git a/config/runtime.exs b/config/runtime.exs
|
||||
index 7817942fa..14cbe182f 100644
|
||||
--- a/config/runtime.exs
|
||||
+++ b/config/runtime.exs
|
||||
@@ -1,22 +1,31 @@
|
||||
import Config
|
||||
|
||||
if config_env() == :prod do
|
||||
- import Domain.Config, only: [compile_config!: 1]
|
||||
+ import Domain.Config, only: [compile_config!: 1, compile_config: 1]
|
||||
|
||||
###############################
|
||||
##### Domain ##################
|
||||
###############################
|
||||
|
||||
- config :domain, Domain.Repo,
|
||||
- database: compile_config!(:database_name),
|
||||
- username: compile_config!(:database_user),
|
||||
- hostname: compile_config!(:database_host),
|
||||
- port: compile_config!(:database_port),
|
||||
- password: compile_config!(:database_password),
|
||||
- pool_size: compile_config!(:database_pool_size),
|
||||
- ssl: compile_config!(:database_ssl_enabled),
|
||||
- ssl_opts: compile_config!(:database_ssl_opts),
|
||||
- parameters: compile_config!(:database_parameters)
|
||||
+ config :domain,
|
||||
+ Domain.Repo,
|
||||
+ [
|
||||
+ {:database, compile_config!(:database_name)},
|
||||
+ {:username, compile_config!(:database_user)},
|
||||
+ {:port, compile_config!(:database_port)},
|
||||
+ {:pool_size, compile_config!(:database_pool_size)},
|
||||
+ {:ssl, compile_config!(:database_ssl_enabled)},
|
||||
+ {:ssl_opts, compile_config!(:database_ssl_opts)},
|
||||
+ {:parameters, compile_config!(:database_parameters)}
|
||||
+ ] ++
|
||||
+ if(compile_config(:database_password),
|
||||
+ do: [{:password, compile_config!(:database_password)}],
|
||||
+ else: []
|
||||
+ ) ++
|
||||
+ if(compile_config(:database_socket_dir),
|
||||
+ do: [{:socket_dir, compile_config!(:database_socket_dir)}],
|
||||
+ else: [{:hostname, compile_config!(:database_host)}]
|
||||
+ )
|
||||
|
||||
config :domain, Domain.Tokens,
|
||||
key_base: compile_config!(:tokens_key_base),
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
diff --git a/apps/domain/lib/domain/config/definitions.ex b/apps/domain/lib/domain/config/definitions.ex
|
||||
index 8cd2e8d0f..2e6ca054b 100644
|
||||
--- a/apps/domain/lib/domain/config/definitions.ex
|
||||
+++ b/apps/domain/lib/domain/config/definitions.ex
|
||||
@@ -584,6 +584,7 @@ defmodule Domain.Config.Definitions do
|
||||
Swoosh.Adapters.Mailgun,
|
||||
Swoosh.Adapters.Mailjet,
|
||||
Swoosh.Adapters.Mandrill,
|
||||
+ Swoosh.Adapters.Mua,
|
||||
Swoosh.Adapters.Postmark,
|
||||
Swoosh.Adapters.ProtonBridge,
|
||||
Swoosh.Adapters.SMTP,
|
||||
diff --git a/apps/web/lib/web/live/sign_up.ex b/apps/web/lib/web/live/sign_up.ex
|
||||
index dfbc94d9b..638e3b373 100644
|
||||
--- a/apps/web/lib/web/live/sign_up.ex
|
||||
+++ b/apps/web/lib/web/live/sign_up.ex
|
||||
@@ -1,5 +1,6 @@
|
||||
defmodule Web.SignUp do
|
||||
use Web, {:live_view, layout: {Web.Layouts, :public}}
|
||||
+ require Logger
|
||||
alias Domain.{Auth, Accounts, Actors, Config}
|
||||
alias Web.Registration
|
||||
|
||||
@@ -358,7 +359,9 @@ defmodule Web.SignUp do
|
||||
|
||||
{:noreply, assign(socket, form: to_form(changeset))}
|
||||
|
||||
- {:error, :send_email, _reason, _effects_so_far} ->
|
||||
+ {:error, :send_email, reason, _effects_so_far} ->
|
||||
+ Logger.warning("Failed to send sign_up email", reason: inspect(reason))
|
||||
+
|
||||
changeset =
|
||||
Ecto.Changeset.add_error(
|
||||
changeset,
|
||||
diff --git a/config/runtime.exs b/config/runtime.exs
|
||||
index 7817942fa..8704ccde5 100644
|
||||
--- a/config/runtime.exs
|
||||
+++ b/config/runtime.exs
|
||||
@@ -228,7 +228,21 @@ if config_env() == :prod do
|
||||
[
|
||||
adapter: compile_config!(:outbound_email_adapter),
|
||||
from_email: compile_config!(:outbound_email_from)
|
||||
- ] ++ compile_config!(:outbound_email_adapter_opts)
|
||||
+ ] ++
|
||||
+ (if System.get_env("OUTBOUND_EMAIL_ADAPTER") == "Elixir.Swoosh.Adapters.Mua" do
|
||||
+ [
|
||||
+ protocol: String.to_atom(System.get_env("OUTBOUND_EMAIL_SMTP_PROTOCOL")),
|
||||
+ relay: System.get_env("OUTBOUND_EMAIL_SMTP_HOST"),
|
||||
+ port: String.to_integer(System.get_env("OUTBOUND_EMAIL_SMTP_PORT")),
|
||||
+ auth: [
|
||||
+ username: System.get_env("OUTBOUND_EMAIL_SMTP_USERNAME"),
|
||||
+ password: System.get_env("OUTBOUND_EMAIL_SMTP_PASSWORD")
|
||||
+ ]
|
||||
+ ]
|
||||
+ else
|
||||
+ []
|
||||
+ end) ++
|
||||
+ compile_config!(:outbound_email_adapter_opts)
|
||||
|
||||
config :workos, WorkOS.Client,
|
||||
api_key: compile_config!(:workos_api_key),
|
||||
diff --git a/mix.exs b/mix.exs
|
||||
index 12782d631..dee1245d2 100644
|
||||
--- a/mix.exs
|
||||
+++ b/mix.exs
|
||||
@@ -47,7 +47,9 @@ defmodule Firezone.MixProject do
|
||||
# Formatter doesn't track dependencies of children applications
|
||||
{:phoenix, "~> 1.7.0"},
|
||||
{:phoenix_live_view, "~> 1.0.0-rc.0"},
|
||||
- {:floki, "~> 0.37.0"}
|
||||
+ {:floki, "~> 0.37.0"},
|
||||
+ {:mua, "~> 0.2.0"},
|
||||
+ {:mail, "~> 0.3.0"}
|
||||
]
|
||||
end
|
||||
|
||||
diff --git a/mix.lock b/mix.lock
|
||||
index 757829003..47775677d 100644
|
||||
--- a/mix.lock
|
||||
+++ b/mix.lock
|
||||
@@ -50,11 +50,13 @@
|
||||
"junit_formatter": {:hex, :junit_formatter, "3.4.0", "d0e8db6c34dab6d3c4154c3b46b21540db1109ae709d6cf99ba7e7a2ce4b1ac2", [:mix], [], "hexpm", "bb36e2ae83f1ced6ab931c4ce51dd3dbef1ef61bb4932412e173b0cfa259dacd"},
|
||||
"libcluster": {:hex, :libcluster, "3.3.3", "a4f17721a19004cfc4467268e17cff8b1f951befe428975dd4f6f7b84d927fe0", [:mix], [{:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "7c0a2275a0bb83c07acd17dab3c3bfb4897b145106750eeccc62d302e3bdfee5"},
|
||||
"logger_json": {:hex, :logger_json, "6.2.0", "13e2e9f5f7b195865c5c3ef3d296c3ad50e7ecb038d899433702a79e979b91d7", [:mix], [{:ecto, "~> 3.11", [hex: :ecto, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "98366d02bedbb56e41b25a6d248d566d4f4bc224bae2b1e982df00ed04ba9219"},
|
||||
+ "mail": {:hex, :mail, "0.3.1", "cb0a14e4ed8904e4e5a08214e686ccf6f9099346885db17d8c309381f865cc5c", [:mix], [], "hexpm", "1db701e89865c1d5fa296b2b57b1cd587587cca8d8a1a22892b35ef5a8e352a6"},
|
||||
"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
|
||||
"mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"},
|
||||
"mimerl": {:hex, :mimerl, "1.3.0", "d0cd9fc04b9061f82490f6581e0128379830e78535e017f7780f37fea7545726", [:rebar3], [], "hexpm", "a1e15a50d1887217de95f0b9b0793e32853f7c258a5cd227650889b38839fe9d"},
|
||||
"mint": {:hex, :mint, "1.6.2", "af6d97a4051eee4f05b5500671d47c3a67dac7386045d87a904126fd4bbcea2e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "5ee441dffc1892f1ae59127f74afe8fd82fda6587794278d924e4d90ea3d63f9"},
|
||||
"mix_audit": {:hex, :mix_audit, "2.1.4", "0a23d5b07350cdd69001c13882a4f5fb9f90fbd4cbf2ebc190a2ee0d187ea3e9", [:make, :mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}], "hexpm", "fd807653cc8c1cada2911129c7eb9e985e3cc76ebf26f4dd628bb25bbcaa7099"},
|
||||
+ "mua": {:hex, :mua, "0.2.4", "a9172ab0a1ac8732cf2699d739ceac3febcb9b4ffc540260ad2e32c0b6632af9", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "e7e4dacd5ad65f13e3542772e74a159c00bd2d5579e729e9bb72d2c73a266fb7"},
|
||||
"multipart": {:hex, :multipart, "0.4.0", "634880a2148d4555d050963373d0e3bbb44a55b2badd87fa8623166172e9cda0", [:mix], [{:mime, "~> 1.2 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}], "hexpm", "3c5604bc2fb17b3137e5d2abdf5dacc2647e60c5cc6634b102cf1aef75a06f0a"},
|
||||
"nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"},
|
||||
"nimble_options": {:hex, :nimble_options, "1.1.1", "e3a492d54d85fc3fd7c5baf411d9d2852922f66e69476317787a7b2bb000a61b", [:mix], [], "hexpm", "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"},
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
{
|
||||
mixReleaseName, # "domain" "web" or "api"
|
||||
}:
|
||||
{
|
||||
lib,
|
||||
nixosTests,
|
||||
fetchFromGitHub,
|
||||
beamPackages,
|
||||
pnpm_9,
|
||||
nodejs,
|
||||
tailwindcss,
|
||||
esbuild,
|
||||
}:
|
||||
|
||||
beamPackages.mixRelease rec {
|
||||
pname = "firezone-server-${mixReleaseName}";
|
||||
version = "unstable-2025-01-19";
|
||||
|
||||
src = "${
|
||||
fetchFromGitHub {
|
||||
owner = "firezone";
|
||||
repo = "firezone";
|
||||
rev = "8c9427b7b133e5050be34c2ac0e831c12c08f02c";
|
||||
hash = "sha256-yccplADHRJQQiKrmHcJ5rvouswHrbx4K6ysnIAoZJR0=";
|
||||
}
|
||||
}/elixir";
|
||||
patches = [
|
||||
./0000-add-healthz-port.patch
|
||||
./0001-postgres-socket.patch
|
||||
./0002-add-mua.patch
|
||||
];
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version;
|
||||
src = "${src}/apps/web/assets";
|
||||
hash = "sha256-6rhhGv3jQY5MkOMNe1GEtNyrzJYXCSzvo8RLlKelP10=";
|
||||
};
|
||||
pnpmRoot = "apps/web/assets";
|
||||
|
||||
preBuild = ''
|
||||
cat >> config/config.exs <<EOF
|
||||
config :tailwind, path: "${lib.getExe tailwindcss}"
|
||||
config :esbuild, path: "${lib.getExe esbuild}"
|
||||
EOF
|
||||
|
||||
cat >> config/runtime.exs <<EOF
|
||||
config :tzdata, :data_dir, System.get_env("TZDATA_DIR")
|
||||
EOF
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
pushd apps/web
|
||||
# for external task you need a workaround for the no deps check flag
|
||||
# https://github.com/phoenixframework/phoenix/issues/2690
|
||||
mix do deps.loadpaths --no-deps-check, assets.deploy
|
||||
mix do deps.loadpaths --no-deps-check, phx.digest priv/static
|
||||
popd
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pnpm_9
|
||||
pnpm_9.configHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
inherit mixReleaseName;
|
||||
|
||||
# https://github.com/elixir-cldr/cldr_numbers/pull/52
|
||||
mixNixDeps = import ./mix.nix {
|
||||
inherit lib beamPackages;
|
||||
overrides =
|
||||
final: prev:
|
||||
(lib.mapAttrs (
|
||||
_: value:
|
||||
value.override {
|
||||
appConfigPath = src + "/config";
|
||||
}
|
||||
) prev)
|
||||
// {
|
||||
ex_cldr_numbers = beamPackages.buildMix rec {
|
||||
name = "ex_cldr_numbers";
|
||||
version = "2.33.4";
|
||||
|
||||
src = beamPackages.fetchHex {
|
||||
pkg = "ex_cldr_numbers";
|
||||
version = "${version}";
|
||||
sha256 = "sha256-0Vt+IX6eYMMo5zBF5R3GfXrF0plyR7gz76ssabLtBvU=";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
final.decimal
|
||||
final.digital_token
|
||||
final.ex_cldr
|
||||
final.ex_cldr_currencies
|
||||
final.jason
|
||||
];
|
||||
};
|
||||
|
||||
# mix2nix does not support git dependencies yet,
|
||||
# so we need to add them manually
|
||||
openid_connect = beamPackages.buildMix {
|
||||
name = "openid_connect";
|
||||
version = "2024-06-15-unstable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firezone";
|
||||
repo = "openid_connect";
|
||||
rev = "e4d9dca8ae43c765c00a7d3dfa12d6f24f5b3418";
|
||||
hash = "sha256-LMmG+WWs83Hw/jcrersUMpk2tdXxkOU0CTe7qVbk6GQ=";
|
||||
};
|
||||
beamDeps = [
|
||||
final.jason
|
||||
final.finch
|
||||
final.jose
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) firezone;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Backend server for the Firezone zero-trust access platform";
|
||||
homepage = "https://github.com/firezone/firezone";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
oddlama
|
||||
patrickdag
|
||||
];
|
||||
mainProgram = mixReleaseName;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,3 +0,0 @@
|
|||
import ./generic.nix {
|
||||
mixReleaseName = "domain";
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
import ../firezone-server-domain/generic.nix {
|
||||
mixReleaseName = "web";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue