From cf1d5ebb8f63cc2178fefae4afd59a131ce2d96c Mon Sep 17 00:00:00 2001
From: mv <mv@ni.r>
Date: Wed, 30 Aug 2017 18:03:15 +0200
Subject: [PATCH 01/10] mv nixpkgs: 94941cb -> 56da88a
---
mv/source.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mv/source.nix b/mv/source.nix
index 8b1563914..aa2b13fd8 100644
--- a/mv/source.nix
+++ b/mv/source.nix
@@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix";
nixpkgs.git = {
# nixos-17.03
- ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78";
+ ref = mkDefault "56da88a298a6f549701a10bb12072804a1ebfbd5";
url = https://github.com/NixOS/nixpkgs;
};
secrets.file = getAttr builder {
From eb2d780e5c4c5aee09153c56ea6150414c1c6db1 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 18:08:14 +0200
Subject: [PATCH 02/10] mv dummy_secrets: init
---
mv/dummy_secrets/default.nix | 1 +
1 file changed, 1 insertion(+)
create mode 100644 mv/dummy_secrets/default.nix
diff --git a/mv/dummy_secrets/default.nix b/mv/dummy_secrets/default.nix
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/mv/dummy_secrets/default.nix
@@ -0,0 +1 @@
+{}
From d9fcefb8ab6e64ed17fda17c5e19831453af8818 Mon Sep 17 00:00:00 2001
From: mv <mv@ni.r>
Date: Wed, 30 Aug 2017 18:03:15 +0200
Subject: [PATCH 03/10] mv nixpkgs: 94941cb -> 56da88a
---
mv/source.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mv/source.nix b/mv/source.nix
index 8b1563914..aa2b13fd8 100644
--- a/mv/source.nix
+++ b/mv/source.nix
@@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix";
nixpkgs.git = {
# nixos-17.03
- ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78";
+ ref = mkDefault "56da88a298a6f549701a10bb12072804a1ebfbd5";
url = https://github.com/NixOS/nixpkgs;
};
secrets.file = getAttr builder {
From 58e5f06a74d86d156234a44ee5b0e00291887fbd Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 18:08:14 +0200
Subject: [PATCH 04/10] mv dummy_secrets: init
---
mv/dummy_secrets/default.nix | 1 +
1 file changed, 1 insertion(+)
create mode 100644 mv/dummy_secrets/default.nix
diff --git a/mv/dummy_secrets/default.nix b/mv/dummy_secrets/default.nix
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/mv/dummy_secrets/default.nix
@@ -0,0 +1 @@
+{}
From 448d4dc075d1cee2b8148d4c54df5f5e4d9bf0a7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 20:00:53 +0200
Subject: [PATCH 05/10] mv stro: ci = true
---
krebs/3modules/mv/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/krebs/3modules/mv/default.nix b/krebs/3modules/mv/default.nix
index 7876ab79e..c8d138a44 100644
--- a/krebs/3modules/mv/default.nix
+++ b/krebs/3modules/mv/default.nix
@@ -5,6 +5,7 @@ with import <stockholm/lib>;
{
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.mv) {
stro = {
+ ci = true;
cores = 4;
nets = {
retiolum = {
From af0696b9987d3ff0783cdd69d26a903c1ea92004 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 20:04:08 +0200
Subject: [PATCH 06/10] tv: set external = true where appropriate
---
krebs/3modules/tv/default.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index d6e6eae11..79fa27bad 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -79,6 +79,7 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOd/HqZIO9Trn3eycl23GZAz21HQCISaVNfNyaLSQvJ6";
};
ju = {
+ external = true;
nets = {
gg23 = {
ip4.addr = "10.23.1.144";
@@ -112,6 +113,7 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHM6dL0fQ8Bd0hER0Xa3I2pAWVHdnwOBaAZhbDlLJmUu";
};
kaepsele = {
+ external = true;
nets = {
retiolum = {
ip4.addr = "10.243.166.2";
@@ -237,6 +239,7 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIHmwXHV7E9UGuk4voVCADjlLkyygqNw054jvrsPn5t root@nomic";
};
ok = {
+ external = true;
nets = {
gg23 = {
ip4.addr = "10.23.1.1";
@@ -245,6 +248,7 @@ with import <stockholm/lib>;
};
};
schnabeldrucker = {
+ external = true;
nets = {
gg23 = {
ip4.addr = "10.23.1.21";
@@ -253,6 +257,7 @@ with import <stockholm/lib>;
};
};
schnabelscanner = {
+ external = true;
nets = {
gg23 = {
ip4.addr = "10.23.1.22";
From 24393b8c1c48e48acd5a83853485c141dad17774 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 20:22:54 +0200
Subject: [PATCH 07/10] mv dummy_secrets: add ssh.ed25519
---
mv/dummy_secrets/ssh.ed25519 | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 mv/dummy_secrets/ssh.ed25519
diff --git a/mv/dummy_secrets/ssh.ed25519 b/mv/dummy_secrets/ssh.ed25519
new file mode 100644
index 000000000..a7d2adab4
--- /dev/null
+++ b/mv/dummy_secrets/ssh.ed25519
@@ -0,0 +1,3 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+dummy
+-----END OPENSSH PRIVATE KEY-----
From 75a30f0b8a5d307f1f04ac07837832492b1fc0ba Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 20:46:12 +0200
Subject: [PATCH 08/10] mv dummy_secrets: add root ssh authorized key
---
mv/dummy_secrets/default.nix | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/mv/dummy_secrets/default.nix b/mv/dummy_secrets/default.nix
index 0967ef424..84a5e1186 100644
--- a/mv/dummy_secrets/default.nix
+++ b/mv/dummy_secrets/default.nix
@@ -1 +1,8 @@
-{}
+{ config, ... }:
+{
+ users.users.root = {
+ openssh.authorizedKeys.keys = [
+ config.krebs.users.mv.pubkey
+ ];
+ };
+}
From a9ce94115873bb6bb679919c18e8afd336f2d479 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 22:02:52 +0200
Subject: [PATCH 09/10] tv mu: sort systemPackages
---
tv/1systems/mu/config.nix | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index ee0f4f7f5..10d7b2197 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -52,18 +52,18 @@ with import <stockholm/lib>;
networking.networkmanager.enable = true;
environment.systemPackages = with pkgs; [
+ chromium
+ firefoxWrapper
+ gimp
+ iptables
+ libreoffice
+ pidginotr
+ pidgin-with-plugins
+ skype
slock
tinc_pre
- iptables
vim
- gimp
xsane
- firefoxWrapper
- chromium
- skype
- libreoffice
- pidgin-with-plugins
- pidginotr
#foomatic_filters
#gutenprint
From 056b02ed05a38a8a032ad70b4ec092dd07ba6736 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 22:03:14 +0200
Subject: [PATCH 10/10] tv mu: add kdeApplications.l10n.de.qt5
---
tv/1systems/mu/config.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 10d7b2197..f3e7b515b 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -56,6 +56,7 @@ with import <stockholm/lib>;
firefoxWrapper
gimp
iptables
+ kdeApplications.l10n.de.qt5
libreoffice
pidginotr
pidgin-with-plugins