diff --git a/sp-modules/nextcloud/module.nix b/sp-modules/nextcloud/module.nix index 82934d6..bcf93b0 100644 --- a/sp-modules/nextcloud/module.nix +++ b/sp-modules/nextcloud/module.nix @@ -30,11 +30,11 @@ path = with pkgs; [ coreutils jq ]; script = '' install -m 0440 -o nextcloud -g nextcloud -DT \ - <(jq < ${secrets-filepath} -r '.modules.nextcloud.databasePassword') \ + <(jq -re '.modules.nextcloud.databasePassword' ${secrets-filepath}) \ ${db-pass-filepath} install -m 0440 -o nextcloud -g nextcloud -DT \ - <(jq < ${secrets-filepath} -r '.modules.nextcloud.adminPassword') \ + <(jq -re '.modules.nextcloud.adminPassword' ${secrets-filepath}) \ ${admin-pass-filepath} ''; }; diff --git a/sp-modules/pleroma/module.nix b/sp-modules/pleroma/module.nix index 8e132b5..5413133 100644 --- a/sp-modules/pleroma/module.nix +++ b/sp-modules/pleroma/module.nix @@ -61,7 +61,8 @@ in path = with pkgs; [ coreutils jq ]; script = '' set -o nounset - password=$(jq -r '.databasePassword' ${secrets-filepath}) + + password="$(jq -re '.databasePassword' ${secrets-filepath})" filecontents=$(cat <<- EOF import Config config :pleroma, Pleroma.Repo, diff --git a/sp-modules/restic/module.nix b/sp-modules/restic/module.nix index 64400cc..a142295 100644 --- a/sp-modules/restic/module.nix +++ b/sp-modules/restic/module.nix @@ -52,8 +52,8 @@ in script = '' set -o nounset - account="$(jq -r '.modules.restic.accountId' ${secrets-filepath})" - key="$(jq -r '.modules.restic.accountKey' ${secrets-filepath})" + account="$(jq -re '.modules.restic.accountId' ${secrets-filepath})" + key="$(jq -re '.modules.restic.accountKey' ${secrets-filepath})" rclone_conf=$(cat <<- EOF [backblaze] account = $account @@ -64,7 +64,7 @@ in <(printf "%s" "$rclone_conf") ${rclone-conf-filepath} install -m 0400 -o restic -g restic -DT \ - <(jq -r '.resticPassword' ${secrets-filepath}) /var/lib/restic/pass + <(jq -re '.resticPassword' ${secrets-filepath}) /var/lib/restic/pass ''; }; };