summaryrefslogtreecommitdiffstats
path: root/modules/cd
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-06-19 01:35:37 +0200
committertv <tv@shackspace.de>2015-06-19 01:35:37 +0200
commit501fdb53c10edfd3328646377beee35568daa1e0 (patch)
treee738e9298ce0817ab1b5d99df5c63fbc8e47eca3 /modules/cd
parent03a9bb71c36c8f2f212caa1ff26b25de2c979060 (diff)
tv: readFile pubkeys everywhere
Diffstat (limited to 'modules/cd')
-rw-r--r--modules/cd/default.nix10
-rw-r--r--modules/cd/git.nix2
2 files changed, 8 insertions, 4 deletions
diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index 5d0d30902..ca798f8e6 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -1,5 +1,9 @@
{ pkgs, ... }:
+let
+ inherit (builtins) readFile;
+in
+
{
imports =
[
@@ -99,8 +103,8 @@
{
root = {
openssh.authorizedKeys.keys = [
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEieAihh+o208aeCA14fAtjzyZN/nrpOJt2vZ5VYZp69 deploy@wu"
- "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDFR//RnCvEZAt0F6ExDsatKZ/DDdifanuSL360mqOhaFieKI34RoOwfQT9T+Ga52Vh5V2La6esvlph686EdgzeKLvDoxEwFM9ZYFBcMrNzu4bMTlgE7YUYw5JiORyXNfznBGnme6qpuvx9ibYhUyiZo99kM8ys5YrUHrP2JXQJMezDFZHxT4GFMOuSdh/1daGoKKD6hYL/jEHX8CI4E3BSmKK6ygYr1fVX0K0Tv77lIi5mLXucjR7CytWYWYnhM6DC3Hxpv2zRkPgf3k0x/Y1hrw3V/r0Me5h90pd2C8pFaWA2ZoUT/fmyVqvx1tZPYToU/O2dMItY0zgx2kR0yD+6g7Aahz3R+KlXkV8k5c8bbTbfGnZWDR1ZlbLRM9Yt5vosfwapUD90MmVkpmR3wUkO2sUKi80QfC7b4KvSDXQ+MImbGxMaU5Bnsq1PqLN95q+uat3nlAVBAELkcx51FlE9CaIS65y4J7FEDg8BE5JeuCNshh62VSYRXVSFt8bk3f/TFGgzC8OIo14BhVmiRQQ503Z1sROyf5xLX2a/EJavMm1i2Bs2TH6ROKY9z5Pz8hT5US0r381V8oG7TZyLF9HTtoy3wCYsgWA5EmLanjAsVU2YEeAA0rxzdtYP8Y2okFiJ6u+M4HQZ3Wg3peSodyp3vxdYce2vk4EKeqEFuuS82850DYb7Et7fmp+wQQUT8Q/bMO0DreWjHoMM5lE4LJ4ME6AxksmMiFtfo/4Fe2q9D+LAqZ+ANOcv9M+8Rn6ngiYmuRNd0l/a02q1PEvO6vTfXgcl4f7Z1IULHPEaDNZHCJS1K5RXYFqYQ6OHsTmOm7hnwaRAS97+VFMo1i5uvTx9nYaAcY7yzq3Ckfb67dMBKApGOpJpkvPgfrP7bgBO5rOZXM1opXqVPb09nljAhhAhyCTh1e/8+mJrBo0cLQ/LupQzVxGDgm3awSMPxsZAN45PSWz76zzxdDa1MMo51do+VJHfs7Wl0NcXAQrniOBYL9Wqt0qNkn1gY5smkkISGeQ/vxNap4MmzeZE7b5fpOy+2fpcRVQLpc4nooQzJvSVTFz+25lgZ6iHf45K87gQFMIAri1Pf/EDDpL87az+bRWvWi+BA2kMe1kf+Ay1LyMz8r+g51H0ma0bNFh6+fbWMfUiD9JCepIObclnUJ4NlWfcgHxTf17d/4tl6z4DTcLpCCk8Da77JouSHgvtcRbRlFV1OfhWZLXUsrlfpaQTiItv6TGIr3k7+7b66o3Qw/GQVs5GmYifaIZIz8n8my4XjkaMBd0SZfBzzvFjHMq6YUP9+SbjvReqofuoO+5tW1wTYZXitFFBfwuHlXm6w77K5QDBW6olT7pat41/F5eGxLcz tv@wu"
+ (readFile <pubkeys/deploy_wu.ssh.pub>)
+ (readFile <pubkeys/tv_wu.ssh.pub>)
];
};
@@ -112,7 +116,7 @@
createHome = true;
useDefaultShell = true;
openssh.authorizedKeys.keys = [
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGer9e2+Lew7vnisgBbsFNECEIkpNJgEaqQqgb9inWkQ mv@vod"
+ (readFile <pubkeys/mv_vod.ssh.pub>)
];
};
diff --git a/modules/cd/git.nix b/modules/cd/git.nix
index 84fd8f715..42b0bc12e 100644
--- a/modules/cd/git.nix
+++ b/modules/cd/git.nix
@@ -24,7 +24,7 @@ let
];
users = addNames {
- tv = { pubkey = readFile <pubkeys/tv.ssh.pub>; };
+ tv = { pubkey = readFile <pubkeys/tv_wu.ssh.pub>; };
lass = { pubkey = readFile <pubkeys/lass.ssh.pub>; };
uriel = { pubkey = readFile <pubkeys/uriel.ssh.pub>; };
makefu = { pubkey = "xxx"; };