Upgrade to latest 19.03

[perso/Immae/Config/Nix.git] / nixops / eldiron.nix

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 44d928b06a6ed5d1f9e2d99dd063f0d0065e0ff3..9d32bb3196d9b2630bf7505685794675dda0adae 100644 (file)
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -1,4 +1,4 @@
-{ privateFiles ? ./., nixpkgsNext ? null }:
+{ privateFiles ? ./. }:
 {
   network = {
     description = "Immae's network";
@@ -6,10 +6,10 @@
   };
 
   eldiron = { config, pkgs, mylibs, myconfig, ... }:
-    with mylibs;
   {
     _module.args = {
-      pkgsNext = if builtins.isNull nixpkgsNext then pkgs else import nixpkgsNext {};
+      pkgsNext = import <nixpkgsNext> {};
+      pkgsPrevious = import <nixpkgsPrevious> {};
       mylibs = import ../libs.nix { nixpkgs = pkgs; };
       mypkgs = import ../default.nix;
       myconfig = {
@@ -24,6 +24,7 @@
     };
 
     imports = [
+      ./modules/ssh
       ./modules/certificates.nix
       ./modules/gitolite
       ./modules/databases
@@ -51,12 +52,7 @@
       MaxLevelStore="warning"
       MaxRetentionSec="1year"
       '';
-    networking = {
-      firewall = {
-        enable = true;
-        allowedTCPPorts = [ 22 ];
-      };
-    };
+    networking.firewall.enable = true;
 
     deployment = {
       targetEnv = "hetzner";
@@ -84,30 +80,6 @@
       pkgs.vim
     ];
 
-    services.openssh.extraConfig = ''
-      AuthorizedKeysCommand     /etc/ssh/ldap_authorized_keys
-      AuthorizedKeysCommandUser nobody
-      '';
-
-    environment.etc."ssh/ldap_authorized_keys" = let
-      ldap_authorized_keys =
-        wrap {
-          name = "ldap_authorized_keys";
-          file = ./ldap_authorized_keys.sh;
-          vars = {
-            LDAP_PASS = myconfig.env.sshd.ldap.password;
-            GITOLITE_SHELL = "${pkgs.gitolite}/bin/gitolite-shell";
-            ECHO = "${pkgs.coreutils}/bin/echo";
-          };
-          paths = [ pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.gnused pkgs.coreutils ];
-        };
-    in {
-      enable = true;
-      mode = "0755";
-      user = "root";
-      source = ldap_authorized_keys;
-    };
-
     services.cron = {
       enable = true;
       systemCronJobs = [