services/nextcloud: apply suggestions

nixos/modules/services/web-apps/nextcloud.nix

@@ -555,7 +555,7 @@ in {
       description = ''
         Extra options which should be appended to nextcloud's config.php file.
       '';
-      example = literalExample '' {
+      example = literalExpression '' {
         redis = {
           host = "/run/redis/redis.sock";
           port = 0;
@@ -575,7 +575,7 @@ in {
         <programlisting>{"redis":{"password":"secret"}}</programlisting>.
       '';
     };
-    
+
     nginx = {
       recommendedHttpHeaders = mkOption {
         type = types.bool;

nixos/tests/nextcloud/default.nix

@@ -16,11 +16,7 @@ foldl
       inherit system pkgs;
       nextcloudVersion = ver;
     };
-    "with-declarative-redis${toString ver}" = import ./with-declarative-redis.nix {
-      inherit system pkgs;
-      nextcloudVersion = ver;
-    };
-    "with-secrets${toString ver}" = import ./with-secrets.nix {
+    "with-declarative-redis-and-secrets${toString ver}" = import ./with-declarative-redis-and-secrets.nix {
       inherit system pkgs;
       nextcloudVersion = ver;
     };

nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix

@@ -32,13 +32,14 @@ in {
             ${adminpass}
           '');
         };
+        secretFile = "/etc/nextcloud-secrets.json";
 
         extraOptions.redis = {
           host = "/run/redis/redis.sock";
           port = 0;
           dbindex = 0;
-          password = "secret";
           timeout = 1.5;
+          # password handled via secretfile below
         };
         extraOptions.memcache = {
           local = "\OC\Memcache\Redis";
@@ -66,6 +67,17 @@ in {
           }
         ];
       };
+
+      # This file is meant to contain secret options which should
+      # not go into the nix store. Here it is just used to set the
+      # databyse type to postgres.
+      environment.etc."nextcloud-secrets.json".text = ''
+        {
+          "redis": {
+            "password": "secret"
+          }
+        }
+      '';
     };
   };
 

nixos/tests/nextcloud/with-secrets.nix

@@ -1,113 +0,0 @@
-import ../make-test-python.nix ({ pkgs, ...}: let
-  adminpass = "hunter2";
-  adminuser = "custom-admin-username";
-in {
-  name = "nextcloud-with-secrets-file";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ eqyiel ];
-  };
-
-  nodes = {
-    # The only thing the client needs to do is download a file.
-    client = { ... }: {};
-
-    nextcloud = { config, pkgs, ... }: {
-      networking.firewall.allowedTCPPorts = [ 80 ];
-
-      services.nextcloud = {
-        enable = true;
-        hostName = "nextcloud";
-        caching = {
-          apcu = false;
-          memcached = false;
-        };
-        config = {
-          dbtype = "pgsql";
-          dbname = "nextcloud";
-          dbuser = "nextcloud";
-          dbhost = "/run/postgresql";
-          inherit adminuser;
-          adminpassFile = toString (pkgs.writeText "admin-pass-file" ''
-            ${adminpass}
-          '');
-        };
-        secretFile = "/etc/nextcloud-secrets.json";
-      };
-
-      systemd.services.nextcloud-setup= {
-        requires = ["postgresql.service"];
-        after = [
-          "postgresql.service"
-        ];
-      };
-
-      services.redis = {
-        enable = true;
-      };
-
-      services.postgresql = {
-        enable = true;
-        ensureDatabases = [ "nextcloud" ];
-        ensureUsers = [
-          { name = "nextcloud";
-            ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
-          }
-        ];
-      };
-
-      # This file is meant to contain secret options which should
-      # not go into the nix store. Here it is just used to set the
-      # databyse type to postgres.
-      environment.etc."nextcloud-secrets.json".text = ''
-        {
-          "redis": {
-            "host": "/run/redis/redis.sock",
-            "port": 0,
-            "dbindex": 0,
-            "password": "secret",
-            "timeout": 1.5
-          },
-          "memcache": {
-            "local": "\\OC\\Memcache\\Redis",
-            "locking": "\\OC\\Memcache\\Redis"
-          }
-        }
-      '';
-    };
-  };
-
-  testScript = let
-    withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
-      #!${pkgs.runtimeShell}
-      export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
-      export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"
-      export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
-      export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
-      export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
-      "''${@}"
-    '';
-    copySharedFile = pkgs.writeScript "copy-shared-file" ''
-      #!${pkgs.runtimeShell}
-      echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file
-    '';
-
-    diffSharedFile = pkgs.writeScript "diff-shared-file" ''
-      #!${pkgs.runtimeShell}
-      diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
-    '';
-  in ''
-    start_all()
-    nextcloud.wait_for_unit("multi-user.target")
-    nextcloud.succeed("curl -sSf http://nextcloud/login")
-    nextcloud.succeed(
-        "${withRcloneEnv} ${copySharedFile}"
-    )
-    client.wait_for_unit("multi-user.target")
-    client.succeed(
-        "${withRcloneEnv} ${diffSharedFile}"
-    )
-
-    # redis cache should not be empty
-    nextcloud.fail("redis-cli KEYS * | grep -q 'empty array'")
-  '';
-})