From 2bc5c58d85990e483af8fde57ed5f2442351b69c Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 11 Jul 2015 19:44:12 +0200
Subject: move old stuff

---
 modules/cd/default.nix    | 91 -----------------------------------------------
 modules/cd/networking.nix | 14 --------
 modules/cd/paths.nix      | 12 -------
 modules/cd/users.nix      | 53 ---------------------------
 4 files changed, 170 deletions(-)
 delete mode 100644 modules/cd/default.nix
 delete mode 100644 modules/cd/networking.nix
 delete mode 100644 modules/cd/paths.nix
 delete mode 100644 modules/cd/users.nix

(limited to 'modules/cd')

diff --git a/modules/cd/default.nix b/modules/cd/default.nix
deleted file mode 100644
index e3abd47ef..000000000
--- a/modules/cd/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  inherit (builtins) readFile;
-in
-
-{
-  imports =
-    [
-      { users.extraUsers = import <secrets/extraUsers.nix>; }
-      ./networking.nix
-      ./users.nix
-      ../tv/base.nix
-      ../tv/base-cac-CentOS-7-64bit.nix
-      ../tv/config/consul-server.nix
-      ../tv/ejabberd.nix # XXX echtes modul
-      ../tv/exim-smarthost.nix
-      ../tv/git/public.nix
-      ../tv/sanitize.nix
-      {
-        imports = [ ../tv/identity ];
-        tv.identity = {
-          enable = true;
-          self = config.tv.identity.hosts.cd;
-        };
-      }
-      {
-        imports = [ ../tv/iptables ];
-        tv.iptables = {
-          enable = true;
-          input-internet-accept-new-tcp = [
-            "ssh"
-            "tinc"
-            "smtp"
-            "xmpp-client"
-            "xmpp-server"
-          ];
-          input-retiolum-accept-new-tcp = [
-            "http"
-          ];
-        };
-      }
-      {
-        imports = [ ../tv/retiolum ];
-        tv.retiolum = {
-          enable = true;
-          hosts = <retiolum-hosts>;
-          connectTo = [
-            "fastpoke"
-            "pigstarter"
-            "ire"
-          ];
-        };
-      }
-    ];
-
-  # "Developer 2" plan has two vCPUs.
-  nix.maxJobs = 2;
-
-  environment.systemPackages = with pkgs; [
-    git # required for ./deploy, clone_or_update
-    htop
-    iftop
-    iotop
-    iptables
-    mutt    # for mv
-    nethogs
-    rxvt_unicode.terminfo
-    tcpdump
-  ];
-
-  services.ejabberd-cd = {
-    enable = true;
-  };
-
-  services.journald.extraConfig = ''
-    SystemMaxUse=1G
-    RuntimeMaxUse=128M
-  '';
-
-  services.openssh = {
-    enable = true;
-    hostKeys = [
-      # XXX bits here make no science
-      { bits = 8192; type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
-    ];
-    permitRootLogin = "yes";
-  };
-
-  sound.enable = false;
-}
diff --git a/modules/cd/networking.nix b/modules/cd/networking.nix
deleted file mode 100644
index 215e20829..000000000
--- a/modules/cd/networking.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{...}:
-{
-  networking.hostName = "cd";
-  networking.interfaces.enp2s1.ip4 = [
-    {
-      address = "162.219.7.216";
-      prefixLength = 24;
-    }
-  ];
-  networking.defaultGateway = "162.219.7.1";
-  networking.nameservers = [
-    "8.8.8.8"
-  ];
-}
diff --git a/modules/cd/paths.nix b/modules/cd/paths.nix
deleted file mode 100644
index f873912fb..000000000
--- a/modules/cd/paths.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  lib.file.url = ../../lib;
-  modules.file.url = ../../modules;
-  nixpkgs.git = {
-    url = https://github.com/NixOS/nixpkgs;
-    rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
-    cache = ../../tmp/git-cache;
-  };
-  pubkeys.file.url = ../../pubkeys;
-  retiolum-hosts.file.url = ../../hosts;
-  secrets.file.url = ../../secrets/cd/nix;
-}
diff --git a/modules/cd/users.nix b/modules/cd/users.nix
deleted file mode 100644
index 656336d6c..000000000
--- a/modules/cd/users.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ ... }:
-
-let
-  inherit (builtins) readFile;
-in
-
-{
-  users.extraGroups = {
-
-    # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories
-    #    Loaded: loaded (/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/example/systemd/system/systemd-tmpfiles-setup.service)
-    #    Active: failed (Result: exit-code) since Mon 2015-03-16 10:29:18 UTC; 4s ago
-    #      Docs: man:tmpfiles.d(5)
-    #            man:systemd-tmpfiles(8)
-    #   Process: 19272 ExecStart=/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/bin/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev (code=exited, status=1/FAILURE)
-    #  Main PID: 19272 (code=exited, status=1/FAILURE)
-    # 
-    # Mar 16 10:29:17 cd systemd-tmpfiles[19272]: [/usr/lib/tmpfiles.d/legacy.conf:26] Unknown group 'lock'.
-    # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal configured, ignoring.
-    # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal/7b35116927d74ea58785e00b47ac0f0d configured, ignoring.
-    # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service: main process exited, code=exited, status=1/FAILURE
-    # Mar 16 10:29:18 cd systemd[1]: Failed to start Create Volatile Files and Directories.
-    # Mar 16 10:29:18 cd systemd[1]: Unit systemd-tmpfiles-setup.service entered failed state.
-    # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service failed.
-    # warning: error(s) occured while switching to the new configuration
-    lock.gid = 10001;
-
-  };
-  users.extraUsers =
-    {
-      root = {
-        openssh.authorizedKeys.keys = [
-          (readFile <pubkeys/deploy_wu.ssh.pub>)
-          (readFile <pubkeys/tv_wu.ssh.pub>)
-        ];
-      };
-
-      mv = rec {
-        name = "mv";
-        uid = 1338;
-        group = "users";
-        home = "/home/${name}";
-        createHome = true;
-        useDefaultShell = true;
-        openssh.authorizedKeys.keys = [
-          (readFile <pubkeys/mv_vod.ssh.pub>)
-        ];
-      };
-
-    };
-
-  users.mutableUsers = false;
-}
-- 
cgit v1.2.3