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

rm krebs.build.target

Browse Source
This commit is contained in:
tv 2016-02-08 01:07:03 +01:00
parent ec7dc8a5ac
commit d98578e3e1
10 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
krebs/3modules/build.nix
View File

@ -3,8 +3,6 @@
with lib; with lib;
let let
target = config.krebs.build // { user.name = "root"; };
out = { out = {
# TODO deprecate krebs.build.host # TODO deprecate krebs.build.host
options.krebs.build.host = mkOption { options.krebs.build.host = mkOption {
@ -17,12 +15,6 @@ let
default = "/nix/var/nix/profiles/system"; default = "/nix/var/nix/profiles/system";
}; };
# TODO make krebs.build.target.host :: host
options.krebs.build.target = mkOption {
type = with types; nullOr str;
default = null;
};
# TODO deprecate krebs.build.user # TODO deprecate krebs.build.user
options.krebs.build.user = mkOption { options.krebs.build.user = mkOption {
type = types.user; type = types.user;

1
krebs/5pkgs/test/infest-cac-centos7/notes
View File

@ -115,7 +115,6 @@ _: {
users.extraUsers.root.openssh.authorizedKeys.keys = [ users.extraUsers.root.openssh.authorizedKeys.keys = [
"$(cat ${krebs_ssh}.pub)" "$(cat ${krebs_ssh}.pub)"
]; ];
krebs.build.target = "$ip";
} }
EOF EOF

1
makefu/1systems/gum.nix
View File

@ -26,7 +26,6 @@ in {
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
###### stable ###### stable
krebs.build.target = "root@gum.krebsco.de";
krebs.build.host = config.krebs.hosts.gum; krebs.build.host = config.krebs.hosts.gum;
krebs.retiolum.extraConfig = '' krebs.retiolum.extraConfig = ''
ListenAddress = ${external-ip} 53 ListenAddress = ${external-ip} 53

1
makefu/1systems/vbob.nix
View File

@ -4,7 +4,6 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
krebs.build.host = config.krebs.hosts.vbob; krebs.build.host = config.krebs.hosts.vbob;
krebs.build.target = "root@10.10.10.220";
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
<nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix> <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>

2
mv/1systems/stro.nix
View File

@ -8,8 +8,6 @@ with lib;
krebs.build.source.git.nixpkgs.rev = krebs.build.source.git.nixpkgs.rev =
"7ae05edcdd14f6ace83ead9bf0d114e97c89a83a"; "7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
krebs.build.target = "lolwat";
imports = [ imports = [
../2configs/hw/x220.nix ../2configs/hw/x220.nix
../2configs/git.nix ../2configs/git.nix

1
shared/1systems/wolf.nix
View File

@ -45,7 +45,6 @@ in
# uninteresting stuff # uninteresting stuff
##################### #####################
krebs.build.host = config.krebs.hosts.wolf; krebs.build.host = config.krebs.hosts.wolf;
krebs.build.target = "wolf";
boot.kernel.sysctl = { boot.kernel.sysctl = {
# Enable IPv6 Privacy Extensions # Enable IPv6 Privacy Extensions

1
tv/1systems/cd.nix
View File

@ -4,7 +4,6 @@ with lib;
{ {
krebs.build.host = config.krebs.hosts.cd; krebs.build.host = config.krebs.hosts.cd;
krebs.build.target = "root@cd.internet";
imports = [ imports = [
../2configs/hw/CAC-Developer-2.nix ../2configs/hw/CAC-Developer-2.nix

1
tv/1systems/mkdir.nix
View File

@ -17,7 +17,6 @@ in
{ {
krebs.build.host = config.krebs.hosts.mkdir; krebs.build.host = config.krebs.hosts.mkdir;
krebs.build.target = "root@${primary-addr4}";
imports = [ imports = [
../2configs/hw/CAC-Developer-1.nix ../2configs/hw/CAC-Developer-1.nix

2
tv/1systems/rmdir.nix
View File

@ -18,8 +18,6 @@ in
{ {
krebs.build.host = config.krebs.hosts.rmdir; krebs.build.host = config.krebs.hosts.rmdir;
krebs.build.target = "root@rmdir.internet";
imports = [ imports = [
../2configs/hw/CAC-Developer-1.nix ../2configs/hw/CAC-Developer-1.nix
../2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/fs/CAC-CentOS-7-64bit.nix

1
tv/2configs/default.nix
View File

@ -7,7 +7,6 @@ with lib;
krebs.build = { krebs.build = {
user = config.krebs.users.tv; user = config.krebs.users.tv;
target = mkDefault "root@${config.krebs.build.host.name}";
source = mapAttrs (_: mkDefault) ({ source = mapAttrs (_: mkDefault) ({
nixos-config = "symlink:stockholm/tv/1systems/${config.krebs.build.host.name}.nix"; nixos-config = "symlink:stockholm/tv/1systems/${config.krebs.build.host.name}.nix";
nixpkgs = symlink:stockholm/nixpkgs; nixpkgs = symlink:stockholm/nixpkgs;