Unverified Commit 1b623f27 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #245357 from onny/nextcloud-fix-test 

nixos/tests/nextcloud: Fix tests, fix broken webdav url
parents 1da4ff55 b0ba7d24

nixos/tests/nextcloud/basic.nix

+3 −3
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ in { 
    client = { ... }: {

      services.davfs2.enable = true;

      system.activationScripts.davfs2-secrets = ''

        echo "http://nextcloud/remote.php/webdav/ ${adminuser} ${adminpass}" > /tmp/davfs2-secrets

        echo "http://nextcloud/remote.php/dav/files/${adminuser} ${adminuser} ${adminpass}" > /tmp/davfs2-secrets

        chmod 600 /tmp/davfs2-secrets

      '';

      virtualisation.fileSystems = {

        "/mnt/dav" = {

          device = "http://nextcloud/remote.php/webdav/";

          device = "http://nextcloud/remote.php/dav/files/${adminuser}";

          fsType = "davfs";

          options = let

            davfs2Conf = (pkgs.writeText "davfs2.conf" "secrets /tmp/davfs2-secrets");
@@ -70,7 +70,7 @@ in { 
    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_URL="http://nextcloud/remote.php/dav/files/${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

      export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"

nixos/tests/nextcloud/openssl-sse.nix

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ in { 
    withRcloneEnv = host: pkgs.writeScript "with-rclone-env" ''

      #!${pkgs.runtimeShell}

      export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav

      export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/webdav/"

      export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/dav/files/${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

      export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"

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

+7 −7
Original line number Diff line number Diff line 
args@{ nextcloudVersion ? 27, ... }:

(import ../make-test-python.nix ({ pkgs, ...}: let

  username = "custom_admin_username";

  adminuser = "custom_admin_username";

  # This will be used both for redis and postgresql

  pass = "hunter2";

  # Don't do this at home, use a file outside of the nix store instead
@@ -34,9 +34,9 @@ in { 
        config = {

          dbtype = "pgsql";

          dbname = "nextcloud";

          dbuser = username;

          dbuser = adminuser;

          dbpassFile = passFile;

          adminuser = username;

          adminuser = adminuser;

          adminpassFile = passFile;

        };

        secretFile = "/etc/nextcloud-secrets.json";
@@ -66,9 +66,9 @@ in { 
      systemd.services.postgresql.postStart = pkgs.lib.mkAfter ''

        password=$(cat ${passFile})

        ${config.services.postgresql.package}/bin/psql <<EOF

          CREATE ROLE ${username} WITH LOGIN PASSWORD '$password' CREATEDB;

          CREATE ROLE ${adminuser} WITH LOGIN PASSWORD '$password' CREATEDB;

          CREATE DATABASE nextcloud;

          GRANT ALL PRIVILEGES ON DATABASE nextcloud TO ${username};

          GRANT ALL PRIVILEGES ON DATABASE nextcloud TO ${adminuser};

        EOF

      '';
@@ -89,9 +89,9 @@ in { 
    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_URL="http://nextcloud/remote.php/dav/files/${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

      export RCLONE_CONFIG_NEXTCLOUD_USER="${username}"

      export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${pass})"

      "''${@}"

    '';

nixos/tests/nextcloud/with-mysql-and-memcached.nix

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ in { 
    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_URL="http://nextcloud/remote.php/dav/files/${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

      export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"

nixos/tests/nextcloud/with-postgresql-and-redis.nix

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ in { 
    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_URL="http://nextcloud/remote.php/dav/files/${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

      export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

      export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"