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

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2018-11-10 23:01:10 +01:00
commit 09d0969782
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/airdcpp.nix
View File

@ -243,7 +243,7 @@ let
in { in {
systemd.services.airdcpp = { systemd.services.airdcpp = {
description = "airdcpp webui"; description = "airdcpp webui";
after = [ "network.target" ]; after = [ "network.target" "local-fs.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
restartIfChanged = true; restartIfChanged = true;
serviceConfig = { serviceConfig = {

20
krebs/3modules/makefu/default.nix
View File

@ -60,7 +60,7 @@ in {
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGaV5Ga5R8RTrA+nclxw6uy5Z+hPBLitQTfuXdsmbVW6 crapi"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGaV5Ga5R8RTrA+nclxw6uy5Z+hPBLitQTfuXdsmbVW6 crapi";
}; };
drop = rec { drop = rec {
ci = true; ci = false;
cores = 1; cores = 1;
nets = { nets = {
retiolum = { retiolum = {
@ -83,7 +83,7 @@ in {
}; };
}; };
studio = rec { studio = rec {
ci = true; ci = false;
cores = 4; cores = 4;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>; ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqBR5gjJkR1TEIs2yx6JRoIOA7+/LJA6kjju8yCauFa studio"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqBR5gjJkR1TEIs2yx6JRoIOA7+/LJA6kjju8yCauFa studio";
@ -109,7 +109,7 @@ in {
}; };
fileleech = rec { fileleech = rec {
ci = true; ci = false;
cores = 4; cores = 4;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>; ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+jB5QdPsAJc90alYDhAEP3sPDJb6eIj9bebj+rTBEJ fileleech"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+jB5QdPsAJc90alYDhAEP3sPDJb6eIj9bebj+rTBEJ fileleech";
@ -134,7 +134,7 @@ in {
}; };
}; };
latte = rec { latte = rec {
ci = true; ci = false;
cores = 1; cores = 1;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>; ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
# ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIrkK1mWfPvfZ9ALC1irGLuzOtMefaGAmGY1VD4dj7K1 latte"; # ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIrkK1mWfPvfZ9ALC1irGLuzOtMefaGAmGY1VD4dj7K1 latte";
@ -166,7 +166,7 @@ in {
}; };
pnp = { pnp = {
ci = true; ci = false;
cores = 1; cores = 1;
nets = { nets = {
retiolum = { retiolum = {
@ -190,7 +190,7 @@ in {
}; };
}; };
darth = { darth = {
ci = true; ci = false;
cores = 4; cores = 4;
nets = { nets = {
retiolum = { retiolum = {
@ -404,7 +404,7 @@ in {
}; };
}; };
wry = rec { wry = rec {
ci = true; ci = false;
cores = 1; cores = 1;
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
@ -449,7 +449,7 @@ in {
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH4Tjx9qK6uWtxT1HCpeC0XvDZKO/kaPygyKatpAqU6I root@wry"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH4Tjx9qK6uWtxT1HCpeC0XvDZKO/kaPygyKatpAqU6I root@wry";
}; };
filepimp = rec { filepimp = rec {
ci = true; ci = false;
cores = 1; cores = 1;
nets = { nets = {
lan = { lan = {
@ -639,9 +639,9 @@ in {
}; };
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcxWFEPzke/Sdd9qNX6rSJgXal8NmINYajpFCxXfYdj root@gum"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcxWFEPzke/Sdd9qNX6rSJgXal8NmINYajpFCxXfYdj root@gum";
}; };
shoney = rec { shoney = rec {
ci = true; ci = false;
cores = 1; cores = 1;
nets = rec { nets = rec {
siem = { siem = {

0
makefu/0tests/data/secrets/hass/darksky.apikey Normal file
View File

8
makefu/nixpkgs.json
View File

@ -1,7 +1,7 @@
{ {
"url": "https://github.com/makefu/nixpkgs", "url": "https://github.com/makefu/nixpkgs",
"rev": "86fb1e9ae6ba6dfedc814b82abd8db5cfa4f4687", "rev": "bf46294e4cf20649182f76fc9200a48436f5874a",
"date": "2018-10-07T23:33:42+02:00", "date": "2018-09-18T02:20:45+02:00",
"sha256": "015yxs3qj299mgqfmz5vgszj2gxqwazifsdsjw6xadris3ri41d3", "sha256": "13900gack7pgf5a7c11x30rzb3s0kjpbm2z2g8fw4720cr9lkd94",
"fetchSubmodules": true "fetchSubmodules": false
} }