diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-22 20:55:28 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-22 20:55:28 +0200 |
commit | 8d213e2b1c934f6861f76aad5eb7c11097fa97de (patch) | |
tree | 23f8a2d5692deaeffffa1ab5f098b2d24b9e2217 /nixops/eldiron.nix | |
parent | a1a8649a2be768685eb04c246c114fce36b8096f (diff) | |
download | Nix-8d213e2b1c934f6861f76aad5eb7c11097fa97de.tar.gz Nix-8d213e2b1c934f6861f76aad5eb7c11097fa97de.tar.zst Nix-8d213e2b1c934f6861f76aad5eb7c11097fa97de.zip |
Move rest of the modules outside of nixops
Diffstat (limited to 'nixops/eldiron.nix')
-rw-r--r-- | nixops/eldiron.nix | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix index 69231d1..51af1f6 100644 --- a/nixops/eldiron.nix +++ b/nixops/eldiron.nix | |||
@@ -7,17 +7,8 @@ | |||
7 | 7 | ||
8 | eldiron = { config, pkgs, myconfig, ... }: | 8 | eldiron = { config, pkgs, myconfig, ... }: |
9 | { | 9 | { |
10 | nixpkgs.overlays = builtins.attrValues (import ../overlays); | ||
11 | _module.args = { | ||
12 | pkgsNext = import <nixpkgsNext> {}; | ||
13 | pkgsPrevious = import <nixpkgsPrevious> {}; | ||
14 | myconfig = { | ||
15 | inherit privateFiles; | ||
16 | env = import "${privateFiles}/environment.nix"; | ||
17 | }; | ||
18 | }; | ||
19 | |||
20 | boot.kernelPackages = pkgs.linuxPackages_latest; | 10 | boot.kernelPackages = pkgs.linuxPackages_latest; |
11 | _module.args.privateFiles = privateFiles; | ||
21 | 12 | ||
22 | networking = { | 13 | networking = { |
23 | firewall.enable = true; | 14 | firewall.enable = true; |
@@ -30,30 +21,15 @@ | |||
30 | myconfig.env.servers.eldiron.ips); | 21 | myconfig.env.servers.eldiron.ips); |
31 | }; | 22 | }; |
32 | 23 | ||
33 | imports = [ | 24 | imports = builtins.attrValues (import ../modules); |
34 | ./modules/ssh | 25 | |
35 | ./modules/certificates.nix | 26 | myServices.buildbot.enable = true; |
36 | ./modules/gitolite | ||
37 | ./modules/mpd.nix | ||
38 | ./modules/mail.nix | ||
39 | ./modules/ftp.nix | ||
40 | ./modules/pub | ||
41 | ./modules/task | ||
42 | ./modules/buildbot | ||
43 | ./modules/dns.nix | ||
44 | ] ++ (builtins.attrValues (import ../modules)); | ||
45 | myServices.databases.enable = true; | 27 | myServices.databases.enable = true; |
28 | myServices.gitolite.enable = true; | ||
46 | myServices.irc.enable = true; | 29 | myServices.irc.enable = true; |
47 | services.myGitolite.enable = true; | 30 | myServices.pub.enable = true; |
31 | myServices.tasks.enable = true; | ||
48 | services.pure-ftpd.enable = true; | 32 | services.pure-ftpd.enable = true; |
49 | services.pub.enable = true; | ||
50 | services.myTasks.enable = true; | ||
51 | services.buildbot.enable = true; | ||
52 | |||
53 | services.journald.extraConfig = '' | ||
54 | MaxLevelStore="warning" | ||
55 | MaxRetentionSec="1year" | ||
56 | ''; | ||
57 | 33 | ||
58 | deployment = { | 34 | deployment = { |
59 | targetEnv = "hetzner"; | 35 | targetEnv = "hetzner"; |
@@ -75,16 +51,6 @@ | |||
75 | }; | 51 | }; |
76 | }; | 52 | }; |
77 | 53 | ||
78 | users.users.root.packages = [ | ||
79 | pkgs.telnet | ||
80 | pkgs.htop | ||
81 | pkgs.iftop | ||
82 | ]; | ||
83 | |||
84 | environment.systemPackages = [ | ||
85 | pkgs.vim | ||
86 | ]; | ||
87 | |||
88 | services.cron = { | 54 | services.cron = { |
89 | enable = true; | 55 | enable = true; |
90 | systemCronJobs = [ | 56 | systemCronJobs = [ |