Fix or reduce overly verbose logs and warnings
- The nginx server names bucket was too small, this has been increased
- Nextcloud had too high of a log level, this has been decreased
- Matrix had a warning due to using the default matrix.org keys. This is
fine so has been ignored
- A special *evaluation* warning for you: we previously used an old
option name, by virtue of some strange behavior in inheriting system
config that I do not fully understand. Regardless, we can fix this by
filtering out the dead option name
Change-Id: I97c517073fb76caed1d000290fd1fad15000057f
Reviewed-on: https://git.clicks.codes/c/Clicks/NixFiles/+/189
Tested-by: Skyler Grey <minion@clicks.codes>
Reviewed-by: Samuel Shuert <coded@clicks.codes>
diff --git a/modules/common/matrix.nix b/modules/common/matrix.nix
index 015c3f4..b871900 100644
--- a/modules/common/matrix.nix
+++ b/modules/common/matrix.nix
@@ -10,6 +10,7 @@
settings = rec {
server_name = "clicks.codes";
auto_join_rooms = [ "#general:${server_name}" ];
+ suppress_key_server_warning = true;
enable_registration = true;
registration_requires_token = true;
allow_public_rooms_over_federation = true;
diff --git a/modules/common/nextcloud.nix b/modules/common/nextcloud.nix
index 29fc69a..84cf659 100644
--- a/modules/common/nextcloud.nix
+++ b/modules/common/nextcloud.nix
@@ -38,14 +38,12 @@
services.nextcloud.config = {
dbtype = "pgsql";
- dbport = config.services.postgresql.port;
- dbpassFile = config.sops.secrets.clicks_nextcloud_db_password.path;
- dbname = "nextcloud";
- dbhost = "localhost";
+ dbhost = "/run/postgresql";
extraTrustedDomains = [ "cloud.clicks.codes" "docs.clicks.codes" ];
};
services.nextcloud.extraOptions = {
+ loglevel = 3;
social_login_auto_redirect = true;
default_phone_region = "US";
"overwrite.cli.url" = "https://nextcloud.clicks.codes";
diff --git a/modules/common/nginx.nix b/modules/common/nginx.nix
index c34be24..5bc99ad 100644
--- a/modules/common/nginx.nix
+++ b/modules/common/nginx.nix
@@ -143,6 +143,8 @@
enable = true;
enableReload = true;
+ serverNamesHashMaxSize = 4096;
+
virtualHosts = lib.recursiveUpdate (helpers.nginx.Merge
config.clicks.nginx.services) # clicks.nginx.services
(lib.pipe config.clicks.nginx.serviceAliases [
@@ -191,7 +193,7 @@
};
} (if base != null then {
config.security.acme.certs = lib.mkForce (builtins.mapAttrs (_: v:
- (lib.filterAttrs (n: _: n != "directory") v) // {
+ (lib.filterAttrs (n: _: n != "directory" && n != "credentialsFile") v) // {
webroot = null;
dnsProvider = "cloudflare";
}) base.config.security.acme.certs);