public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Azure image: update ssh key type, start before the Azure agent

Browse Source
This commit is contained in:
Evgeny Egorochkin 2015-12-09 07:39:17 +02:00
parent 6db67186f2
commit c16f90f515
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/virtualisation/azure-image.nix
View File

@ -98,8 +98,8 @@ in
systemd.services.fetch-ssh-keys = systemd.services.fetch-ssh-keys =
{ description = "Fetch host keys and authorized_keys for root user"; { description = "Fetch host keys and authorized_keys for root user";
wantedBy = [ "sshd.service" ]; wantedBy = [ "sshd.service" "waagent.service" ];
before = [ "sshd.service" ]; before = [ "sshd.service" "waagent.service" ];
after = [ "local-fs.target" ]; after = [ "local-fs.target" ];
path = [ pkgs.coreutils ]; path = [ pkgs.coreutils ];
@ -108,14 +108,14 @@ in
eval "$(base64 --decode /metadata/CustomData.bin)" eval "$(base64 --decode /metadata/CustomData.bin)"
if ! [ -z "$ssh_host_ecdsa_key" ]; then if ! [ -z "$ssh_host_ecdsa_key" ]; then
echo "downloaded ssh_host_ecdsa_key" echo "downloaded ssh_host_ecdsa_key"
echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ecdsa_key echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ed25519_key
chmod 600 /etc/ssh/ssh_host_ecdsa_key chmod 600 /etc/ssh/ssh_host_ed25519_key
fi fi
if ! [ -z "$ssh_host_ecdsa_key_pub" ]; then if ! [ -z "$ssh_host_ecdsa_key_pub" ]; then
echo "downloaded ssh_host_ecdsa_key_pub" echo "downloaded ssh_host_ecdsa_key_pub"
echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ecdsa_key.pub echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ed25519_key.pub
chmod 644 /etc/ssh/ssh_host_ecdsa_key.pub chmod 644 /etc/ssh/ssh_host_ed25519_key.pub
fi fi
if ! [ -z "$ssh_root_auth_key" ]; then if ! [ -z "$ssh_root_auth_key" ]; then