wg-home: dont force each host to define its IP address twice
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./fs.nix
|
./fs.nix
|
||||||
@@ -25,7 +25,6 @@
|
|||||||
sane.roles.work = true;
|
sane.roles.work = true;
|
||||||
sane.services.ollama.enable = true;
|
sane.services.ollama.enable = true;
|
||||||
sane.services.wg-home.enable = true;
|
sane.services.wg-home.enable = true;
|
||||||
sane.services.wg-home.ip = config.sane.hosts.by-name."desko".wg-home.ip;
|
|
||||||
sane.ovpn.addrV4 = "172.26.55.21";
|
sane.ovpn.addrV4 = "172.26.55.21";
|
||||||
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:20c1:a73c";
|
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:20c1:a73c";
|
||||||
sane.services.rsync-net.enable = true;
|
sane.services.rsync-net.enable = true;
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./fs.nix
|
./fs.nix
|
||||||
@@ -7,7 +7,6 @@
|
|||||||
sane.roles.client = true;
|
sane.roles.client = true;
|
||||||
sane.roles.pc = true;
|
sane.roles.pc = true;
|
||||||
sane.services.wg-home.enable = true;
|
sane.services.wg-home.enable = true;
|
||||||
sane.services.wg-home.ip = config.sane.hosts.by-name."lappy".wg-home.ip;
|
|
||||||
sane.ovpn.addrV4 = "172.23.119.72";
|
sane.ovpn.addrV4 = "172.23.119.72";
|
||||||
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:0332:aa96/128";
|
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:0332:aa96/128";
|
||||||
|
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
# - Mobian wiki: <https://wiki.mobian-project.org/doku.php?id=start>
|
# - Mobian wiki: <https://wiki.mobian-project.org/doku.php?id=start>
|
||||||
# - recommended apps, chatrooms
|
# - recommended apps, chatrooms
|
||||||
|
|
||||||
{ config, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./fs.nix
|
./fs.nix
|
||||||
@@ -16,7 +16,6 @@
|
|||||||
sane.roles.client = true;
|
sane.roles.client = true;
|
||||||
sane.roles.handheld = true;
|
sane.roles.handheld = true;
|
||||||
sane.services.wg-home.enable = true;
|
sane.services.wg-home.enable = true;
|
||||||
sane.services.wg-home.ip = config.sane.hosts.by-name."moby".wg-home.ip;
|
|
||||||
sane.ovpn.addrV4 = "172.24.87.255";
|
sane.ovpn.addrV4 = "172.24.87.255";
|
||||||
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:18cd:a72b";
|
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:18cd:a72b";
|
||||||
|
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@@ -4,7 +4,6 @@
|
|||||||
sane.services.wg-home.visibleToWan = true;
|
sane.services.wg-home.visibleToWan = true;
|
||||||
sane.services.wg-home.forwardToWan = true;
|
sane.services.wg-home.forwardToWan = true;
|
||||||
sane.services.wg-home.routeThroughServo = false;
|
sane.services.wg-home.routeThroughServo = false;
|
||||||
sane.services.wg-home.ip = config.sane.hosts.by-name."servo".wg-home.ip;
|
|
||||||
services.unbound.settings.server.interface = [
|
services.unbound.settings.server.interface = [
|
||||||
# provide DNS to my wireguard clients
|
# provide DNS to my wireguard clients
|
||||||
config.sane.hosts.by-name."servo".wg-home.ip
|
config.sane.hosts.by-name."servo".wg-home.ip
|
||||||
|
@@ -33,6 +33,7 @@ in
|
|||||||
};
|
};
|
||||||
sane.services.wg-home.ip = mkOption {
|
sane.services.wg-home.ip = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
|
default = config.sane.hosts.by-name."${config.networking.hostName}".wg-home.ip;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user