diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-07 17:30:41 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-07 17:30:41 +0100 |
commit | beeed84712249de60e4856cc387d013a5109c95d (patch) | |
tree | f201e73ccfdce171d3437504ede4d1f7fac1e203 /virtual | |
parent | 6bd6d033ec152e0e0aa60ff48771f46d723c2d7e (diff) | |
download | Nix-beeed84712249de60e4856cc387d013a5109c95d.tar.gz Nix-beeed84712249de60e4856cc387d013a5109c95d.tar.zst Nix-beeed84712249de60e4856cc387d013a5109c95d.zip |
Disable ympd and add some fixmes
Diffstat (limited to 'virtual')
-rw-r--r-- | virtual/eldiron.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index 2e1e68d..96efddc 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix | |||
@@ -94,6 +94,7 @@ | |||
94 | ''; | 94 | ''; |
95 | in [ | 95 | in [ |
96 | pkgs.telnet | 96 | pkgs.telnet |
97 | pkgs.htop | ||
97 | pkgs.vim | 98 | pkgs.vim |
98 | pkgs.goaccess | 99 | pkgs.goaccess |
99 | occ | 100 | occ |
@@ -112,6 +113,7 @@ | |||
112 | postRun = '' | 113 | postRun = '' |
113 | systemctl reload httpd.service | 114 | systemctl reload httpd.service |
114 | ''; | 115 | ''; |
116 | allowKeysForGroup = true; | ||
115 | extraDomains = { | 117 | extraDomains = { |
116 | "db-1.immae.eu" = null; | 118 | "db-1.immae.eu" = null; |
117 | "git.immae.eu" = null; | 119 | "git.immae.eu" = null; |
@@ -220,9 +222,10 @@ | |||
220 | adminPubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXqRbiHw7QoHADNIEuo4nUT9fSOIEBMdJZH0bkQAxXyJFyCM1IMz0pxsHV0wu9tdkkr36bPEUj2aV5bkYLBN6nxcV2Y49X8bjOSCPfx3n6Own1h+NeZVBj4ZByrFmqCbTxUJIZ2bZKcWOFncML39VmWdsVhNjg0X4NBBehqXRIKr2gt3E/ESAxTYJFm0BnU0baciw9cN0bsRGqvFgf5h2P48CIAfwhVcGmPQnnAwabnosYQzRWxR0OygH5Kd8mePh6FheIRIigfXsDO8f/jdxwut8buvNIf3m5EBr3tUbTsvM+eV3M5vKGt7sk8T64DVtepTSdOOWtp+47ktsnHOMh immae@immae.eu"; | 222 | adminPubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXqRbiHw7QoHADNIEuo4nUT9fSOIEBMdJZH0bkQAxXyJFyCM1IMz0pxsHV0wu9tdkkr36bPEUj2aV5bkYLBN6nxcV2Y49X8bjOSCPfx3n6Own1h+NeZVBj4ZByrFmqCbTxUJIZ2bZKcWOFncML39VmWdsVhNjg0X4NBBehqXRIKr2gt3E/ESAxTYJFm0BnU0baciw9cN0bsRGqvFgf5h2P48CIAfwhVcGmPQnnAwabnosYQzRWxR0OygH5Kd8mePh6FheIRIigfXsDO8f/jdxwut8buvNIf3m5EBr3tUbTsvM+eV3M5vKGt7sk8T64DVtepTSdOOWtp+47ktsnHOMh immae@immae.eu"; |
221 | }; | 223 | }; |
222 | 224 | ||
223 | services.ympd = mypkgs.ympd.config // { enable = true; }; | 225 | services.ympd = mypkgs.ympd.config // { enable = false; }; |
224 | 226 | ||
225 | services.phpfpm = { | 227 | services.phpfpm = { |
228 | # FIXME: move session files to separate dirs | ||
226 | # /!\ phppackage is used in nextcloud configuation | 229 | # /!\ phppackage is used in nextcloud configuation |
227 | phpOptions = '' | 230 | phpOptions = '' |
228 | ; For nextcloud | 231 | ; For nextcloud |
@@ -331,6 +334,7 @@ | |||
331 | basePath = "${mypkgs.git.web.varDir}/repositories"; | 334 | basePath = "${mypkgs.git.web.varDir}/repositories"; |
332 | }; | 335 | }; |
333 | 336 | ||
337 | # FIXME: logrotate | ||
334 | services.httpd = let | 338 | services.httpd = let |
335 | withConf = domain: { | 339 | withConf = domain: { |
336 | enableSSL = true; | 340 | enableSSL = true; |
@@ -573,6 +577,7 @@ | |||
573 | ]; | 577 | ]; |
574 | 578 | ||
575 | # FIXME: backup | 579 | # FIXME: backup |
580 | # Nextcloud: 14 | ||
576 | services.redis = rec { | 581 | services.redis = rec { |
577 | enable = true; | 582 | enable = true; |
578 | bind = "127.0.0.1"; | 583 | bind = "127.0.0.1"; |