From d1acea4a46b646431297b8153c5aaa3804df4d6d Mon Sep 17 00:00:00 2001 From: sand20 Date: Mon, 16 Sep 2019 23:50:52 +0200 Subject: [PATCH 1/6] Add mpv --no-vid alias (#3) --- hosts/pulsebert/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/pulsebert/configuration.nix b/hosts/pulsebert/configuration.nix index 1ba732f0..e1f7cec2 100644 --- a/hosts/pulsebert/configuration.nix +++ b/hosts/pulsebert/configuration.nix @@ -233,4 +233,7 @@ in { }; }); }; + programs.bash.shellAliases = { + mpv = "mpv --no-vid"; + }; } From f5e42688dba366cfe05896a460bd68b8fe1a0996 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Fri, 27 Sep 2019 11:07:42 +0200 Subject: [PATCH 2/6] update filebeat --- ansible/hypervisor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/hypervisor.yml b/ansible/hypervisor.yml index 51ec9196..afee0a74 100644 --- a/ansible/hypervisor.yml +++ b/ansible/hypervisor.yml @@ -54,4 +54,4 @@ } } vars: - beats_version: 7.3.0 + beats_version: 7.3.2 From 2b266f8ab462cb5c627ee0c473a8a69aa08fcf00 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 30 Sep 2019 17:04:17 +0200 Subject: [PATCH 3/6] Update hydra configuration --- hosts/hydra/cache.nix | 7 +++++++ hosts/hydra/configuration.nix | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/hosts/hydra/cache.nix b/hosts/hydra/cache.nix index e5a3b84b..ba29afb9 100644 --- a/hosts/hydra/cache.nix +++ b/hosts/hydra/cache.nix @@ -18,4 +18,11 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; ''; }; + + services.nginx.virtualHosts."depot.hq.c3d2.de" = { + forceSSL = true; + enableACME = true; + locations."/".root = "/srv/www/depot"; + }; + } diff --git a/hosts/hydra/configuration.nix b/hosts/hydra/configuration.nix index 1898ed0e..327fc5e0 100644 --- a/hosts/hydra/configuration.nix +++ b/hosts/hydra/configuration.nix @@ -17,6 +17,8 @@ nix.useSandbox = false; nix.maxJobs = lib.mkDefault 4; + nix.autoOptimiseStore = true; + nix.gc = { automatic = true; dates = "06:00"; options = "--delete-older-than 7d"; }; boot.isContainer = true; boot.loader.initScript.enable = true; @@ -29,6 +31,9 @@ networking.hostName = "192"; networking.useNetworkd = true; + networking.nameservers = [ "172.20.73.8" ]; + # caused problems on this host -- Astro 2019-09-08 + services.resolved.enable = false; # Set your time zone. time.timeZone = "Europe/Berlin"; From 6c7822b7b89d57fb48a4cf0ac5ff514909908bcd Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 1 Oct 2019 17:52:21 +0200 Subject: [PATCH 4/6] Maybe fix hydra DNS --- hosts/hydra/configuration.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/hydra/configuration.nix b/hosts/hydra/configuration.nix index 327fc5e0..73633444 100644 --- a/hosts/hydra/configuration.nix +++ b/hosts/hydra/configuration.nix @@ -30,8 +30,9 @@ }; networking.hostName = "192"; - networking.useNetworkd = true; - networking.nameservers = [ "172.20.73.8" ]; + + networking.useHostResolvConf = true; + # caused problems on this host -- Astro 2019-09-08 services.resolved.enable = false; From e04eaf5a9b9a9e9f2b3ceb5eb66703500591278f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 1 Oct 2019 18:17:30 +0200 Subject: [PATCH 5/6] Add lib/yggdrasil.nix Enable yggdrasil for pulsebert --- .gitmodules | 3 +++ hosts/hydra/configuration.nix | 1 + hosts/pulsebert/configuration.nix | 1 + lib/yggdrasil.nix | 22 ++++++++++++++++++++++ overlays/yggdrasil-package-nix | 1 + 5 files changed, 28 insertions(+) create mode 100644 lib/yggdrasil.nix create mode 160000 overlays/yggdrasil-package-nix diff --git a/.gitmodules b/.gitmodules index 3eb49ffe..e95bc711 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "secrets"] path = secrets url = ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git +[submodule "overlays/yggdrasil-package-nix"] + path = overlays/yggdrasil-package-nix + url = https://github.com/ehmry/yggdrasil-package-nix.git diff --git a/hosts/hydra/configuration.nix b/hosts/hydra/configuration.nix index 73633444..e90fb91b 100644 --- a/hosts/hydra/configuration.nix +++ b/hosts/hydra/configuration.nix @@ -7,6 +7,7 @@ ./hydra.nix ./cache.nix ./../../lib/common/c3d2.nix + ./../../lib/yggdrasil.nix ]; security.pam.enableSSHAgentAuth = true; diff --git a/hosts/pulsebert/configuration.nix b/hosts/pulsebert/configuration.nix index e1f7cec2..8e9c394e 100644 --- a/hosts/pulsebert/configuration.nix +++ b/hosts/pulsebert/configuration.nix @@ -15,6 +15,7 @@ in { ../../lib/common/common.nix ../../lib/users.nix ../../lib/mpd.nix + ../../lib/yggdrasil.nix ]; # Use the systemd-boot EFI boot loader. diff --git a/lib/yggdrasil.nix b/lib/yggdrasil.nix new file mode 100644 index 00000000..f32e7b21 --- /dev/null +++ b/lib/yggdrasil.nix @@ -0,0 +1,22 @@ +{ config, ... }: { + + imports = [ ./../overlays/yggdrasil-package-nix/nixos-module.nix ]; + + networking.firewall.extraCommands = '' + ip6tables -A INPUT -s fe80::/10 -j ACCEPT + ''; + + services.yggdrasil = { + enable = true; + Peers = [ + "tcp://5.9.112.248:39444" + "tcp://159.69.35.16:31337" + "tcp://195.201.93.98:17177" + ]; + NodeInfo = { + name = config.networking.hostName + ".c3d2"; + deployment = "nixos"; + location = "Pieschen (Q8945)"; + }; + }; +} diff --git a/overlays/yggdrasil-package-nix b/overlays/yggdrasil-package-nix new file mode 160000 index 00000000..a0ee4516 --- /dev/null +++ b/overlays/yggdrasil-package-nix @@ -0,0 +1 @@ +Subproject commit a0ee45162f90401acc52f929a7544838ec13a309 From f6ff9f2a1e6c73496c206be88730d7d98727fa59 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 2 Oct 2019 19:04:01 +0200 Subject: [PATCH 6/6] Remove peers from Yggdrasil config --- lib/yggdrasil.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/yggdrasil.nix b/lib/yggdrasil.nix index f32e7b21..ef4429f5 100644 --- a/lib/yggdrasil.nix +++ b/lib/yggdrasil.nix @@ -8,11 +8,6 @@ services.yggdrasil = { enable = true; - Peers = [ - "tcp://5.9.112.248:39444" - "tcp://159.69.35.16:31337" - "tcp://195.201.93.98:17177" - ]; NodeInfo = { name = config.networking.hostName + ".c3d2"; deployment = "nixos";