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

Merge pull request #141129 from Ma27/nextcloud-secret-backport

Browse Source 
[21.05] nixos/nextcloud: put secrets into the environment of nextcloud-setup.service
This commit is contained in:
Maximilian Bosch 2021-10-14 15:53:15 +02:00 committed by GitHub
commit a255ac3b23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -495,14 +495,21 @@ in {
]; ];
''; '';
occInstallCmd = let occInstallCmd = let
dbpass = if c.dbpassFile != null mkExport = { arg, value }: "export ${arg}=${value}";
then ''"$(<"${toString c.dbpassFile}")"'' dbpass = {
else if c.dbpass != null arg = "DBPASS";
then ''"${toString c.dbpass}"'' value = if c.dbpassFile != null
else ''""''; then ''"$(<"${toString c.dbpassFile}")"''
adminpass = if c.adminpassFile != null else if c.dbpass != null
then ''"$(<"${toString c.adminpassFile}")"'' then ''"${toString c.dbpass}"''
else ''"${toString c.adminpass}"''; else ''""'';
};
adminpass = {
arg = "ADMINPASS";
value = if c.adminpassFile != null
then ''"$(<"${toString c.adminpassFile}")"''
else ''"${toString c.adminpass}"'';
};
installFlags = concatStringsSep " \\\n " installFlags = concatStringsSep " \\\n "
(mapAttrsToList (k: v: "${k} ${toString v}") { (mapAttrsToList (k: v: "${k} ${toString v}") {
"--database" = ''"${c.dbtype}"''; "--database" = ''"${c.dbtype}"'';
@ -513,12 +520,14 @@ in {
${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"''; ${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"''; ${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"''; ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
"--database-pass" = dbpass; "--database-pass" = "\$${dbpass.arg}";
"--admin-user" = ''"${c.adminuser}"''; "--admin-user" = ''"${c.adminuser}"'';
"--admin-pass" = adminpass; "--admin-pass" = "\$${adminpass.arg}";
"--data-dir" = ''"${cfg.home}/data"''; "--data-dir" = ''"${cfg.home}/data"'';
}); });
in '' in ''
${mkExport dbpass}
${mkExport adminpass}
${occ}/bin/nextcloud-occ maintenance:install \ ${occ}/bin/nextcloud-occ maintenance:install \
${installFlags} ${installFlags}
''; '';