SelfPrivacy/selfprivacy-nixos-config
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git synced 2024-12-01 19:06:44 +00:00
Code Issues Projects Releases Wiki Activity

sp-modules: use jq exit status code

Browse source
This commit is contained in:
Alexander Tomokhov 2023-12-03 10:37:37 +04:00
parent 4716b9bf19
commit ade4dc08b1
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sp-modules/nextcloud/module.nix
View file

@ -30,11 +30,11 @@
path = with pkgs; [ coreutils jq ]; path = with pkgs; [ coreutils jq ];
script = '' script = ''
install -m 0440 -o nextcloud -g nextcloud -DT \ 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} ${db-pass-filepath}
install -m 0440 -o nextcloud -g nextcloud -DT \ 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} ${admin-pass-filepath}
''; '';
}; };

3
sp-modules/pleroma/module.nix
View file

@ -61,7 +61,8 @@ in
path = with pkgs; [ coreutils jq ]; path = with pkgs; [ coreutils jq ];
script = '' script = ''
set -o nounset set -o nounset
password=$(jq -r '.databasePassword' ${secrets-filepath})
password="$(jq -re '.databasePassword' ${secrets-filepath})"
filecontents=$(cat <<- EOF filecontents=$(cat <<- EOF
import Config import Config
config :pleroma, Pleroma.Repo, config :pleroma, Pleroma.Repo,

6
sp-modules/restic/module.nix
View file

@ -52,8 +52,8 @@ in
script = '' script = ''
set -o nounset set -o nounset
account="$(jq -r '.modules.restic.accountId' ${secrets-filepath})" account="$(jq -re '.modules.restic.accountId' ${secrets-filepath})"
key="$(jq -r '.modules.restic.accountKey' ${secrets-filepath})" key="$(jq -re '.modules.restic.accountKey' ${secrets-filepath})"
rclone_conf=$(cat <<- EOF rclone_conf=$(cat <<- EOF
[backblaze] [backblaze]
account = $account account = $account
@ -64,7 +64,7 @@ in
<(printf "%s" "$rclone_conf") ${rclone-conf-filepath} <(printf "%s" "$rclone_conf") ${rclone-conf-filepath}
install -m 0400 -o restic -g restic -DT \ 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
''; '';
}; };
}; };