aboutsummaryrefslogtreecommitdiff
path: root/modules/private
diff options
context:
space:
mode:
Diffstat (limited to 'modules/private')
-rw-r--r--modules/private/mail/dovecot.nix12
-rw-r--r--modules/private/system.nix2
-rw-r--r--modules/private/system/dilion.nix2
-rw-r--r--modules/private/websites/isabelle/aten_app/default.nix14
-rw-r--r--modules/private/websites/leila/production.nix2
-rw-r--r--modules/private/websites/tools/cloud/default.nix2
-rw-r--r--modules/private/websites/tools/mail/default.nix2
-rw-r--r--modules/private/websites/tools/tools/adminer.nix4
-rw-r--r--modules/private/websites/tools/tools/default.nix6
9 files changed, 25 insertions, 21 deletions
diff --git a/modules/private/mail/dovecot.nix b/modules/private/mail/dovecot.nix
index 0304b89..aa25d1f 100644
--- a/modules/private/mail/dovecot.nix
+++ b/modules/private/mail/dovecot.nix
@@ -69,12 +69,12 @@ in
69 mailUser = "vhost"; 69 mailUser = "vhost";
70 mailGroup = "vhost"; 70 mailGroup = "vhost";
71 createMailUser = false; 71 createMailUser = false;
72 mailboxes = [ 72 mailboxes = {
73 { name = "Trash"; auto = "subscribe"; specialUse = "Trash"; } 73 Trash = { auto = "subscribe"; specialUse = "Trash"; };
74 { name = "Junk"; auto = "subscribe"; specialUse = "Junk"; } 74 Junk = { auto = "subscribe"; specialUse = "Junk"; };
75 { name = "Sent"; auto = "subscribe"; specialUse = "Sent"; } 75 Sent = { auto = "subscribe"; specialUse = "Sent"; };
76 { name = "Drafts"; auto = "subscribe"; specialUse = "Drafts"; } 76 Drafts = { auto = "subscribe"; specialUse = "Drafts"; };
77 ]; 77 };
78 mailLocation = "mbox:~/Mail:INBOX=~/Mail/Inbox:INDEX=~/.imap"; 78 mailLocation = "mbox:~/Mail:INBOX=~/Mail/Inbox:INDEX=~/.imap";
79 sslServerCert = "/var/lib/acme/mail/fullchain.pem"; 79 sslServerCert = "/var/lib/acme/mail/fullchain.pem";
80 sslServerKey = "/var/lib/acme/mail/key.pem"; 80 sslServerKey = "/var/lib/acme/mail/key.pem";
diff --git a/modules/private/system.nix b/modules/private/system.nix
index 0ab4a81..bca6e19 100644
--- a/modules/private/system.nix
+++ b/modules/private/system.nix
@@ -54,7 +54,7 @@
54 pkgs.tcpdump 54 pkgs.tcpdump
55 pkgs.tshark 55 pkgs.tshark
56 pkgs.tcpflow 56 pkgs.tcpflow
57 pkgs.mitmproxy 57 # pkgs.mitmproxy # failing
58 pkgs.nmap 58 pkgs.nmap
59 pkgs.p0f 59 pkgs.p0f
60 pkgs.socat 60 pkgs.socat
diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix
index a0d56cc..ca9a052 100644
--- a/modules/private/system/dilion.nix
+++ b/modules/private/system/dilion.nix
@@ -42,7 +42,7 @@
42 }; 42 };
43 43
44 system.nssModules = [ pkgs.libvirt ]; 44 system.nssModules = [ pkgs.libvirt ];
45 system.nssHosts = lib.mkForce [ "files" "libvirt_guest" "mymachines" "dns" "myhostname" ]; 45 system.nssDatabases.hosts = lib.mkForce [ "files" "libvirt_guest" "mymachines" "dns" "myhostname" ];
46 programs.zsh.enable = true; 46 programs.zsh.enable = true;
47 47
48 users.users.backup = { 48 users.users.backup = {
diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix
index 30d10ba..f967b9a 100644
--- a/modules/private/websites/isabelle/aten_app/default.nix
+++ b/modules/private/websites/isabelle/aten_app/default.nix
@@ -1,12 +1,16 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/aten_${environment}" 2, varDir ? "/var/lib/aten_${environment}"
3, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }: 3, composerEnv, fetchgit, runCommand, nodejs-10_x, jq, libsass, python, fetchurl, yarn2nix-moretea, yarn, sources }:
4let 4let
5 yarn2nix-moretea' = yarn2nix-moretea.override({
6 yarn = yarn.override({ nodejs = nodejs-10_x; });
7 nodejs = nodejs-10_x;
8 });
5 packagesource = sources.websites-isabelle-aten; 9 packagesource = sources.websites-isabelle-aten;
6 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 10 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
7 cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out 11 cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out
8 ''; 12 '';
9 yarnModules = yarn2nix-moretea.mkYarnModules rec { 13 yarnModules = yarn2nix-moretea'.mkYarnModules rec {
10 name = "aten-yarn"; 14 name = "aten-yarn";
11 pname = name; 15 pname = name;
12 version = "v1.0.0"; 16 version = "v1.0.0";
@@ -18,8 +22,8 @@ let
18 buildInputs = [ libsass python ]; 22 buildInputs = [ libsass python ];
19 postInstall = let 23 postInstall = let
20 nodeHeaders = fetchurl { 24 nodeHeaders = fetchurl {
21 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; 25 url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz";
22 sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; 26 sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c";
23 }; 27 };
24 in 28 in
25 '' 29 ''
@@ -46,7 +50,7 @@ let
46 rm -rf var/{log,cache} 50 rm -rf var/{log,cache}
47 ln -sf ${varDir}/{log,cache} var/ 51 ln -sf ${varDir}/{log,cache} var/
48 ''; 52 '';
49 buildInputs = [ yarnModules yarn2nix-moretea.yarn ]; 53 buildInputs = [ yarnModules yarn2nix-moretea'.yarn ];
50 passthru = { 54 passthru = {
51 inherit varDir; 55 inherit varDir;
52 inherit environment; 56 inherit environment;
diff --git a/modules/private/websites/leila/production.nix b/modules/private/websites/leila/production.nix
index 0ae7893..8385bc7 100644
--- a/modules/private/websites/leila/production.nix
+++ b/modules/private/websites/leila/production.nix
@@ -25,7 +25,7 @@ in {
25 phpOptions = config.services.phpfpm.phpOptions + '' 25 phpOptions = config.services.phpfpm.phpOptions + ''
26 disable_functions = "mail" 26 disable_functions = "mail"
27 ''; 27 '';
28 phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.imagick ]); 28 phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [ all.imagick ]);
29 phpEnv = { 29 phpEnv = {
30 PATH = lib.makeBinPath [ pkgs.imagemagick ]; 30 PATH = lib.makeBinPath [ pkgs.imagemagick ];
31 }; 31 };
diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix
index e6f8ecb..50ed528 100644
--- a/modules/private/websites/tools/cloud/default.nix
+++ b/modules/private/websites/tools/cloud/default.nix
@@ -171,7 +171,7 @@ in {
171 user = "wwwrun"; 171 user = "wwwrun";
172 group = "wwwrun"; 172 group = "wwwrun";
173 settings = phpFpm.pool; 173 settings = phpFpm.pool;
174 phpPackage = pkgs.php74.withExtensions(e: pkgs.php74.enabledExtensions ++ [ e.redis e.apcu e.opcache ]); 174 phpPackage = pkgs.php74.withExtensions({ enabled, all }: enabled ++ [ all.redis all.apcu all.opcache ]);
175 }; 175 };
176 176
177 services.cron = { 177 services.cron = {
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index 7c60ae4..4636a6c 100644
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -65,7 +65,7 @@ in
65 phpOptions = config.services.phpfpm.phpOptions + '' 65 phpOptions = config.services.phpfpm.phpOptions + ''
66 date.timezone = 'CET' 66 date.timezone = 'CET'
67 ''; 67 '';
68 phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.imagick ]); 68 phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [ all.imagick ]);
69 }; 69 };
70 services.phpfpm.pools.rainloop = { 70 services.phpfpm.pools.rainloop = {
71 user = "wwwrun"; 71 user = "wwwrun";
diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix
index af03550..a4ba344 100644
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -1,4 +1,4 @@
1{ adminer, php74, php74base, myPhpPackages, lib, forcePhpSocket ? null }: 1{ adminer, php74, myPhpPackages, lib, forcePhpSocket ? null }:
2rec { 2rec {
3 activationScript = { 3 activationScript = {
4 deps = [ "httpd" ]; 4 deps = [ "httpd" ];
@@ -10,7 +10,7 @@ rec {
10 phpFpm = rec { 10 phpFpm = rec {
11 user = apache.user; 11 user = apache.user;
12 group = apache.group; 12 group = apache.group;
13 phpPackage = php74base.withExtensions (e: (lib.remove e.mysqli php74.enabledExtensions) ++ [myPhpPackages.mysqli_pam]); 13 phpPackage = php74.withExtensions ({ enabled, all }: (lib.remove all.mysqli enabled) ++ [myPhpPackages.mysqli_pam]);
14 settings = { 14 settings = {
15 "listen.owner" = apache.user; 15 "listen.owner" = apache.user;
16 "listen.group" = apache.group; 16 "listen.group" = apache.group;
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 93d1122..1e30eed 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -17,7 +17,7 @@ let
17 wallabag = pkgs.callPackage ./wallabag.nix { 17 wallabag = pkgs.callPackage ./wallabag.nix {
18 wallabag = pkgs.webapps.wallabag.override { 18 wallabag = pkgs.webapps.wallabag.override {
19 composerEnv = pkgs.composerEnv.override { 19 composerEnv = pkgs.composerEnv.override {
20 php = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]); 20 php = pkgs.php73.withExtensions({ enabled, all }: enabled ++ [all.tidy]);
21 }; 21 };
22 }; 22 };
23 env = config.myEnv.tools.wallabag; 23 env = config.myEnv.tools.wallabag;
@@ -324,7 +324,7 @@ in {
324 324
325 "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"; 325 "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp";
326 }; 326 };
327 phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [e.mysqli e.redis e.apcu e.opcache ]); 327 phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [all.mysqli all.redis all.apcu all.opcache ]);
328 }; 328 };
329 adminer = adminer.phpFpm; 329 adminer = adminer.phpFpm;
330 ttrss = { 330 ttrss = {
@@ -337,7 +337,7 @@ in {
337 user = "wwwrun"; 337 user = "wwwrun";
338 group = "wwwrun"; 338 group = "wwwrun";
339 settings = wallabag.phpFpm.pool; 339 settings = wallabag.phpFpm.pool;
340 phpPackage = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]); 340 phpPackage = pkgs.php73.withExtensions({ enabled, all }: enabled ++ [all.tidy]);
341 }; 341 };
342 yourls = { 342 yourls = {
343 user = "wwwrun"; 343 user = "wwwrun";