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

This commit is contained in:
makefu 2016-07-20 17:18:57 +02:00
parent 13a5662feb
commit 46232b30be
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
11 changed files with 19 additions and 30 deletions

View File

@ -17,6 +17,7 @@ in {
../2configs/exim-retiolum.nix
../2configs/virtualization.nix
../2configs/tinc/retiolum.nix
../2configs/temp-share-samba.nix
];
services.samba.shares = {
@ -39,7 +40,6 @@ in {
};
#networking.firewall.enable = false;
krebs.retiolum.enable = true;
boot.kernelModules = [ "coretemp" "f71882fg" ];
hardware.enableAllFirmware = true;

View File

@ -22,8 +22,8 @@ in {
../.
../2configs/fs/single-partition-ext4.nix
../2configs/smart-monitor.nix
../2configs/tinc/retiolum.nix
];
krebs.retiolum.enable = true;
krebs.build.host = config.krebs.hosts.filepimp;
# AMD N54L
boot = {

View File

@ -19,6 +19,7 @@ in {
../2configs/deployment/mycube.connector.one.nix
../2configs/exim-retiolum.nix
../2configs/tinc/retiolum.nix
../2configs/urlwatch.nix
];
@ -27,8 +28,7 @@ in {
###### stable
krebs.build.host = config.krebs.hosts.gum;
krebs.retiolum = {
enable = true;
krebs.tinc.retiolum = {
extraConfig = ''
ListenAddress = ${external-ip} 53
ListenAddress = ${external-ip} 655

View File

@ -47,12 +47,12 @@ in {
#../2configs/graphite-standalone.nix
#../2configs/share-user-sftp.nix
../2configs/omo-share.nix
../2configs/tinc/retiolum.nix
## as long as pyload is not in nixpkgs:
# docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload
];
krebs.retiolum.enable = true;
networking.firewall.trustedInterfaces = [ primaryInterface ];
# udp:137 udp:138 tcp:445 tcp:139 - samba, allowed in local net
# tcp:80 - nginx for sharing files

View File

@ -15,11 +15,12 @@
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/fs/vm-single-partition.nix
../2configs/tinc/retiolum.nix
# config.system.build.vm
<nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
(toString <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>)
];
krebs.retiolum.enable = true;
virtualisation.graphics = false;
# also export secrets, see Usage above
fileSystems = pkgs.lib.mkVMOverride {

View File

@ -38,8 +38,9 @@
#../2configs/wordpress.nix
../2configs/nginx/public_html.nix
../2configs/tinc/retiolum.nix
# temporary modules
# ../2configs/temp/share-samba.nix
../2configs/temp/share-samba.nix
# ../2configs/temp/elkstack.nix
# ../2configs/temp/sabnzbd.nix
];
@ -69,10 +70,9 @@
krebs.build.host = config.krebs.hosts.pornocauster;
krebs.hosts.omo.nets.retiolum.via.ip4.addr = "192.168.1.11";
krebs.retiolum = {
enable = true;
connectTo = [ "omo" "gum" "prism" ];
};
krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ];
networking.extraHosts = ''
192.168.1.11 omo.local
'';

View File

@ -10,6 +10,7 @@
../.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/git/cgit-retiolum.nix
../2configs/tinc/retiolum.nix
];
krebs.build.host = config.krebs.hosts.repunit;
@ -31,14 +32,6 @@
{ device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
krebs.retiolum = {
enable = true;
connectTo = [
"gum"
"pigstarter"
"fastpoke"
];
};
# $ nix-env -qaP | grep wget
environment.systemPackages = with pkgs; [

View File

@ -13,6 +13,7 @@ in {
../2configs/save-diskspace.nix
../2configs/hw/CAC.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/tinc/retiolum.nix
];
@ -21,7 +22,6 @@ in {
krebs = {
enable = true;
retiolum.enable = true;
build.host = config.krebs.hosts.shoney;
nginx.enable = true;
tinc_graphs = {

View File

@ -17,9 +17,9 @@
../2configs/zsh-user.nix
../2configs/exim-retiolum.nix
../2configs/tinc/retiolum.nix
];
# not working in vm
krebs.retiolum.enable = true;
krebs.build.host = config.krebs.hosts.tsp;
networking.firewall.allowedTCPPorts = [

View File

@ -11,6 +11,7 @@
<secrets/extra-hosts.nix>
# environment
../2configs/tinc/retiolum.nix
];
# workaround for https://github.com/NixOS/nixpkgs/issues/16641
@ -52,13 +53,6 @@
8010
];
krebs.retiolum = {
enable = true;
connectTo = [
"omo"
"gum"
];
};
virtualisation.docker.enable = false;
fileSystems."/media/share" = {

View File

@ -25,8 +25,9 @@ in {
# collectd
../2configs/collectd/collectd-base.nix
../2configs/tinc/retiolum.nix
];
krebs.retiolum.enable = true;
krebs.build.host = config.krebs.hosts.wry;