Merge remote-tracking branch 'mic92/master' into master
This commit is contained in:
commit
813eefa3c5
4
krebs/3modules/external/default.nix
vendored
4
krebs/3modules/external/default.nix
vendored
@ -608,6 +608,10 @@ in {
|
|||||||
mail = "joerg@thalheim.io";
|
mail = "joerg@thalheim.io";
|
||||||
pubkey = ssh-for "mic92";
|
pubkey = ssh-for "mic92";
|
||||||
};
|
};
|
||||||
|
shannan = {
|
||||||
|
mail = "shannan@lekwati.com";
|
||||||
|
pubkey = ssh-for "shannan";
|
||||||
|
};
|
||||||
qubasa = {
|
qubasa = {
|
||||||
mail = "luis.nixos@gmail.com";
|
mail = "luis.nixos@gmail.com";
|
||||||
pubkey = ssh-for "qubasa";
|
pubkey = ssh-for "qubasa";
|
||||||
|
1
krebs/3modules/external/mic92.nix
vendored
1
krebs/3modules/external/mic92.nix
vendored
@ -468,6 +468,7 @@ in {
|
|||||||
aliases = [
|
aliases = [
|
||||||
"eva.r"
|
"eva.r"
|
||||||
"prometheus.r"
|
"prometheus.r"
|
||||||
|
"alertmanager.r"
|
||||||
];
|
];
|
||||||
tinc.pubkey = ''
|
tinc.pubkey = ''
|
||||||
-----BEGIN PUBLIC KEY-----
|
-----BEGIN PUBLIC KEY-----
|
||||||
|
1
krebs/3modules/external/ssh/shannan.pub
vendored
Normal file
1
krebs/3modules/external/ssh/shannan.pub
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOBXTForyB6oNMK5bbGpALKU4lPsKRGxNLhrE/PnHHq7 shannan@bernie
|
@ -391,6 +391,15 @@ with import <stockholm/lib>;
|
|||||||
{ predicate = "-i wiregrill -p udp --dport 4000:4002"; target = "ACCEPT"; }
|
{ predicate = "-i wiregrill -p udp --dport 4000:4002"; target = "ACCEPT"; }
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
users.users.shannan = {
|
||||||
|
uid = genid_uint31 "shannan";
|
||||||
|
isNormalUser = true;
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
config.krebs.users.shannan.pubkey
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
{
|
{
|
||||||
nix.trustedUsers = [ "mic92" ];
|
nix.trustedUsers = [ "mic92" ];
|
||||||
users.users.mic92 = {
|
users.users.mic92 = {
|
||||||
|
Loading…
Reference in New Issue
Block a user