diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2 b/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2 index b052bed..0f945c1 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2 +++ b/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2 @@ -20,3 +20,13 @@ pve.local.cobb.lgbt { code.local.cobb.lgbt { reverse_proxy 10.69.11.51:8443 } + +guac.local.cobb.lgbt { + @notGuac { + not path /quacamole* + } + redir @notGuac /quacamole/ + reverse_proxy 10.69.2.52:8080 { + flush_interval -1 + } +} diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/doas.conf b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/doas.conf new file mode 100644 index 0000000..94a23a0 --- /dev/null +++ b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/doas.conf @@ -0,0 +1 @@ +permit persist adhdgirl diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/id_ed25519.pub b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/id_ed25519.pub new file mode 100644 index 0000000..7410589 --- /dev/null +++ b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE1XzepIOOXlSAjVTVKXlCYiPD4gtlt4/1ky9UWaB/2f annika@ansible.local.cobb.lgbt diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/ipad.pub b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/ipad.pub new file mode 100644 index 0000000..a16c63f --- /dev/null +++ b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/ipad.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICzoAgo72d79TekVgwi8ipSRQ+Ol1frmSC46cesmGiOT annika@ipad.local.cobb.lgbt diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/sudoers b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/sudoers new file mode 100644 index 0000000..621a961 --- /dev/null +++ b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/sudoers @@ -0,0 +1 @@ +adhdgirl ALL=(ALL) ALL diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/wallace.pub b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/wallace.pub new file mode 100644 index 0000000..7003e35 --- /dev/null +++ b/collections/ansible_collections/adhdgirl/minilab/roles/common/files/users/adhdgirl/wallace.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGJ3/ZWJHbXEu5+nPvaNfPQraxy2ThXQlNB/u99nr8ci annika@wallace.local.merr.is diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/common/tasks/users.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/common/tasks/users.yaml index 82b04b8..5b6ce03 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/common/tasks/users.yaml +++ b/collections/ansible_collections/adhdgirl/minilab/roles/common/tasks/users.yaml @@ -64,4 +64,16 @@ key: "{{ lookup('file', item) }}" with_fileglob: - "users/{{ user_name }}/*.pub" +- name: Check if docker group exists + ansible.builtin.group: + name: "docker" + check_mode: true + register: docker_group_exists +- name: If docker group exists, add {{ user_name }} + ansible.builtin.user: + name: "{{ user_name }}" + append: true + groups: docker + when: docker_group_exists.state == 'present' + # code: language=ansible diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/common/vars/users/adhdgirl.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/common/vars/users/adhdgirl.yaml new file mode 100644 index 0000000..e2a64ba --- /dev/null +++ b/collections/ansible_collections/adhdgirl/minilab/roles/common/vars/users/adhdgirl.yaml @@ -0,0 +1,9 @@ +--- +common_user_password: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 39313537373231343839663162373238343837626266323631316234333034343536636664336433 + 3531626364383166383165613563373435623663366461360a613731663639633966353239303933 + 63353537626461383332656265653634656530326133646361643365366665353562396536373834 + 3866343531323237360a353737303766393338353436353864336538373166366637663566363166 + 6364 +# code: language=ansible diff --git a/inventory/hosts.yaml b/inventory/hosts.yaml index 937e4ef..f253010 100644 --- a/inventory/hosts.yaml +++ b/inventory/hosts.yaml @@ -55,3 +55,6 @@ all: authentik: hosts: nemetona: + caddy: + hosts: + nemetona: