gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

hexchen yggdrasil module changes

Browse source
This commit is contained in:
kat witch 2021-07-25 23:26:46 +01:00
parent ef4d5ca036
commit e8fcabc143
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/hosts/athame/nixos/default.nix
View file

@ -57,7 +57,7 @@ with lib;
};
kw.fw.public.interfaces = singleton "enp1s0";
kw.fw.private.interfaces = singleton "hexnet";
kw.fw.private.interfaces = singleton "yggdrasil";
kw.fw.public.tcp.ports = singleton 52969;
@ -68,7 +68,7 @@ with lib;
(lib.head config.networking.interfaces.enp1s0.ipv6.addresses).address;
};
hexchen.network = {
network.yggdrasil = {
enable = true;
pubkey = "55e3f29c252d16e73ac849a6039824f94df1dee670c030b9e29f90584f935575";
listen.enable = true;

4
config/hosts/dummy/nixos/default.nix
View file

@ -5,7 +5,7 @@ with lib;
let
hexchen = (import sources.hexchen) { };
hexYgg = filterAttrs (_: c: c.enable)
(mapAttrs (_: host: host.config.hexchen.network) hexchen.hosts);
(mapAttrs (_: host: host.config.network.yggdrasil) hexchen.hosts);
in
{
# stuff so dummy host is buildable (you probably don't want/need this???)
@ -14,7 +14,7 @@ in
networking.useDHCP = false;
users.users.root.hashedPassword = "";
hexchen.network = {
network.yggdrasil = {
enable = true;
pubkey = "0000000000000000000000000000000000000000000000000000000000000000";
listen.enable = true;

6
config/hosts/samhain/nixos/default.nix
View file

@ -5,7 +5,7 @@ with lib;
let
hexchen = (import sources.hexchen) { };
hexYgg = filterAttrs (_: c: c.enable)
(mapAttrs (_: host: host.config.hexchen.network) hexchen.hosts);
(mapAttrs (_: host: host.config.network.yggdrasil) hexchen.hosts);
in
{
imports = [
@ -75,7 +75,7 @@ in
# package = pkgs.ckb-next;
#};
kw.fw.private.interfaces = singleton "hexnet";
kw.fw.private.interfaces = singleton "yggdrasil";
kw.fw.public.interfaces = singleton "br";
hardware.openrazer = {
@ -129,7 +129,7 @@ in
services.avahi.enable = true;
hexchen.network = {
network.yggdrasil = {
enable = true;
pubkey = "a7110d0a1dc9ec963d6eb37bb6922838b8088b53932eae727a9136482ce45d47";
# if server, enable this and set endpoint:

4
config/hosts/yule/nixos/default.nix
View file

@ -29,7 +29,7 @@ with lib;
boot.loader.efi.canTouchEfiVariables = true;
boot.supportedFilesystems = [ "zfs" ];
kw.fw.private.interfaces = singleton "hexnet";
kw.fw.private.interfaces = singleton "yggdrasil";
kw.fw.public.interfaces = [ "enp1s0" "wlp2s0" ];
networking.hostId = "dddbb888";
@ -39,7 +39,7 @@ with lib;
networking.interfaces.enp1s0.useDHCP = true;
networking.interfaces.wlp2s0.useDHCP = true;
hexchen.network = {
network.yggdrasil = {
enable = true;
pubkey = "9779fd6b5bdba6b9e0f53c96e141f4b11ce5ef749d1b9e77a759a3fdbd33a653";
# if server, enable this and set endpoint:

2
config/modules/nixos/default.nix
View file

@ -7,7 +7,7 @@
./deploy-tf.nix
(sources.tf-nix + "/modules/nixos/secrets.nix")
(sources.tf-nix + "/modules/nixos/secrets-users.nix")
(sources.hexchen + "/modules/hexnet")
(sources.hexchen + "/modules/network/yggdrasil")
];
# stubs for hexchens modules, until more generalized

6
config/modules/nixos/deploy-tf.nix
View file

@ -67,10 +67,10 @@ in
};
dns.records."kittywitch_net_${config.networking.hostName}" =
mkIf (config.hexchen.network.enable) {
mkIf (config.network.yggdrasil.enable) {
tld = "kittywit.ch.";
domain = "${config.networking.hostName}.net";
aaaa.address = config.hexchen.network.address;
aaaa.address = config.network.yggdrasil.address;
};
} ++ mapAttrsToList
@ -79,7 +79,7 @@ in
config.home-manager.users);
security.acme.certs."${config.networking.hostName}.net.kittywit.ch" =
mkIf (config.services.nginx.enable && config.hexchen.network.enable) {
mkIf (config.services.nginx.enable && config.network.yggdrasil.enable) {
domain = "${config.networking.hostName}.net.kittywit.ch";
dnsProvider = "rfc2136";
credentialsFile = config.secrets.files.dns_creds.path;

6
nix/sources.json
View file

@ -17,10 +17,10 @@
"homepage": "",
"ref": "main",
"repo": "https://gitlab.com/hexchen/nixfiles",
"rev": "22f97ad0ed80ef2fa1744350bf7819e7ba5d4f57",
"sha256": "0nvlx6bmlz44afdr16r4rs6xh1sr4h6rfi83c0l9kdqmx9lrrj8c",
"rev": "447d63be2c37cc88d4cb5d4943ba6960bfdbc7c8",
"sha256": "188sf7nsxsb0a50a1v42cba9zrabgfvyzbak3dn1yiy8787gygb6",
"type": "tarball",
"url": "https://gitlab.com/hexchen/nixfiles/-/archive/22f97ad0ed80ef2fa1744350bf7819e7ba5d4f57.tar.gz",
"url": "https://gitlab.com/hexchen/nixfiles/-/archive/447d63be2c37cc88d4cb5d4943ba6960bfdbc7c8.tar.gz",
"url_template": "<repo>/-/archive/<rev>.tar.gz"
},
"home-manager": {