Skip to content

hetzner: Don't create /root/.ssh/authorized_keys. #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edolstra merged 1 commit into from
Oct 26, 2015
Merged

hetzner: Don't create /root/.ssh/authorized_keys. #349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions nixops/backends/hetzner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,19 +320,6 @@ def reboot_rescue(self, install=False, partitions=None, bootstrap=True,
if bootstrap:
self._bootstrap_rescue(install, partitions)

def _install_main_ssh_keys(self):
"""
Create a SSH private/public keypair and put the public key into the
chroot.
"""
private, public = create_key_pair(
key_name="NixOps client key of {0}".format(self.name)
)
self.main_ssh_private_key, self.main_ssh_public_key = private, public
res = self.run_command("umask 077 && mkdir -p /mnt/root/.ssh &&"
" cat > /mnt/root/.ssh/authorized_keys",
stdin_string=public)

def _install_base_system(self):
self.log_start("creating missing directories... ")
cmds = ["mkdir -m 1777 -p /mnt/tmp /mnt/nix/store"]
Expand All @@ -356,7 +343,10 @@ def _install_base_system(self):

self.run_command("touch /mnt/etc/NIXOS")
self.run_command("activate-remote")
self._install_main_ssh_keys()

self.main_ssh_private_key, self.main_ssh_public_key = create_key_pair(
key_name="NixOps client key of {0}".format(self.name)
)
self._gen_network_spec()

def _detect_hardware(self):
Expand Down Expand Up @@ -533,9 +523,13 @@ def _gen_network_spec(self):
}

def get_physical_spec(self):
if all([self.net_info, self.fs_info, self.hw_info]):
if all([self.net_info, self.fs_info, self.hw_info,
self.main_ssh_public_key]):
return {
'config': self.net_info,
'config': dict(self.net_info.items() + {
('users', 'extraUsers', 'root', 'openssh',
'authorizedKeys', 'keys'): [self.main_ssh_public_key]
}.items()),
'imports': [nix2py(self.fs_info), nix2py(self.hw_info)],
}
else:
Expand Down