diff options
| author | Jack Kelly <jack@jackkelly.name> | 2021-05-02 08:28:59 +1000 |
|---|---|---|
| committer | Jack Kelly <jack@jackkelly.name> | 2021-05-02 08:28:59 +1000 |
| commit | 5ea55e4ed02004de54cd7abeaa79a64321940398 (patch) | |
| tree | feabcc07eedb610fa1f9f4096af213c39f4553ee | |
| parent | b731c58d19db3f935766192739c3c2188444f3f2 (diff) | |
| download | nixpkgs-5ea55e4ed02004de54cd7abeaa79a64321940398.tar nixpkgs-5ea55e4ed02004de54cd7abeaa79a64321940398.tar.gz nixpkgs-5ea55e4ed02004de54cd7abeaa79a64321940398.tar.bz2 nixpkgs-5ea55e4ed02004de54cd7abeaa79a64321940398.tar.lz nixpkgs-5ea55e4ed02004de54cd7abeaa79a64321940398.tar.xz nixpkgs-5ea55e4ed02004de54cd7abeaa79a64321940398.tar.zst nixpkgs-5ea55e4ed02004de54cd7abeaa79a64321940398.zip | |
metadata fetchers: use umask instead of fetch-and-chmod
| -rw-r--r-- | nixos/modules/virtualisation/ec2-metadata-fetcher.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/openstack-metadata-fetcher.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix index dca5c2abd4e..760f024f33f 100644 --- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix @@ -71,7 +71,7 @@ } wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path - wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data) wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key '' diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix index 8c191397cf9..133cd4c0e9f 100644 --- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix @@ -15,7 +15,7 @@ } wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path - wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data) wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key '' |