From 57c520b722f25f384301118046bf9cf182d4edd7 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 16 Jul 2015 23:22:30 +0200 Subject: Goodbye old world, and thanks for all the fish! --- old/modules/common/krebs-keys.nix | 18 ------------------ old/modules/common/krebs-repos.nix | 36 ------------------------------------ old/modules/common/nixpkgs.nix | 25 ------------------------- old/modules/common/sshkeys.nix | 26 -------------------------- 4 files changed, 105 deletions(-) delete mode 100644 old/modules/common/krebs-keys.nix delete mode 100644 old/modules/common/krebs-repos.nix delete mode 100644 old/modules/common/nixpkgs.nix delete mode 100644 old/modules/common/sshkeys.nix (limited to 'old/modules/common') diff --git a/old/modules/common/krebs-keys.nix b/old/modules/common/krebs-keys.nix deleted file mode 100644 index 5e349338d..000000000 --- a/old/modules/common/krebs-keys.nix +++ /dev/null @@ -1,18 +0,0 @@ -# alle public keys der krebsminister fuer R in krebs repos -{ config, ... }: - -let - inherit (builtins) readFile; -in - -with import ../lass/sshkeys.nix { - config.sshKeys.lass.pub = config.sshKeys.lass.pub; - config.sshKeys.uriel.pub = config.sshKeys.uriel.pub; - }; -{ - imports = [ - ./sshkeys.nix - ]; - - config.sshKeys.tv.pub = readFile ; -} diff --git a/old/modules/common/krebs-repos.nix b/old/modules/common/krebs-repos.nix deleted file mode 100644 index 86f373123..000000000 --- a/old/modules/common/krebs-repos.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, ... }: - -let - inherit (lib) mkDefault; - - mkSecureRepo = name: - { inherit name; - value = { - users = { - lass = mkDefault "R"; - tv = mkDefault "R"; - makefu = mkDefault "R"; - }; - }; - }; - - mkRepo = name: - { inherit name; - value = { - users = { - lass = mkDefault "R"; - tv = mkDefault "R"; - makefu = mkDefault "R"; - }; - }; - }; - -in { - services.gitolite.repos = - (lib.listToAttrs (map mkSecureRepo [ "brain" ])) // - (lib.listToAttrs (map mkRepo [ - "painload" - "services" - "hosts" - ])); -} diff --git a/old/modules/common/nixpkgs.nix b/old/modules/common/nixpkgs.nix deleted file mode 100644 index 486cf0207..000000000 --- a/old/modules/common/nixpkgs.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, ... }: - -with lib; - -{ - options = { - nixpkgs.url = mkOption { - type = types.str; - description = "URL of the nixpkgs repository."; - }; - nixpkgs.rev = mkOption { - type = types.str; - default = "origin/master"; - description = "Revision of the remote repository."; - }; - nixpkgs.dirty = mkOption { - type = types.bool; - default = false; - description = '' - If nixpkgs.url is a local path, then use that as it is. - TODO this break if URL is not a local path. - ''; - }; - }; -} diff --git a/old/modules/common/sshkeys.nix b/old/modules/common/sshkeys.nix deleted file mode 100644 index 5f1c60668..000000000 --- a/old/modules/common/sshkeys.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, ... }: - -with lib; - -{ - options = { - sshKeys = mkOption { - type = types.attrsOf (types.submodule ( - { config, ... }: - { - options = { - pub = mkOption { - type = types.str; - description = "Public part of the ssh key."; - }; - - priv = mkOption { - type = types.str; - description = "Private part of the ssh key."; - }; - }; - })); - description = "collection of ssh-keys"; - }; - }; -} -- cgit v1.2.3