Skip to content

Commit

Permalink
Fixed some bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
rasmus-kirk committed Feb 24, 2024
1 parent f1e1b59 commit 435cdd1
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 25 deletions.
6 changes: 3 additions & 3 deletions nixarr/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ in {
};

vpn = {
enable = mkEnableOption ''Enable vpn'';
enable = mkEnableOption "Enable vpn";

wgConf = mkOption {
type = types.nullOr types.path;
Expand Down Expand Up @@ -150,7 +150,7 @@ in {
};
transmission = {
isSystemUser = true;
group = "transmission";
group = "media";
uid = lib.mkForce 70;
};
prowlarr = {
Expand Down Expand Up @@ -190,7 +190,7 @@ in {
];

util-nixarr.vpnnamespace = {
enable = true;
enable = cfg.vpn.enable;
accessibleFrom = [
"192.168.1.0/24"
"127.0.0.1"
Expand Down
40 changes: 18 additions & 22 deletions util/vpnNamespace/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,25 @@ with lib; let
cfg = config.util-nixarr.vpnnamespace;
in {
options.util-nixarr.vpnnamespace = {
enable =
mkEnableOption (lib.mdDoc "VPN Namespace")
// {
description = lib.mdDoc ''
Whether to enable the VPN namespace.
To access the namespace a veth pair is used to
connect the vpn namespace and the default namespace
through a linux bridge. One end of the pair is
connected to the linux bridge on the default namespace.
The other end is connected to the vpn namespace.
Systemd services can be run within the namespace by
adding these options:
bindsTo = [ "[email protected]" ];
requires = [ "network-online.target" ];
after = [ "wg.service" ];
serviceConfig = {
NetworkNamespacePath = "/var/run/netns/wg";
};
'';
enable = mkEnableOption ''
Whether to enable the VPN namespace.
To access the namespace a veth pair is used to
connect the vpn namespace and the default namespace
through a linux bridge. One end of the pair is
connected to the linux bridge on the default namespace.
The other end is connected to the vpn namespace.
Systemd services can be run within the namespace by
adding these options:
bindsTo = [ "[email protected]" ];
requires = [ "network-online.target" ];
after = [ "wg.service" ];
serviceConfig = {
NetworkNamespacePath = "/var/run/netns/wg";
};
'';

accessibleFrom = mkOption {
type = types.listOf types.str;
Expand Down

0 comments on commit 435cdd1

Please sign in to comment.