commit b0ba7d2406ef905c47656c0053e8c0453cab5397 · pyrox.dev/nixpkgs

+3 -3

nixos/tests/nextcloud/basic.nix

···

       14
       14
        
           client = { ... }: {

     

       15
       15
        
             services.davfs2.enable = true;

     

       16
       16
        
             system.activationScripts.davfs2-secrets = ''

     

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

     

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

     

       18
       18
        
               chmod 600 /tmp/davfs2-secrets

     

       19
       19
        
             '';

     

       20
       20
        
             virtualisation.fileSystems = {

     

       21
       21
        
               "/mnt/dav" = {

     

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

     

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

     

       23
       23
        
                 fsType = "davfs";

     

       24
       24
        
                 options = let

     

       25
       25
        
                   davfs2Conf = (pkgs.writeText "davfs2.conf" "secrets /tmp/davfs2-secrets");

     
···

       70
       70
        
           withRcloneEnv = pkgs.writeScript "with-rclone-env" ''

     

       71
       71
        
             #!${pkgs.runtimeShell}

     

       72
       72
        
             export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav

     

       73
       73
       -
             export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"

     

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

     

       74
       74
        
             export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

     

       75
       75
        
             export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

     

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

+1 -1

nixos/tests/nextcloud/openssl-sse.nix

···

       33
       33
        
           withRcloneEnv = host: pkgs.writeScript "with-rclone-env" ''

     

       34
       34
        
             #!${pkgs.runtimeShell}

     

       35
       35
        
             export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav

     

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

     

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

     

       37
       37
        
             export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

     

       38
       38
        
             export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

     

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

+7 -7

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

···

       1
       1
        
       args@{ nextcloudVersion ? 27, ... }:

     

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

     

       3
       3
       -
         username = "custom_admin_username";

     

       3
       3
       +
         adminuser = "custom_admin_username";

     

       4
       4
        
         # This will be used both for redis and postgresql

     

       5
       5
        
         pass = "hunter2";

     

       6
       6
        
         # Don't do this at home, use a file outside of the nix store instead

     
···

       34
       34
        
               config = {

     

       35
       35
        
                 dbtype = "pgsql";

     

       36
       36
        
                 dbname = "nextcloud";

     

       37
       37
       -
                 dbuser = username;

     

       37
       37
       +
                 dbuser = adminuser;

     

       38
       38
        
                 dbpassFile = passFile;

     

       39
       39
       -
                 adminuser = username;

     

       39
       39
       +
                 adminuser = adminuser;

     

       40
       40
        
                 adminpassFile = passFile;

     

       41
       41
        
               };

     

       42
       42
        
               secretFile = "/etc/nextcloud-secrets.json";

     
···

       66
       66
        
             systemd.services.postgresql.postStart = pkgs.lib.mkAfter ''

     

       67
       67
        
               password=$(cat ${passFile})

     

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

     

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

     

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

     

       70
       70
        
                 CREATE DATABASE nextcloud;

     

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

     

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

     

       72
       72
        
               EOF

     

       73
       73
        
             '';

     

       74
       74
        
       

     
···

       89
       89
        
           withRcloneEnv = pkgs.writeScript "with-rclone-env" ''

     

       90
       90
        
             #!${pkgs.runtimeShell}

     

       91
       91
        
             export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav

     

       92
       92
       -
             export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"

     

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

     

       93
       93
        
             export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

     

       94
       94
       -
             export RCLONE_CONFIG_NEXTCLOUD_USER="${username}"

     

       94
       94
       +
             export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

     

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

     

       96
       96
        
             "''${@}"

     

       97
       97
        
           '';

+1 -1

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

···

       49
       49
        
           withRcloneEnv = pkgs.writeScript "with-rclone-env" ''

     

       50
       50
        
             #!${pkgs.runtimeShell}

     

       51
       51
        
             export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav

     

       52
       52
       -
             export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"

     

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

     

       53
       53
        
             export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

     

       54
       54
        
             export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

     

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

+1 -1

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

···

       60
       60
        
           withRcloneEnv = pkgs.writeScript "with-rclone-env" ''

     

       61
       61
        
             #!${pkgs.runtimeShell}

     

       62
       62
        
             export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav

     

       63
       63
       -
             export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"

     

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

     

       64
       64
        
             export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"

     

       65
       65
        
             export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"

     

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