nextcloud: fix warnings

pinpox · May 10, 2024 · a222de7 · a222de7
1 parent 0e3570e
commit a222de7
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 50 deletions.
diff --git a/modules/monitoring/prometheus.nix b/modules/monitoring/prometheus.nix
@@ -25,7 +25,7 @@ in
 
     jsonTargets = mkOption {
       type = types.listOf types.str;
-      # default = [ "https://pablo.tools" ];
+      default = [ ];
       example = [ "http://birne.wireguard/restic-ahorn.json" ];
       description = "Targets to probe with the json-exporter";
     };

diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix
@@ -42,6 +42,41 @@ in
     };
 
     services.nextcloud = {
+      caching.apcu = true;
+      caching.redis = true;
+      configureRedis = true;
+
+      phpOptions."opcache.interned_strings_buffer" = "64";
+      # opcache.memory_consumption=256
+      # opcache.interned_strings_buffer=64
+      # opcache.max_accelerated_files=100000
+
+      settings = {
+        maintenance_window_start = "4";
+
+        trusted_proxies = [
+          "192.168.7.1"
+          "94.16.108.229"
+        ];
+
+        trusted_domains = [ "birne.wireguard" ];
+        default_phone_region = "DE";
+
+        enabledPreviewProviders = [
+          "OC\\Preview\\BMP"
+          "OC\\Preview\\GIF"
+          "OC\\Preview\\JPEG"
+          "OC\\Preview\\Krita"
+          "OC\\Preview\\MarkDown"
+          "OC\\Preview\\MP3"
+          "OC\\Preview\\OpenDocument"
+          "OC\\Preview\\PNG"
+          "OC\\Preview\\TXT"
+          "OC\\Preview\\XBitmap"
+          "OC\\Preview\\HEIC"
+          "OC\\Preview\\Movie"
+        ];
+      };
 
       enable = true;
       # Pin Nextcloud major version.
@@ -82,53 +117,29 @@ in
         adminpassFile = "${config.lollypops.secrets.files."nextcloud/admin-pass".path}";
       };
 
-      extraOptions.trusted_proxies = [
-        "192.168.7.1"
-        "94.16.108.229"
-        "birne.wireguard"
-      ];
-      extraOptions.trusted_domains = [ "birne.wireguard" ];
-      extraOptions.default_phone_region = "DE";
-
       nginx.recommendedHttpHeaders = true;
-
-      extraOptions.enabledPreviewProviders = [
-        "OC\\Preview\\BMP"
-        "OC\\Preview\\GIF"
-        "OC\\Preview\\JPEG"
-        "OC\\Preview\\Krita"
-        "OC\\Preview\\MarkDown"
-        "OC\\Preview\\MP3"
-        "OC\\Preview\\OpenDocument"
-        "OC\\Preview\\PNG"
-        "OC\\Preview\\TXT"
-        "OC\\Preview\\XBitmap"
-        "OC\\Preview\\HEIC"
-        "OC\\Preview\\Movie"
-      ];
     };
 
     environment.systemPackages = with pkgs; [
       exiftool
       ffmpeg
     ];
 
-    # redis.servers.nextcloud = {
-    #   enable = true;
-    #   user = "nextcloud";
-    #   port = 0;
-    # };
-
     # To run nginx alongside caddy for nextcloud only
     services.nginx.enable = false;
     # services.nginx.virtualHosts."files.pablo.tools".listen = [{ addr = "0.0.0.0"; port = 8080; }];
 
     # reverse_proxy http://127.0.0.1:8080
     services.caddy.virtualHosts = {
+
       "files.pablo.tools".extraConfig = ''
 
-        redir /.well-known/carddav /remote.php/dav 301
-        redir /.well-known/caldav /remote.php/dav 301
+        header {
+            Strict-Transport-Security max-age=31536000;
+        }
+
+        redir /.well-known/carddav /remote.php/dav/ 301
+        redir /.well-known/caldav /remote.php/dav/ 301
 
         @forbidden {
             path /.htaccess
@@ -151,24 +162,6 @@ in
       '';
     };
 
-    # reverse_proxy 127.0.0.2:9876
-    # services.caddy.virtualHosts."files.pablo.tools".extraConfig = ''
-    #   root * ${pkgs.nextcloud26}
-    #   file_server
-    # '';
-
-    # Reverse proxy
-    # services.nginx.virtualHosts = {
-    #   "files.pablo.tools" = {
-    #     forceSSL = true;
-    #     enableACME = true;
-    #     locations."/" = {
-    #       proxyPass = "http://127.0.0.2:9876";
-    #       proxyWebsockets = true;
-    #     };
-    #   };
-    # };
-
     # Database configuration
     services.postgresql = {
       enable = true;