diff --git a/ansible/playbooks/nanna-setup.yaml b/ansible/playbooks/nanna-setup.yaml index 49fc254..a8a43db 100644 --- a/ansible/playbooks/nanna-setup.yaml +++ b/ansible/playbooks/nanna-setup.yaml @@ -20,6 +20,36 @@ - name: Install and set up Docker and docker-compose ansible.builtin.include_role: name: docker + - name: Add Davids group + become: true + ansible.builtin.group: + name: "david" + state: "present" + - name: Add David + become: true + ansible.builtin.user: + name: "david" + group: "david" + state: "present" + # Disable password auth + password: "!" + - name: Create David SSH directory + become: true + ansible.builtin.file: + path: /home/david/.ssh + owner: david + group: david + state: directory + - name: Set David SSH key + become: true + ansible.builtin.lineinfile: + path: /home/david/.ssh/authorized_keys + line: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICttSQcZsKvw5qKCDGt\ +nxEdyH1aEGOGGRqDCp3U/SG46 davidtanner@coolerLaptop2.fritz.box" + owner: david + group: david + create: true + state: present handlers: - name: Restart sshd diff --git a/ansible/playbooks/nanna-sites.yaml b/ansible/playbooks/nanna-sites.yaml index 7b8ea9e..82daec5 100644 --- a/ansible/playbooks/nanna-sites.yaml +++ b/ansible/playbooks/nanna-sites.yaml @@ -16,3 +16,10 @@ url: https://github.com/pbrinkmeier/tichy-clicker commit: 7dfb14183c765e3661fda84a7e89c2f73ca86f26 owner: paul + - name: Create dt.beany.club directory + become: true + ansible.builtin.file: + path: /home/david/Sites/dt.beany.club + state: directory + owner: david + group: david diff --git a/docker/docker/caddy/Caddyfile b/docker/docker/caddy/Caddyfile index f7cf4d0..ff64184 100644 --- a/docker/docker/caddy/Caddyfile +++ b/docker/docker/caddy/Caddyfile @@ -17,6 +17,13 @@ files.pbrinkmeier.de { } } +dt.beany.club { + file_server { + root /srv/dt.beany.club + browse + } +} + tichy.click { file_server { root /srv/tichy.click diff --git a/docker/docker/caddy/docker-compose.yaml b/docker/docker/caddy/docker-compose.yaml index e77a4c2..883fe3d 100644 --- a/docker/docker/caddy/docker-compose.yaml +++ b/docker/docker/caddy/docker-compose.yaml @@ -10,7 +10,11 @@ services: volumes: - /var/lib/pbri/docker/caddy_data:/data - /var/lib/pbri/docker/caddy_config:/config - - /home/paul/Sites:/srv:ro + # See nanna-sites playbook/Caddyfile + - /home/david/Sites/dt.beany.club:/srv/dt.beany.club:ro + - /home/paul/Sites/files.pbrinkmeier.de:/srv/files.pbrinkmeier.de:ro + - /home/paul/Sites/pbrinkmeier.de:/srv/pbrinkmeier.de:ro + - /home/paul/Sites/tichy.click:/srv/tichy.click:ro restart: always networks: