Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
6f92ab188e
|
@ -102,6 +102,7 @@ in {
|
||||||
x = {
|
x = {
|
||||||
ci = true;
|
ci = true;
|
||||||
cores = 4;
|
cores = 4;
|
||||||
|
syncthing.id = "OA36OF6-JEFCUJQ-OEYVTMH-DPCACQI-3AJRE5G-BFVMOUG-RPYJQE3-4ZCUWA5";
|
||||||
nets = {
|
nets = {
|
||||||
retiolum.ip4.addr = "10.243.0.91";
|
retiolum.ip4.addr = "10.243.0.91";
|
||||||
wiregrill = {
|
wiregrill = {
|
||||||
|
@ -121,7 +122,7 @@ in {
|
||||||
omo = rec {
|
omo = rec {
|
||||||
ci = true;
|
ci = true;
|
||||||
cores = 2;
|
cores = 2;
|
||||||
|
syncthing.id = "Y5OTK3S-JOJLAUU-KTBXKUW-M7S5UEQ-MMQPUK2-7CXO5V6-NOUDLKP-PRGAFAK";
|
||||||
nets = {
|
nets = {
|
||||||
retiolum = {
|
retiolum = {
|
||||||
ip4.addr = "10.243.0.89";
|
ip4.addr = "10.243.0.89";
|
||||||
|
|
|
@ -1,10 +1,18 @@
|
||||||
{ pkgs, config, ... }:
|
{ pkgs, lib, config, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../binary-cache/lass.nix
|
../binary-cache/lass.nix
|
||||||
];
|
];
|
||||||
krebs.tinc.retiolum.enable = true;
|
krebs.tinc.retiolum.enable = true;
|
||||||
|
krebs.tinc.retiolum.extraConfig = ''
|
||||||
|
StrictSubnets = yes
|
||||||
|
${lib.optionalString (config.krebs.build.host.nets.retiolum.via != null) ''
|
||||||
|
LocalDiscovery = no
|
||||||
|
''}
|
||||||
|
'';
|
||||||
|
#krebs.tinc.retiolum.connectTo = [ "gum" ];
|
||||||
environment.systemPackages = [ pkgs.tinc ];
|
environment.systemPackages = [ pkgs.tinc ];
|
||||||
networking.firewall.allowedTCPPorts = [ config.krebs.build.host.nets.retiolum.tinc.port ];
|
networking.firewall.allowedTCPPorts = [ config.krebs.build.host.nets.retiolum.tinc.port ];
|
||||||
networking.firewall.allowedUDPPorts = [ config.krebs.build.host.nets.retiolum.tinc.port ];
|
networking.firewall.allowedUDPPorts = [ config.krebs.build.host.nets.retiolum.tinc.port ];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user