public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #136067 from NixOS/backport-135946-to-release-21.05

Browse Source 
[Backport release-21.05] nixos/nextcloud: remove invalid `--database-table-prefix` option
This commit is contained in:
Maximilian Bosch 2021-08-29 11:40:17 +02:00 committed by GitHub
commit 7fc63651a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -502,8 +502,6 @@ in {
${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
"--database-pass" = dbpass;
${if c.dbtableprefix != null
then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"'';
"--admin-user" = ''"${c.adminuser}"'';
"--admin-pass" = adminpass;
"--data-dir" = ''"${cfg.home}/data"'';

1
nixos/tests/nextcloud/basic.nix
View File

@ -37,6 +37,7 @@ in {
config = {
# Don't inherit adminuser since "root" is supposed to be the default
inherit adminpass;
dbtableprefix = "nixos_";
};
autoUpdateApps = {
enable = true;