Merge #141: Fix secrets setup

ad23b508e3 {generate,setup}-secrets: remove process hardening (Erik Arvstedt)
89f9bedb9d generate-secrets.nix: fix indentation (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK ad23b508e3

Tree-SHA512: 1cb031f9dbfd3150316e4d4f365d37cb7f591910412ee3c70e01beda3498dbf514d4b620f257f32f64c6dcc4845659f45f69f5839e0b7401997320140530d2a0
This commit is contained in:
Jonas Nick 2020-02-26 21:40:03 +00:00
commit ea8d29d96f
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 4 additions and 4 deletions

View File

@ -12,9 +12,9 @@ with lib;
requiredBy = [ "setup-secrets.service" ]; requiredBy = [ "setup-secrets.service" ];
before = [ "setup-secrets.service" ]; before = [ "setup-secrets.service" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
} // config.nix-bitcoin-services.defaultHardening; };
script = '' script = ''
mkdir -p "${config.nix-bitcoin.secretsDir}" mkdir -p "${config.nix-bitcoin.secretsDir}"
cd "${config.nix-bitcoin.secretsDir}" cd "${config.nix-bitcoin.secretsDir}"

View File

@ -56,7 +56,7 @@ in
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
} // config.nix-bitcoin-services.defaultHardening; };
script = '' script = ''
setupSecret() { setupSecret() {
file="$1" file="$1"