Skip to content

fix(ssh-keys): install GitHub keys for adam user #79

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
adamamyl merged 2 commits into from
Jun 20, 2026
Merged

fix(ssh-keys): install GitHub keys for adam user #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7457632
fix(ssh-keys): install GitHub keys for adam user
adamamyl Jun 20, 2026
4f5801a
fix(setup-order): run docker after user setup modules
adamamyl Jun 20, 2026
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
16 changes: 9 additions & 7 deletions setup_machine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,29 +335,26 @@ def main() -> None:
if tasks["root_ssh_keys"]:
log_module_start("ROOT SSH KEYS", EXEC)
user_mgmt.install_root_ssh_keys(EXEC)
user_mgmt.install_mapped_ssh_keys(EXEC, DEFAULT_VM_USER)

if tasks["packages"]:
log_module_start("PACKAGES", EXEC)
packages.install_packages(EXEC)
packages.install_update_all_packages(EXEC)

if tasks["docker"]:
log_module_start("DOCKER", EXEC)
module_docker.install_docker_and_add_users(EXEC, DEFAULT_VM_USER)

if tasks["cloud_init"]:
log_module_start("CLOUD-INIT REPOS", EXEC)
module_no2id.install_system_repos(EXEC)

if tasks["sudoers"]:
log_module_start("SUDOERS CONFIG", EXEC)
user_mgmt.setup_sudoers_staff(EXEC)

if tasks["tailscale"]:
log_module_start("TAILSCALE", EXEC)
tailscale.install_tailscale(EXEC)
tailscale.ensure_tailscale_strict(EXEC)

# After Tailscale, before Private User Repos
if tasks["firewall"]:
from lib.installer_utils import module_firewall
Expand All @@ -372,6 +369,11 @@ def main() -> None:
if tasks["no2id"]:
log_module_start("NO2ID SETUP (USER: NO2ID-DOCKER)", EXEC)
run_function_as_user(EXEC, "no2id-docker", "setup_no2id")

# Docker after users — ensures all user accounts are fully configured before group membership
if tasks["docker"]:
log_module_start("DOCKER", EXEC)
module_docker.install_docker_and_add_users(EXEC, DEFAULT_VM_USER)

if tasks["wolfcraig"]:
log_module_start("WOLFCRAIG SETUP", EXEC)
Expand Down
Loading