Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sync-containers3: lass -> krebs

Browse Source
This commit is contained in:
lassulus 2023-01-30 20:53:24 +01:00
parent bf4a3fe78e
commit c7417c8bc1
14 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
krebs/3modules/default.nix
View File

@ -53,6 +53,7 @@ let
./sitemap.nix ./sitemap.nix
./ssl.nix ./ssl.nix
./sync-containers.nix ./sync-containers.nix
./sync-containers3.nix
./systemd.nix ./systemd.nix
./tinc.nix ./tinc.nix
./tinc_graphs.nix ./tinc_graphs.nix

4
lass/3modules/sync-containers3.nix → krebs/3modules/sync-containers3.nix
View File

@ -1,8 +1,8 @@
{ config, lib, pkgs, ... }: let { config, lib, pkgs, ... }: let
cfg = config.lass.sync-containers3; cfg = config.krebs.sync-containers3;
slib = pkgs.stockholm.lib; slib = pkgs.stockholm.lib;
in { in {
options.lass.sync-containers3 = { options.krebs.sync-containers3 = {
inContainer = { inContainer = {
enable = lib.mkEnableOption "container config for syncing"; enable = lib.mkEnableOption "container config for syncing";
pubkey = lib.mkOption { pubkey = lib.mkOption {

2
lass/1systems/green/config.nix
View File

@ -27,7 +27,7 @@ with import <stockholm/lib>;
krebs.build.host = config.krebs.hosts.green; krebs.build.host = config.krebs.hosts.green;
lass.sync-containers3.inContainer = { krebs.sync-containers3.inContainer = {
enable = true; enable = true;
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFlUMf943qEQG64ob81p6dgoHq4jUjq7tSvmSdEOEU2y"; pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFlUMf943qEQG64ob81p6dgoHq4jUjq7tSvmSdEOEU2y";
}; };

2
lass/1systems/orange/config.nix
View File

@ -14,7 +14,7 @@ with import <stockholm/lib>;
defaults.email = "acme@lassul.us"; defaults.email = "acme@lassul.us";
}; };
lass.sync-containers3.inContainer = { krebs.sync-containers3.inContainer = {
enable = true; enable = true;
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQWzKuXrwQopBc1mzb2VpljmwAs7Y8bRl9a8hBXLC+l"; pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQWzKuXrwQopBc1mzb2VpljmwAs7Y8bRl9a8hBXLC+l";
}; };

2
lass/1systems/radio/config.nix
View File

@ -17,7 +17,7 @@ with import <stockholm/lib>;
defaults.email = "acme@lassul.us"; defaults.email = "acme@lassul.us";
}; };
lass.sync-containers3.inContainer = { krebs.sync-containers3.inContainer = {
enable = true; enable = true;
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOvPKdbVwMEFCDMyNAzR8NdVjTbQL2G+03Xomxn6KKFt"; pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOvPKdbVwMEFCDMyNAzR8NdVjTbQL2G+03Xomxn6KKFt";
}; };

2
lass/1systems/ubik/config.nix
View File

@ -9,7 +9,7 @@ with import <stockholm/lib>;
krebs.build.host = config.krebs.hosts.ubik; krebs.build.host = config.krebs.hosts.ubik;
lass.sync-containers3.inContainer = { krebs.sync-containers3.inContainer = {
enable = true; enable = true;
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPBFGMjH0+Dco6DVFZbByENMci8CFTLXCL7j53yctPnM"; pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPBFGMjH0+Dco6DVFZbByENMci8CFTLXCL7j53yctPnM";
}; };

2
lass/1systems/yellow/config.nix
View File

@ -9,7 +9,7 @@ in {
krebs.build.host = config.krebs.hosts.yellow; krebs.build.host = config.krebs.hosts.yellow;
lass.sync-containers3.inContainer = { krebs.sync-containers3.inContainer = {
enable = true; enable = true;
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN737BAP36KiZO97mPKTIUGJUcr97ps8zjfFag6cUiYL"; pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN737BAP36KiZO97mPKTIUGJUcr97ps8zjfFag6cUiYL";
}; };

6
lass/2configs/green-host.nix
View File

@ -1,10 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ krebs.sync-containers3.containers.green = {
<stockholm/lass/2configs/container-networking.nix>
];
lass.sync-containers3.containers.green = {
sshKey = "${toString <secrets>}/green.sync.key"; sshKey = "${toString <secrets>}/green.sync.key";
}; };
} }

2
lass/2configs/orange-host.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
lass.sync-containers3.containers.orange = { krebs.sync-containers3.containers.orange = {
sshKey = "${toString <secrets>}/orange.sync.key"; sshKey = "${toString <secrets>}/orange.sync.key";
}; };
services.nginx.virtualHosts."lassul.us" = { services.nginx.virtualHosts."lassul.us" = {

2
lass/2configs/radio/container-host.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
lass.sync-containers3.containers.radio = { krebs.sync-containers3.containers.radio = {
sshKey = "${toString <secrets>}/radio.sync.key"; sshKey = "${toString <secrets>}/radio.sync.key";
}; };
containers.radio = { containers.radio = {

2
lass/2configs/red-host.nix
View File

@ -8,7 +8,7 @@ in
]; ];
lass.sync-containers3.containers.red = { krebs.sync-containers3.containers.red = {
sshKey = "${toString <secrets>}/containers/red/sync.key"; sshKey = "${toString <secrets>}/containers/red/sync.key";
ephemeral = true; ephemeral = true;
}; };

2
lass/2configs/ubik-host.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
lass.sync-containers3.containers.ubik = { krebs.sync-containers3.containers.ubik = {
sshKey = "${toString <secrets>}/ubik.sync.key"; sshKey = "${toString <secrets>}/ubik.sync.key";
}; };
containers.ubik.bindMounts."/var/lib" = { containers.ubik.bindMounts."/var/lib" = {

2
lass/2configs/yellow-host.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
lass.sync-containers3.containers.yellow = { krebs.sync-containers3.containers.yellow = {
sshKey = "${toString <secrets>}/yellow.sync.key"; sshKey = "${toString <secrets>}/yellow.sync.key";
}; };
containers.yellow.bindMounts."/var/lib" = { containers.yellow.bindMounts."/var/lib" = {

1
lass/3modules/default.nix
View File

@ -15,6 +15,5 @@ _:
./xjail.nix ./xjail.nix
./autowifi.nix ./autowifi.nix
./browsers.nix ./browsers.nix
./sync-containers3.nix
]; ];
} }