Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

/ : s/krebs\.retiolum/krebs.tinc.retiolum/g

Browse Source
This commit is contained in:
makefu 2016-07-20 17:20:47 +02:00
parent 46232b30be
commit 0c40af375f
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/3modules/retiolum.nix
View File

@ -50,9 +50,9 @@ let
default =
filterAttrs (_: h: hasAttr tinc.config.netname h.nets) config.krebs.hosts;
description = ''
Hosts to generate <literal>config.krebs.retiolum.hostsPackage</literal>.
Hosts to generate <literal>config.krebs.tinc.retiolum.hostsPackage</literal>.
Note that these hosts must have a network named
<literal>config.krebs.retiolum.netname</literal>.
<literal>config.krebs.tinc.retiolum.netname</literal>.
'';
};

2
krebs/3modules/tinc_graphs.nix
View File

@ -23,7 +23,7 @@ let
hostsPath = mkOption {
type = types.str;
description = "Path to Hosts directory";
default = "${config.krebs.retiolum.hostsPackage}";
default = "${config.krebs.tinc.retiolum.hostsPackage}";
};
network = mkOption {

2
lass/2configs/retiolum.nix
View File

@ -12,7 +12,7 @@
};
};
krebs.retiolum = {
krebs.tinc.retiolum = {
enable = true;
connectTo = [
"prism"

4
shared/1systems/wolf.nix
View File

@ -15,14 +15,14 @@ in
../2configs/shared-buildbot.nix
../2configs/cgit-mirror.nix
../2configs/repo-sync.nix
# ../2configs/graphite.nix
../2configs/graphite.nix
];
# use your own binary cache, fallback use cache.nixos.org (which is used by
# apt-cacher-ng in first place)
# local discovery in shackspace
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
krebs.retiolum.extraConfig = "TCPOnly = yes";
krebs.tinc.retiolum.extraConfig = "TCPOnly = yes";
services.grafana = {
enable = true;
addr = "0.0.0.0";

2
shared/2configs/base.nix
View File

@ -3,7 +3,7 @@
with config.krebs.lib;
{
krebs.enable = true;
krebs.retiolum.enable = true;
krebs.tinc.retiolum.enable = true;
# TODO rename shared user to "krebs"
krebs.build.user = mkDefault config.krebs.users.shared;

2
tv/2configs/retiolum.nix
View File

@ -3,7 +3,7 @@
with config.krebs.lib;
{
krebs.retiolum = {
krebs.tinc.retiolum = {
enable = true;
connectTo = filter (ne config.krebs.build.host.name) [
"gum"