diff options
Diffstat (limited to 'virtual/eldiron.nix')
-rw-r--r-- | virtual/eldiron.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index 48266c8..337ea2f 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix | |||
@@ -10,6 +10,7 @@ | |||
10 | _module.args = { | 10 | _module.args = { |
11 | mylibs = import ../libs.nix; | 11 | mylibs = import ../libs.nix; |
12 | myconfig = { | 12 | myconfig = { |
13 | env = import ./environment.nix; | ||
13 | ips = { | 14 | ips = { |
14 | main = "176.9.151.89"; | 15 | main = "176.9.151.89"; |
15 | production = "176.9.151.154"; | 16 | production = "176.9.151.154"; |
@@ -40,8 +41,8 @@ | |||
40 | deployment = { | 41 | deployment = { |
41 | targetEnv = "hetzner"; | 42 | targetEnv = "hetzner"; |
42 | hetzner = { | 43 | hetzner = { |
43 | #robotUser = "defined in HETZNER_ROBOT_USER"; | 44 | robotUser = myconfig.env.hetzner.user; |
44 | #robotPass = "defined in HETZNER_ROBOT_PASS"; | 45 | robotPass = myconfig.env.hetzner.pass; |
45 | mainIPv4 = myconfig.ips.main; | 46 | mainIPv4 = myconfig.ips.main; |
46 | partitions = '' | 47 | partitions = '' |
47 | clearpart --all --initlabel --drives=sda,sdb | 48 | clearpart --all --initlabel --drives=sda,sdb |
@@ -70,12 +71,11 @@ | |||
70 | 71 | ||
71 | environment.etc."ssh/ldap_authorized_keys" = let | 72 | environment.etc."ssh/ldap_authorized_keys" = let |
72 | ldap_authorized_keys = | 73 | ldap_authorized_keys = |
73 | assert checkEnv "NIXOPS_SSHD_LDAP_PASSWORD"; | ||
74 | wrap { | 74 | wrap { |
75 | name = "ldap_authorized_keys"; | 75 | name = "ldap_authorized_keys"; |
76 | file = ./ldap_authorized_keys.sh; | 76 | file = ./ldap_authorized_keys.sh; |
77 | vars = { | 77 | vars = { |
78 | LDAP_PASS = builtins.getEnv "NIXOPS_SSHD_LDAP_PASSWORD"; | 78 | LDAP_PASS = myconfig.env.sshd.ldap.password; |
79 | GITOLITE_SHELL = "${pkgs.gitolite}/bin/gitolite-shell"; | 79 | GITOLITE_SHELL = "${pkgs.gitolite}/bin/gitolite-shell"; |
80 | ECHO = "${pkgs.coreutils}/bin/echo"; | 80 | ECHO = "${pkgs.coreutils}/bin/echo"; |
81 | }; | 81 | }; |