Fixed some bugs
This commit is contained in:
+3
-3
@@ -55,7 +55,7 @@ in {
|
||||
};
|
||||
|
||||
vpn = {
|
||||
enable = mkEnableOption ''Enable vpn'';
|
||||
enable = mkEnableOption "Enable vpn";
|
||||
|
||||
wgConf = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
@@ -150,7 +150,7 @@ in {
|
||||
};
|
||||
transmission = {
|
||||
isSystemUser = true;
|
||||
group = "transmission";
|
||||
group = "media";
|
||||
uid = lib.mkForce 70;
|
||||
};
|
||||
prowlarr = {
|
||||
@@ -190,7 +190,7 @@ in {
|
||||
];
|
||||
|
||||
util-nixarr.vpnnamespace = {
|
||||
enable = true;
|
||||
enable = cfg.vpn.enable;
|
||||
accessibleFrom = [
|
||||
"192.168.1.0/24"
|
||||
"127.0.0.1"
|
||||
|
||||
@@ -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.
|
||||
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.
|
||||
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:
|
||||
Systemd services can be run within the namespace by
|
||||
adding these options:
|
||||
|
||||
bindsTo = [ "netns@wg.service" ];
|
||||
requires = [ "network-online.target" ];
|
||||
after = [ "wg.service" ];
|
||||
serviceConfig = {
|
||||
NetworkNamespacePath = "/var/run/netns/wg";
|
||||
};
|
||||
'';
|
||||
bindsTo = [ "netns@wg.service" ];
|
||||
requires = [ "network-online.target" ];
|
||||
after = [ "wg.service" ];
|
||||
serviceConfig = {
|
||||
NetworkNamespacePath = "/var/run/netns/wg";
|
||||
};
|
||||
'';
|
||||
|
||||
accessibleFrom = mkOption {
|
||||
type = types.listOf types.str;
|
||||
|
||||
Reference in New Issue
Block a user