ma 2 tinc-basic-retiolum: RIP

This commit is contained in:
makefu 2016-03-11 02:10:34 +01:00
parent 1db28fe74d
commit f5e1235d01
9 changed files with 32 additions and 37 deletions

View File

@ -1,15 +1,15 @@
{ config, pkgs, ... }:
{ config, pkgs, lib, ... }:
with config.krebs.lib;
{
imports =
[
imports = [
../2configs/fs/single-partition-ext4.nix
../2configs/zsh-user.nix
];
krebs = {
enable = true;
retiolum.enable = true;
build.host = config.krebs.hosts.darth;
};
# You want to change these :)
boot.loader.grub.device = "/dev/sda";
../.
];
krebs.build.host = config.krebs.hosts.darth;
krebs.retiolum.enable = true;
boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039";
}

View File

@ -21,9 +21,9 @@ in {
[ # Include the results of the hardware scan.
../.
../2configs/fs/single-partition-ext4.nix
../2configs/tinc-basic-retiolum.nix
../2configs/smart-monitor.nix
];
krebs.retiolum.enable = true;
krebs.build.host = config.krebs.hosts.filepimp;
# AMD N54L
boot = {

View File

@ -7,7 +7,6 @@ let
in {
imports = [
../.
../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
../2configs/fs/simple-swap.nix
../2configs/fs/single-partition-ext4.nix
@ -29,11 +28,20 @@ in {
###### stable
krebs.build.host = config.krebs.hosts.gum;
krebs.retiolum.extraConfig = ''
ListenAddress = ${external-ip} 53
ListenAddress = ${external-ip} 655
ListenAddress = ${external-ip} 21031
'';
krebs.retiolum = {
enable = true;
extraConfig = ''
ListenAddress = ${external-ip} 53
ListenAddress = ${external-ip} 655
ListenAddress = ${external-ip} 21031
'';
connectTo = [
"muhbaasu" "tahoe" "flap" "wry"
"ire" "cd" "mkdir" "rmdir"
"fastpoke" "prism" "dishfire" "echelon" "cloudkrebs"
];
};
krebs.nginx.servers.cgit.server-names = [
"cgit.euer.krebsco.de"
];

View File

@ -37,7 +37,6 @@ in {
../.
# TODO: unlock home partition via ssh
../2configs/fs/single-partition-ext4.nix
../2configs/tinc-basic-retiolum.nix
../2configs/zsh-user.nix
../2configs/exim-retiolum.nix
../2configs/smart-monitor.nix
@ -45,6 +44,7 @@ in {
../2configs/share-user-sftp.nix
../2configs/omo-share.nix
];
krebs.retiolum.enable = true;
networking.firewall.trustedInterfaces = [ "enp3s0" ];
# udp:137 udp:138 tcp:445 tcp:139 - samba, allowed in local net
# tcp:80 - nginx for sharing files

View File

@ -7,7 +7,6 @@
imports =
[
../.
../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
../../krebs/3modules/Reaktor.nix
@ -20,6 +19,7 @@
<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

@ -11,7 +11,6 @@
../2configs/laptop-utils.nix
# Krebs
../2configs/tinc-basic-retiolum.nix
#../2configs/disable_v6.nix
@ -35,8 +34,10 @@
../2configs/fs/sda-crypto-root-home.nix
# ../2configs/mediawiki.nix
#../2configs/wordpress.nix
../2configs/nginx/public_html.nix
];
krebs.retiolum.enable = true;
nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre;
};

View File

@ -8,7 +8,6 @@
[ # Include the results of the hardware scan.
../.
../2configs/base-gui.nix
../2configs/tinc-basic-retiolum.nix
../2configs/fs/sda-crypto-root.nix
# hardware specifics are in here
../2configs/hw/tp-x200.nix #< imports tp-x2x0.nix
@ -20,6 +19,7 @@
../2configs/exim-retiolum.nix
];
# not working in vm
krebs.retiolum.enable = true;
krebs.build.host = config.krebs.hosts.tsp;
networking.firewall.allowedTCPPorts = [

View File

@ -12,7 +12,6 @@ in {
../../tv/2configs/hw/CAC.nix
../../tv/2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/headless.nix
../2configs/tinc-basic-retiolum.nix
../2configs/bepasty-dual.nix
@ -27,6 +26,7 @@ in {
# collectd
../2configs/collectd/collectd-base.nix
];
krebs.retiolum.enable = true;
services.nixosManual.enable = false;
programs.man.enable = false;
krebs.build.host = config.krebs.hosts.wry;

View File

@ -1,14 +0,0 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
{
krebs.retiolum = {
enable = true;
connectTo = [
"gum"
"pigstarter"
"fastpoke"
"ire"
];
};
}