Merge branch 'master' of ssh://gitea.c3d2.de:2222/C3D2/nix-config

.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

ansible/hypervisor.yml

@@ -54,4 +54,4 @@
         }
     }
   vars:
-    beats_version: 7.3.0
+    beats_version: 7.3.2

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";
+  };
+
 }

hosts/hydra/configuration.nix

@@ -7,6 +7,7 @@
     ./hydra.nix
     ./cache.nix
     ./../../lib/common/c3d2.nix
+    ./../../lib/yggdrasil.nix
   ];
 
   security.pam.enableSSHAgentAuth = true;
@@ -17,6 +18,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;
@@ -28,7 +31,11 @@
   };
 
   networking.hostName = "192";
-  networking.useNetworkd = true;
+
+  networking.useHostResolvConf = true;
+
+  # caused problems on this host -- Astro 2019-09-08
+  services.resolved.enable = false;
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";

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.
@@ -233,4 +234,7 @@ in {
       };
     });
   };
+  programs.bash.shellAliases = {
+    mpv = "mpv --no-vid";
+  };
 }

lib/yggdrasil.nix

@@ -0,0 +1,17 @@
+{ config, ... }: {
+
+  imports = [ ./../overlays/yggdrasil-package-nix/nixos-module.nix ];
+
+  networking.firewall.extraCommands = ''
+   ip6tables -A INPUT -s fe80::/10 -j ACCEPT
+  '';
+
+  services.yggdrasil = {
+    enable = true;
+    NodeInfo = {
+      name = config.networking.hostName + ".c3d2";
+      deployment = "nixos";
+      location = "Pieschen (Q8945)";
+    };
+  };
+}

overlays/yggdrasil-package-nix

@@ -0,0 +1 @@
+Subproject commit a0ee45162f90401acc52f929a7544838ec13a309