Refactor default ssh keys
This commit is contained in:
parent
3517033108
commit
acbc38aa8a
9 changed files with 40 additions and 34 deletions
2
main.tf
2
main.tf
|
|
@ -139,7 +139,7 @@ module "infrastructure" {
|
||||||
|
|
||||||
scaleway_project_id = data.infisical_secrets.s.secrets["scaleway_project_id"].value
|
scaleway_project_id = data.infisical_secrets.s.secrets["scaleway_project_id"].value
|
||||||
|
|
||||||
default_ssh_key = var.default_ssh_key
|
default_ssh_keys = var.default_ssh_keys
|
||||||
|
|
||||||
hosts = var.hosts
|
hosts = var.hosts
|
||||||
services = var.services
|
services = var.services
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
resource "hcloud_ssh_key" "default" {
|
resource "hcloud_ssh_key" "defaults" {
|
||||||
name = var.default_ssh_key.name
|
for_each = var.default_ssh_keys
|
||||||
public_key = var.default_ssh_key.public_key
|
name = each.key
|
||||||
|
public_key = each.value
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "hcloud_placement_group" "default" {
|
resource "hcloud_placement_group" "default" {
|
||||||
|
|
@ -33,11 +34,11 @@ resource "hcloud_server" "nodes" {
|
||||||
location = each.value.location
|
location = each.value.location
|
||||||
image = each.value.image
|
image = each.value.image
|
||||||
server_type = each.value.server_type
|
server_type = each.value.server_type
|
||||||
ssh_keys = [hcloud_ssh_key.default.id]
|
ssh_keys = [ for k in hcloud_ssh_key.defaults : k.id ]
|
||||||
user_data = templatefile("./templates/cloud-init.yaml.tpl", {
|
user_data = templatefile("./templates/cloud-init.yaml.tpl", {
|
||||||
netbird_setup_key = each.value.ephemeral ? netbird_setup_key.cloud_init_ephemeral_key.key : netbird_setup_key.cloud_init_key.key,
|
netbird_setup_key = each.value.ephemeral ? netbird_setup_key.cloud_init_ephemeral_key.key : netbird_setup_key.cloud_init_key.key,
|
||||||
default_ssh_key = var.default_ssh_key.public_key
|
default_ssh_keys = var.default_ssh_keys
|
||||||
hostname = each.value.hostname
|
hostname = each.value.hostname
|
||||||
})
|
})
|
||||||
placement_group_id = hcloud_placement_group.default.id
|
placement_group_id = hcloud_placement_group.default.id
|
||||||
public_net {
|
public_net {
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,10 @@ data "scaleway_account_project" "project" {
|
||||||
project_id = var.scaleway_project_id
|
project_id = var.scaleway_project_id
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "scaleway_account_ssh_key" "default" {
|
resource "scaleway_account_ssh_key" "defaults" {
|
||||||
name = var.default_ssh_key.name
|
for_each = var.default_ssh_keys
|
||||||
public_key = var.default_ssh_key.public_key
|
name = each.key
|
||||||
|
public_key = each.value
|
||||||
}
|
}
|
||||||
|
|
||||||
data "scaleway_iam_user" "serguzim" {
|
data "scaleway_iam_user" "serguzim" {
|
||||||
|
|
|
||||||
|
|
@ -6,11 +6,8 @@ variable "scaleway_project_id" {
|
||||||
sensitive = true
|
sensitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "default_ssh_key" {
|
variable "default_ssh_keys" {
|
||||||
type = object({
|
type = map(string)
|
||||||
name = string
|
|
||||||
public_key = string
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,11 @@ output "services" {
|
||||||
sensitive = true # Would be too much output
|
sensitive = true # Would be too much output
|
||||||
}
|
}
|
||||||
|
|
||||||
|
output "ssh_keys" {
|
||||||
|
value = var.default_ssh_keys
|
||||||
|
sensitive = true
|
||||||
|
}
|
||||||
|
|
||||||
output "authentik_data" {
|
output "authentik_data" {
|
||||||
value = module.services.authentik_data
|
value = module.services.authentik_data
|
||||||
sensitive = true
|
sensitive = true
|
||||||
|
|
|
||||||
6
playbooks/roles/users/tasks/main.yml
Normal file
6
playbooks/roles/users/tasks/main.yml
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
- name: Set authorized keys for ansible
|
||||||
|
ansible.posix.authorized_key:
|
||||||
|
user: ansible
|
||||||
|
exclusive: true
|
||||||
|
key: "{{ opentofu.ssh_keys.values() | join('\n') }}"
|
||||||
|
become: true
|
||||||
|
|
@ -22,19 +22,16 @@
|
||||||
ansible.builtin.import_tasks: tasks/load-secrets.yml
|
ansible.builtin.import_tasks: tasks/load-secrets.yml
|
||||||
tags: always
|
tags: always
|
||||||
|
|
||||||
- name: Install software
|
- name: Run built-in roles
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: software
|
name: "{{ item }}"
|
||||||
apply:
|
apply:
|
||||||
tags: software
|
tags: "{{ item }}"
|
||||||
tags: software
|
|
||||||
|
|
||||||
- name: Run always role
|
|
||||||
ansible.builtin.include_role:
|
|
||||||
name: always
|
|
||||||
apply:
|
|
||||||
tags: always
|
|
||||||
tags: always
|
tags: always
|
||||||
|
loop:
|
||||||
|
- software
|
||||||
|
- always
|
||||||
|
- users
|
||||||
|
|
||||||
- name: Include service roles
|
- name: Include service roles
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ users:
|
||||||
shell: /bin/bash
|
shell: /bin/bash
|
||||||
lock_passwd: false
|
lock_passwd: false
|
||||||
ssh_authorized_keys:
|
ssh_authorized_keys:
|
||||||
- "${default_ssh_key}"
|
- "${default_ssh_keys["openpgp:0xAB920993"]}"
|
||||||
- name: ansible
|
- name: ansible
|
||||||
gecos: Ansible User
|
gecos: Ansible User
|
||||||
groups: users,admin,wheel
|
groups: users,admin,wheel
|
||||||
|
|
@ -16,7 +16,9 @@ users:
|
||||||
shell: /bin/bash
|
shell: /bin/bash
|
||||||
lock_passwd: true
|
lock_passwd: true
|
||||||
ssh_authorized_keys:
|
ssh_authorized_keys:
|
||||||
- "${default_ssh_key}"
|
%{ for n, k in default_ssh_keys ~}
|
||||||
|
- "${k}"
|
||||||
|
%{ endfor ~}
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
- git
|
- git
|
||||||
|
|
|
||||||
11
variables.tf
11
variables.tf
|
|
@ -39,14 +39,11 @@ variable "postgresql_port" {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
variable "default_ssh_key" {
|
variable "default_ssh_keys" {
|
||||||
type = object({
|
type = map(string)
|
||||||
name = string
|
|
||||||
public_key = string
|
|
||||||
})
|
|
||||||
default = {
|
default = {
|
||||||
name = "openpgp:0xAB920993"
|
"openpgp:0xAB920993" = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCkmWZmum4cVeDy5+9N1HdUzfnjEHSJ900ucD8F0wAy4MV1cdPYnZ4u5PFv5XMfmvA9SJ+VFsr0lhYlr+GQBG9aCCAdMJVVmEz3SccT6dp6ZYywT158RNshzfCe9ylWKK80+W7XnDXhdkec7aK+BQn5wOER3A3mUqRR0JDXWga9jyakH1K6OwXmQOO419bJWs2uCT1ZEgndHxKJEt2pEvoSz7z8p1SS2zyro+R3YtvL9WiDo3+0yPFYficNDr7s39yF5IJE+KTqAlCn5R2+kJ54lRmzB8oNS2jGwK2Q6wtph4AmfnlJTMODG2U2RjUltH2MIDXIYe2epATWL8qhkI4LTr38C7QR3DeJQsel/yTWdYqGakvU6Ge/xkbsaWOrSDTV3bPgKHzlL+dIKaGpV+5usZN4fpOLOb/nmYy3ekLpobzxza7rBRT2CxXS72DoPFaRE1ye7SxhcsLBNwre9YQFE4VvUZwJYkWz2V7eqGrk8VYnmQmT/bnUnMnVwMpeDc7pFKAFndIUxifoOj77c98Tdy3ncdS7SOd7+zRbLG+7k0UU1k89o1+tfREAddUJYR4RvB6g0kCyjpwOf1Pt4zhJR3y/zpsCCc5UnzK9X2kEo/8TSyvTr+GBiFVp5yLYgwCPJSNna33YX7+c3oLRM1QGgtqZk9qnGX9hgP8qpF8Akw== openpgp:0xAB920993"
|
||||||
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCkmWZmum4cVeDy5+9N1HdUzfnjEHSJ900ucD8F0wAy4MV1cdPYnZ4u5PFv5XMfmvA9SJ+VFsr0lhYlr+GQBG9aCCAdMJVVmEz3SccT6dp6ZYywT158RNshzfCe9ylWKK80+W7XnDXhdkec7aK+BQn5wOER3A3mUqRR0JDXWga9jyakH1K6OwXmQOO419bJWs2uCT1ZEgndHxKJEt2pEvoSz7z8p1SS2zyro+R3YtvL9WiDo3+0yPFYficNDr7s39yF5IJE+KTqAlCn5R2+kJ54lRmzB8oNS2jGwK2Q6wtph4AmfnlJTMODG2U2RjUltH2MIDXIYe2epATWL8qhkI4LTr38C7QR3DeJQsel/yTWdYqGakvU6Ge/xkbsaWOrSDTV3bPgKHzlL+dIKaGpV+5usZN4fpOLOb/nmYy3ekLpobzxza7rBRT2CxXS72DoPFaRE1ye7SxhcsLBNwre9YQFE4VvUZwJYkWz2V7eqGrk8VYnmQmT/bnUnMnVwMpeDc7pFKAFndIUxifoOj77c98Tdy3ncdS7SOd7+zRbLG+7k0UU1k89o1+tfREAddUJYR4RvB6g0kCyjpwOf1Pt4zhJR3y/zpsCCc5UnzK9X2kEo/8TSyvTr+GBiFVp5yLYgwCPJSNna33YX7+c3oLRM1QGgtqZk9qnGX9hgP8qpF8Akw== openpgp:0xAB920993"
|
"semaphoreui" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJlN0hy0+gFgvTCiN2bJNktEf1lFRJSu6wbWsZl6zsea semaphoreui"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue