Merge pull request #144455 from Twingate/master
This commit is contained in:
commit
69dff6a36c
|
@ -14127,6 +14127,12 @@
|
||||||
githubId = 8794235;
|
githubId = 8794235;
|
||||||
name = "Tom Siewert";
|
name = "Tom Siewert";
|
||||||
};
|
};
|
||||||
|
tonyshkurenko = {
|
||||||
|
email = "support@twingate.com";
|
||||||
|
github = "tonyshkurenko";
|
||||||
|
githubId = 8597964;
|
||||||
|
name = "Anton Shkurenko";
|
||||||
|
};
|
||||||
toonn = {
|
toonn = {
|
||||||
email = "nixpkgs@toonn.io";
|
email = "nixpkgs@toonn.io";
|
||||||
matrix = "@toonn:matrix.org";
|
matrix = "@toonn:matrix.org";
|
||||||
|
|
|
@ -561,6 +561,14 @@
|
||||||
<link xlink:href="options.html#opt-services.prometheus.exporters.smartctl.enable">services.prometheus.exporters.smartctl</link>.
|
<link xlink:href="options.html#opt-services.prometheus.exporters.smartctl.enable">services.prometheus.exporters.smartctl</link>.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<link xlink:href="https://docs.twingate.com/docs/linux">twingate</link>,
|
||||||
|
a high performance, easy to use zero trust solution that
|
||||||
|
enables access to private resources from any device with
|
||||||
|
better security than a VPN.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
<section xml:id="sec-release-21.11-incompatibilities">
|
<section xml:id="sec-release-21.11-incompatibilities">
|
||||||
|
|
|
@ -164,6 +164,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
- [smartctl_exporter](https://github.com/prometheus-community/smartctl_exporter), a Prometheus exporter for [S.M.A.R.T.](https://en.wikipedia.org/wiki/S.M.A.R.T.) data. Available as [services.prometheus.exporters.smartctl](options.html#opt-services.prometheus.exporters.smartctl.enable).
|
- [smartctl_exporter](https://github.com/prometheus-community/smartctl_exporter), a Prometheus exporter for [S.M.A.R.T.](https://en.wikipedia.org/wiki/S.M.A.R.T.) data. Available as [services.prometheus.exporters.smartctl](options.html#opt-services.prometheus.exporters.smartctl.enable).
|
||||||
|
|
||||||
|
- [twingate](https://docs.twingate.com/docs/linux), a high performance, easy to use zero trust solution that enables access to private resources from any device with better security than a VPN.
|
||||||
|
|
||||||
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
|
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
|
||||||
|
|
||||||
- The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix` (`pkgs.testers.nixosTest` since 22.05), now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.
|
- The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix` (`pkgs.testers.nixosTest` since 22.05), now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.
|
||||||
|
|
|
@ -988,6 +988,7 @@
|
||||||
./services/networking/tox-node.nix
|
./services/networking/tox-node.nix
|
||||||
./services/networking/toxvpn.nix
|
./services/networking/toxvpn.nix
|
||||||
./services/networking/tvheadend.nix
|
./services/networking/tvheadend.nix
|
||||||
|
./services/networking/twingate.nix
|
||||||
./services/networking/ucarp.nix
|
./services/networking/ucarp.nix
|
||||||
./services/networking/unbound.nix
|
./services/networking/unbound.nix
|
||||||
./services/networking/unifi.nix
|
./services/networking/unifi.nix
|
||||||
|
|
28
nixos/modules/services/networking/twingate.nix
Normal file
28
nixos/modules/services/networking/twingate.nix
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.twingate;
|
||||||
|
|
||||||
|
in {
|
||||||
|
|
||||||
|
options.services.twingate = {
|
||||||
|
enable = mkEnableOption (lib.mdDoc "Twingate Client daemon");
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
|
networking.firewall.checkReversePath = lib.mkDefault false;
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = [ pkgs.twingate ]; # for the CLI
|
||||||
|
systemd.packages = [ pkgs.twingate ];
|
||||||
|
|
||||||
|
systemd.services.twingate.preStart = ''
|
||||||
|
cp -r -n ${pkgs.twingate}/etc/twingate/. /etc/twingate/
|
||||||
|
'';
|
||||||
|
|
||||||
|
systemd.services.twingate.wantedBy = [ "multi-user.target" ];
|
||||||
|
};
|
||||||
|
}
|
51
pkgs/applications/networking/twingate/default.nix
Normal file
51
pkgs/applications/networking/twingate/default.nix
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
{ autoPatchelfHook
|
||||||
|
, curl
|
||||||
|
, dpkg
|
||||||
|
, dbus
|
||||||
|
, fetchurl
|
||||||
|
, lib
|
||||||
|
, libnl
|
||||||
|
, udev
|
||||||
|
, cryptsetup
|
||||||
|
, stdenv
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "twingate";
|
||||||
|
version = "1.0.60";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://binaries.twingate.com/client/linux/DEB/${version}/twingate-amd64.deb";
|
||||||
|
sha256 = "b308c422af8a33ecd58e21a10a72c353351a189df67006e38d1ec029a93d5678";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ dbus curl libnl udev cryptsetup ];
|
||||||
|
nativeBuildInputs = [ dpkg autoPatchelfHook ];
|
||||||
|
|
||||||
|
unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root";
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
while read file; do
|
||||||
|
substituteInPlace "$file" \
|
||||||
|
--replace "/usr/bin" "$out/bin" \
|
||||||
|
--replace "/usr/sbin" "$out/bin"
|
||||||
|
done < <(find etc usr/lib usr/share -type f)
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir $out
|
||||||
|
mv etc $out/
|
||||||
|
mv usr/bin $out/bin
|
||||||
|
mv usr/sbin/* $out/bin
|
||||||
|
mv usr/lib $out/lib
|
||||||
|
mv usr/share $out/share
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Twingate Client";
|
||||||
|
homepage = "https://twingate.com";
|
||||||
|
license = licenses.unfree;
|
||||||
|
maintainers = with maintainers; [ tonyshkurenko ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -26052,6 +26052,8 @@ with pkgs;
|
||||||
|
|
||||||
twa = callPackage ../tools/networking/twa { };
|
twa = callPackage ../tools/networking/twa { };
|
||||||
|
|
||||||
|
twingate = callPackage ../applications/networking/twingate { };
|
||||||
|
|
||||||
# Upstream U-Boots:
|
# Upstream U-Boots:
|
||||||
inherit (callPackage ../misc/uboot {})
|
inherit (callPackage ../misc/uboot {})
|
||||||
buildUBoot
|
buildUBoot
|
||||||
|
|
Loading…
Reference in a new issue