From 63c8634c5f9d546d2108ee9dd72fb1b9d2fa4ed6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 14 Jul 2017 00:17:58 +0200
Subject: merge shared into krebs
---
shared/1systems/test-all-krebs-modules/config.nix | 54 -----------
shared/1systems/test-all-krebs-modules/source.nix | 3 -
shared/1systems/test-arch/config.nix | 32 -------
shared/1systems/test-arch/source.nix | 3 -
shared/1systems/test-centos6/config.nix | 30 ------
shared/1systems/test-centos6/source.nix | 3 -
shared/1systems/test-centos7/config.nix | 16 ----
shared/1systems/test-centos7/source.nix | 3 -
shared/1systems/test-failing/config.nix | 9 --
shared/1systems/test-failing/source.nix | 3 -
shared/1systems/test-minimal-deploy/config.nix | 16 ----
shared/1systems/test-minimal-deploy/source.nix | 3 -
shared/1systems/wolf/config.nix | 107 ----------------------
shared/1systems/wolf/source.nix | 3 -
14 files changed, 285 deletions(-)
delete mode 100644 shared/1systems/test-all-krebs-modules/config.nix
delete mode 100644 shared/1systems/test-all-krebs-modules/source.nix
delete mode 100644 shared/1systems/test-arch/config.nix
delete mode 100644 shared/1systems/test-arch/source.nix
delete mode 100644 shared/1systems/test-centos6/config.nix
delete mode 100644 shared/1systems/test-centos6/source.nix
delete mode 100644 shared/1systems/test-centos7/config.nix
delete mode 100644 shared/1systems/test-centos7/source.nix
delete mode 100644 shared/1systems/test-failing/config.nix
delete mode 100644 shared/1systems/test-failing/source.nix
delete mode 100644 shared/1systems/test-minimal-deploy/config.nix
delete mode 100644 shared/1systems/test-minimal-deploy/source.nix
delete mode 100644 shared/1systems/wolf/config.nix
delete mode 100644 shared/1systems/wolf/source.nix
(limited to 'shared/1systems')
diff --git a/shared/1systems/test-all-krebs-modules/config.nix b/shared/1systems/test-all-krebs-modules/config.nix
deleted file mode 100644
index 7ebcf3b..0000000
--- a/shared/1systems/test-all-krebs-modules/config.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
- en = { enable = true;};
-in {
- imports = [
- <stockholm/shared>
- ];
- krebs = {
- enable = true;
- build.user = config.krebs.users.shared;
- build.host = config.krebs.hosts.test-all-krebs-modules;
- Reaktor.test = {};
- apt-cacher-ng.enable = true;
- backup.enable = true;
- bepasty.enable = true;
- # FIXME fast-tests / instantiate-test-all-modules fails at wolfbot
- # http://wolf:8010/builders/fast-tests/builds/442
- #buildbot.master.enable = true;
- buildbot.worker = {
- enable = true;
- username = "lol";
- password = "wut";
- };
- # XXX exim-retiolum and exim-smarthost are mutually exclusive
- #exim-retiolum = {
- # enable = true;
- # primary_hostname = "test.r";
- #};
- exim-smarthost = {
- enable = true;
- primary_hostname = "test.r";
- system-aliases = [ { from = "dick"; to = "butt"; } ];
- };
- go.enable = true;
- iptables = {
- enable = true;
- tables = {};
- };
- realwallpaper.enable = true;
- tinc.retiolum.enable = true;
- retiolum-bootstrap.enable = true;
- tinc_graphs.enable = true;
- urlwatch.enable = true;
- fetchWallpaper = {
- enable = true;
- url ="localhost";
- };
- };
- # just get the system running
- boot.loader.grub.devices = ["/dev/sda"];
- fileSystems."/" = {
- device = "/dev/lol";
- };
-}
diff --git a/shared/1systems/test-all-krebs-modules/source.nix b/shared/1systems/test-all-krebs-modules/source.nix
deleted file mode 100644
index 58d7236..0000000
--- a/shared/1systems/test-all-krebs-modules/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
- name = "test-all-krebs-modules";
-}
diff --git a/shared/1systems/test-arch/config.nix b/shared/1systems/test-arch/config.nix
deleted file mode 100644
index 453483d..0000000
--- a/shared/1systems/test-arch/config.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- imports = [
- <stockholm/shared>
- {
- boot.loader.grub = {
- device = "/dev/sda";
- splashImage = null;
- };
-
- boot.initrd.availableKernelModules = [
- "ata_piix"
- "vmw_pvscsi"
- ];
-
- fileSystems."/" = {
- device = "/dev/sda1";
- };
- }
- {
- networking.dhcpcd.allowInterfaces = [
- "enp*"
- ];
- }
- {
- sound.enable = false;
- }
- ];
-
- krebs.build.host = config.krebs.hosts.test-arch;
-}
diff --git a/shared/1systems/test-arch/source.nix b/shared/1systems/test-arch/source.nix
deleted file mode 100644
index ca23056..0000000
--- a/shared/1systems/test-arch/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
- name = "test-arch";
-}
diff --git a/shared/1systems/test-centos6/config.nix b/shared/1systems/test-centos6/config.nix
deleted file mode 100644
index a81ff7c..0000000
--- a/shared/1systems/test-centos6/config.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
- inherit (lib) head;
-
- ip = "168.235.148.52";
- gw = "168.235.148.1";
-in {
- imports = [
- <stockholm/shared>
- <stockholm/shared/2configs/os-templates/CAC-CentOS-6.5-64bit.nix>
- {
- networking.interfaces.enp11s0.ip4 = [
- {
- address = ip;
- prefixLength = 24;
- }
- ];
- networking.defaultGateway = gw;
- networking.nameservers = [
- "8.8.8.8"
- ];
- }
- {
- sound.enable = false;
- }
- ];
-
- krebs.build.host = config.krebs.hosts.test-centos6;
-}
diff --git a/shared/1systems/test-centos6/source.nix b/shared/1systems/test-centos6/source.nix
deleted file mode 100644
index 0c7c78e..0000000
--- a/shared/1systems/test-centos6/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
- name = "test-centos6";
-}
diff --git a/shared/1systems/test-centos7/config.nix b/shared/1systems/test-centos7/config.nix
deleted file mode 100644
index 58f99e8..0000000
--- a/shared/1systems/test-centos7/config.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
- inherit (lib) head;
-
-in {
- imports = [
- <stockholm/shared>
- <stockholm/shared/2configs/os-templates/CAC-CentOS-7-64bit.nix>
- <stockholm/shared/2configs/temp/networking.nix>
- <stockholm/shared/2configs/temp/dirs.nix>
- ];
-
- sound.enable = false;
- krebs.build.host = config.krebs.hosts.test-centos7;
-}
diff --git a/shared/1systems/test-centos7/source.nix b/shared/1systems/test-centos7/source.nix
deleted file mode 100644
index 5144477..0000000
--- a/shared/1systems/test-centos7/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
- name = "test-centos7";
-}
diff --git a/shared/1systems/test-failing/config.nix b/shared/1systems/test-failing/config.nix
deleted file mode 100644
index fb6a583..0000000
--- a/shared/1systems/test-failing/config.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- imports = [
- <stockholm/shared>
- ];
- programs.ssh.startAgent = true;
- programs.ssh.startAgent = false;
-}
diff --git a/shared/1systems/test-failing/source.nix b/shared/1systems/test-failing/source.nix
deleted file mode 100644
index 3e17d0b..0000000
--- a/shared/1systems/test-failing/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
- name = "test-failing";
-}
diff --git a/shared/1systems/test-minimal-deploy/config.nix b/shared/1systems/test-minimal-deploy/config.nix
deleted file mode 100644
index eab7036..0000000
--- a/shared/1systems/test-minimal-deploy/config.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
- imports = [
- <stockholm/shared>
- ];
- krebs = {
- enable = true;
- build.user = config.krebs.users.shared;
- build.host = config.krebs.hosts.test-all-krebs-modules;
- };
- # just get the system to eval in nixos without errors
- boot.loader.grub.devices = ["/dev/sda"];
- fileSystems."/" = {
- device = "/dev/lol";
- };
-}
diff --git a/shared/1systems/test-minimal-deploy/source.nix b/shared/1systems/test-minimal-deploy/source.nix
deleted file mode 100644
index 2368cdd..0000000
--- a/shared/1systems/test-minimal-deploy/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
- name = "test-minimal-deploy";
-}
diff --git a/shared/1systems/wolf/config.nix b/shared/1systems/wolf/config.nix
deleted file mode 100644
index 636f8e8..0000000
--- a/shared/1systems/wolf/config.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-{ config, pkgs, ... }:
-let
- shack-ip = config.krebs.build.host.nets.shack.ip4.addr;
-in
-{
- imports = [
- <stockholm/shared>
- <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
- <stockholm/shared/2configs/collectd-base.nix>
- <stockholm/shared/2configs/central-stats-client.nix>
- <stockholm/shared/2configs/save-diskspace.nix>
-
- <stockholm/shared/2configs/cgit-mirror.nix>
- <stockholm/shared/2configs/graphite.nix>
- <stockholm/shared/2configs/repo-sync.nix>
- <stockholm/shared/2configs/shared-buildbot.nix>
-
- <stockholm/shared/2configs/shack/worlddomination.nix>
- <stockholm/shared/2configs/shack/drivedroid.nix>
- # <stockholm/shared/2configs/shack/nix-cacher.nix>
- <stockholm/shared/2configs/shack/mqtt_sub.nix>
- <stockholm/shared/2configs/shack/muell_caller.nix>
- <stockholm/shared/2configs/shack/radioactive.nix>
- <stockholm/shared/2configs/shack/share.nix>
-
- ];
- # use your own binary cache, fallback use cache.nixos.org (which is used by
- # apt-cacher-ng in first place)
-
- services.influxdb.enable = true;
-
- # local discovery in shackspace
- nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
- krebs.tinc.retiolum.extraConfig = "TCPOnly = yes";
- services.grafana = {
- enable = true;
- addr = "0.0.0.0";
- users.allowSignUp = true;
- users.allowOrgCreate = true;
- users.autoAssignOrg = true;
- auth.anonymous.enable = true;
- security = import <secrets/grafana_security.nix>;
- };
-
- nix = {
- # use the up to date prism cache
- binaryCaches = [
- "http://cache.prism.r"
- "https://cache.nixos.org/"
- ];
- binaryCachePublicKeys = [
- "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
- "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
- ];
- };
-
- networking = {
- firewall.enable = false;
- firewall.allowedTCPPorts = [ 8088 8086 8083 ];
- interfaces.enp0s3.ip4 = [{
- address = shack-ip;
- prefixLength = 20;
- }];
-
- defaultGateway = "10.42.0.1";
- nameservers = [ "10.42.0.100" "10.42.0.200" ];
- };
-
- #####################
- # uninteresting stuff
- #####################
- krebs.build.host = config.krebs.hosts.wolf;
-
- boot.kernel.sysctl = {
- # Enable IPv6 Privacy Extensions
- "net.ipv6.conf.all.use_tempaddr" = 2;
- "net.ipv6.conf.default.use_tempaddr" = 2;
- };
-
- boot.initrd.availableKernelModules = [
- "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk"
- ];
- boot.kernelModules = [ ];
- boot.extraModulePackages = [ ];
-
- boot.loader.grub.enable = true;
- boot.loader.grub.version = 2;
- boot.loader.grub.device = "/dev/vda";
-
- fileSystems."/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; };
-
- swapDevices = [
- { device = "/dev/disk/by-label/swap"; }
- ];
- # fallout of ipv6calypse
- networking.extraHosts = ''
- hass.shack 10.42.2.191
- heidi.shack 10.42.2.135
- '';
-
- users.extraUsers.root.openssh.authorizedKeys.keys = [
- config.krebs.users.ulrich.pubkey
- ];
-
- time.timeZone = "Europe/Berlin";
- sound.enable = false;
-}
diff --git a/shared/1systems/wolf/source.nix b/shared/1systems/wolf/source.nix
deleted file mode 100644
index d2bc495..0000000
--- a/shared/1systems/wolf/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
- name = "wolf";
-}
--
cgit v1.2.3