Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 773fe1fefa36
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 41512bfdae18
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 28, 2018

  1. pull the ssh host keys from the metadata service as expected by NixOps. 

    Issues: #38623 NixOS/nixops#930.
    @AmineChikhaoui
    AmineChikhaoui committed Apr 28, 2018
    Copy the full SHA
    3b8c742 View commit details

  2. remove the entire temporary directory

    @AmineChikhaoui
    AmineChikhaoui committed Apr 28, 2018
    Copy the full SHA
    4a86f8c View commit details

  3. barf if pulling the ssh host keys fails

    @AmineChikhaoui
    AmineChikhaoui committed Apr 28, 2018
    1
    Copy the full SHA
    f514a68 View commit details

Commits on May 3, 2018

  1. Merge pull request #39654 from AmineChikhaoui/issue-38623 

    GCE: pull the ssh host keys from the metadata service as expected by NixOps.
    @rbvermaa
    rbvermaa authored May 3, 2018
    Copy the full SHA
    41512bf View commit details
Showing with 13 additions and 1 deletion.
  1. +13 −1 nixos/modules/virtualisation/google-compute-image.nix
14 changes: 13 additions & 1 deletion nixos/modules/virtualisation/google-compute-image.nix
View file
Original file line number Diff line number Diff line change
@@ -221,7 +221,7 @@ in
echo "Obtaining SSH keys..."
mkdir -m 0700 -p /root/.ssh
AUTH_KEYS=$(${mktemp})
${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys
${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys
if [ -s $AUTH_KEYS ]; then
# Read in key one by one, split in case Google decided
@@ -246,6 +246,18 @@ in
false
fi
rm -f $AUTH_KEYS
SSH_HOST_KEYS_DIR=$(${mktemp} -d)
${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key
${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key_pub
if [ -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key -a -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub ]; then
mv -f $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key* /etc/ssh/
chmod 600 /etc/ssh/ssh_host_ed25519_key
chmod 644 /etc/ssh/ssh_host_ed25519_key.pub
else
echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed."
false
fi
rm -f $SSH_HOST_KEYS_DIR
'';
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;