Browse Source

Replace yggdrasil submodule with an input

storage-ng
Emery Hemingway 6 months ago
parent
commit
363f28fb47

+ 0
- 3
.gitmodules View File

@@ -1,6 +1,3 @@
1 1
 [submodule "secrets"]
2 2
 	path = secrets
3 3
 	url = ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git
4
-[submodule "overlays/yggdrasil-package-nix"]
5
-	path = overlays/yggdrasil-package-nix
6
-	url = https://github.com/ehmry/yggdrasil-package-nix.git

+ 1
- 0
hosts/glotzbert/configuration.nix View File

@@ -19,6 +19,7 @@ in
19 19
       ../../lib/default-gateway.nix
20 20
       ../../lib/hail.nix
21 21
       ../../lib/hq.nix
22
+      ../../lib/yggdrasil.nix
22 23
     ];
23 24
 
24 25
   # Use the systemd-boot EFI boot loader.

+ 1
- 1
hosts/hydra/configuration.nix View File

@@ -10,7 +10,7 @@
10 10
     ./../../lib/yggdrasil.nix
11 11
   ];
12 12
 
13
-  services.yggdrasil.config.Peers = [
13
+  services.yggdrasil.Peers = [
14 14
     "tcp://[2a03:3b40:fe:ab::1]:46370" # Praha
15 15
     "tcp://ygg.thingylabs.io:443" # Nürnberg
16 16
     "tcp://176.223.130.120:22632" # Wrocław

+ 3
- 1
lib/yggdrasil.nix View File

@@ -1,11 +1,13 @@
1 1
 { config, ... }: {
2 2
 
3
+  imports = [ (<yggdrasil-package-nix> + "/nixos-module.nix") ];
4
+
3 5
   networking.firewall.extraCommands =
4 6
     "ip6tables -A INPUT -s fe80::/10 -j ACCEPT";
5 7
 
6 8
   services.yggdrasil = {
7 9
     enable = true;
8
-    config.NodeInfo = {
10
+    NodeInfo = {
9 11
       name = config.networking.hostName + ".c3d2";
10 12
       location = "Dresden";
11 13
     };

+ 0
- 1
overlays/yggdrasil-package-nix

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

Loading…
Cancel
Save