diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-03-25 11:57:48 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-03 16:25:07 +0200 |
commit | 5400b9b6f65451d41a9106fae6fc00f97d83f4ef (patch) | |
tree | 6ed072da7b1f17ac3994ffea052aa0c0822f8446 /modules/private/websites/default.nix | |
parent | 441da8aac378f401625e82caf281fa0e26128310 (diff) | |
download | Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.gz Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.zst Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.zip |
Upgrade nixos
Diffstat (limited to 'modules/private/websites/default.nix')
-rw-r--r-- | modules/private/websites/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix index 5c0e655..529ec5c 100644 --- a/modules/private/websites/default.nix +++ b/modules/private/websites/default.nix | |||
@@ -87,9 +87,9 @@ in | |||
87 | #openssl = self.openssl_1_1; | 87 | #openssl = self.openssl_1_1; |
88 | php = php72; | 88 | php = php72; |
89 | php72 = (super.php72.override { | 89 | php72 = (super.php72.override { |
90 | mysql.connector-c = self.mariadb; | 90 | config.php.mysqlnd = true; |
91 | config.php.mysqlnd = false; | ||
92 | config.php.mysqli = false; | 91 | config.php.mysqli = false; |
92 | config.php.mhash = true; # Is it needed? | ||
93 | }).overrideAttrs(old: rec { | 93 | }).overrideAttrs(old: rec { |
94 | # Didn't manage to build with mysqli + mysql_config connector | 94 | # Didn't manage to build with mysqli + mysql_config connector |
95 | configureFlags = old.configureFlags ++ [ | 95 | configureFlags = old.configureFlags ++ [ |
@@ -140,9 +140,9 @@ in | |||
140 | ; 30 days (minutes) | 140 | ; 30 days (minutes) |
141 | session.cache_expire = 43200 | 141 | session.cache_expire = 43200 |
142 | ''; | 142 | ''; |
143 | extraConfig = '' | 143 | settings = { |
144 | log_level = notice | 144 | log_level = "notice"; |
145 | ''; | 145 | }; |
146 | }; | 146 | }; |
147 | 147 | ||
148 | services.filesWatcher.httpdProd.paths = [ "/var/secrets/apache-ldap" ]; | 148 | services.filesWatcher.httpdProd.paths = [ "/var/secrets/apache-ldap" ]; |