diff options
author | Ryan Lahfa <masterancpp@gmail.com> | 2023-05-15 09:28:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-15 09:28:15 +0200 |
commit | fa06a3b646bd874366761de2f0e51ec81b01b33d (patch) | |
tree | 0c968c8f6c703bbc608cf9339925383183a0b7cf /nixos/tests | |
parent | 25f3323d60271ac9b668757322c47f96aa7ca726 (diff) | |
parent | f9f76529cd9682bee8a3a805cb4c8f7e0f8e7af4 (diff) |
Merge pull request #230888 from Misterio77/nextcloud-createlocally-optin
nixos/nextcloud: default createLocally to false
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/nextcloud/basic.nix | 1 | ||||
-rw-r--r-- | nixos/tests/nextcloud/openssl-sse.nix | 1 | ||||
-rw-r--r-- | nixos/tests/nextcloud/with-mysql-and-memcached.nix | 1 | ||||
-rw-r--r-- | nixos/tests/nextcloud/with-postgresql-and-redis.nix | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index a475049e7b264..e17f701c54b7d 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -43,6 +43,7 @@ in { enable = true; datadir = "/var/lib/nextcloud-data"; hostName = "nextcloud"; + database.createLocally = true; config = { # Don't inherit adminuser since "root" is supposed to be the default adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! diff --git a/nixos/tests/nextcloud/openssl-sse.nix b/nixos/tests/nextcloud/openssl-sse.nix index 871947e1d2b20..e1f2706a7348b 100644 --- a/nixos/tests/nextcloud/openssl-sse.nix +++ b/nixos/tests/nextcloud/openssl-sse.nix @@ -9,6 +9,7 @@ args@{ pkgs, nextcloudVersion ? 25, ... }: services.nextcloud = { enable = true; config.adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; + database.createLocally = true; package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; }; }; diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index f673e5e75d3ba..e57aabfaf86b5 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -26,6 +26,7 @@ in { redis = false; memcached = true; }; + database.createLocally = true; config = { dbtype = "mysql"; # Don't inherit adminuser since "root" is supposed to be the default diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 43892d39e9f0c..1cbb131042876 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -25,6 +25,7 @@ in { redis = true; memcached = false; }; + database.createLocally = true; config = { dbtype = "pgsql"; inherit adminuser; |