From a1cac6b8a3376267ff8a2c93ba93403558bd47b4 Mon Sep 17 00:00:00 2001 From: Paul Brinkmeier Date: Fri, 27 Jan 2023 04:29:32 +0100 Subject: [PATCH] Move docker folder and delete hedgedoc user --- TODO.md | 1 + ansible/playbooks/misc-docker.yaml | 6 +++--- docker/{ => docker}/caddy/Caddyfile | 0 docker/{ => docker}/caddy/Dockerfile | 0 docker/{ => docker}/caddy/docker-compose.yaml | 0 docker/{ => docker}/codi/README.md | 0 docker/{ => docker}/codi/docker-compose.yaml | 0 docker/{ => docker}/drone/README.md | 0 docker/{ => docker}/drone/docker-compose.yaml | 0 docker/{ => docker}/factorio/Dockerfile | 0 docker/{ => docker}/factorio/README.md | 0 docker/{ => docker}/factorio/docker-compose.yaml | 0 docker/{ => docker}/factorio/server-settings.json | 0 docker/{ => docker}/gitea/Dockerfile | 0 docker/{ => docker}/gitea/README.md | 0 docker/{ => docker}/gitea/docker-compose.yaml | 0 docker/{ => docker}/glebby/docker-compose.yaml | 0 docker/{ => docker}/jupyter/docker-compose.yaml | 0 18 files changed, 4 insertions(+), 3 deletions(-) rename docker/{ => docker}/caddy/Caddyfile (100%) rename docker/{ => docker}/caddy/Dockerfile (100%) rename docker/{ => docker}/caddy/docker-compose.yaml (100%) rename docker/{ => docker}/codi/README.md (100%) rename docker/{ => docker}/codi/docker-compose.yaml (100%) rename docker/{ => docker}/drone/README.md (100%) rename docker/{ => docker}/drone/docker-compose.yaml (100%) rename docker/{ => docker}/factorio/Dockerfile (100%) rename docker/{ => docker}/factorio/README.md (100%) rename docker/{ => docker}/factorio/docker-compose.yaml (100%) rename docker/{ => docker}/factorio/server-settings.json (100%) rename docker/{ => docker}/gitea/Dockerfile (100%) rename docker/{ => docker}/gitea/README.md (100%) rename docker/{ => docker}/gitea/docker-compose.yaml (100%) rename docker/{ => docker}/glebby/docker-compose.yaml (100%) rename docker/{ => docker}/jupyter/docker-compose.yaml (100%) diff --git a/TODO.md b/TODO.md index c6108c0..09fdfd1 100644 --- a/TODO.md +++ b/TODO.md @@ -6,6 +6,7 @@ - [x] Make it inaccessible to anyone but root (`-rw------`) - [x] Add [Drone runner](https://docs.drone.io/runner/docker/installation/linux/) - [ ] Figure out how to dependably store `.env` files (Ansible vault? Something else?) + - [ ] In vault, seperate from other config - [x] Check out docker swarm and current best practices for Ansible - [x] Use Gitea instead of GitLab - [ ] Add drone exec runner for Nix builds with shared `/nix` diff --git a/ansible/playbooks/misc-docker.yaml b/ansible/playbooks/misc-docker.yaml index 59820ac..2cf744f 100644 --- a/ansible/playbooks/misc-docker.yaml +++ b/ansible/playbooks/misc-docker.yaml @@ -8,7 +8,7 @@ name: "{{ item.name }}" uid: "{{ item.uid }}" create_home: false - state: present + state: "{{ item.state }}" loop: - name: jupyter uid: 42000 @@ -24,7 +24,7 @@ state: present - name: hedgedoc uid: 10000 - state: present + state: absent # All services that are behind Caddy need to be in this network - name: Create Caddy network become: true @@ -34,7 +34,7 @@ - name: Upload docker configuration become: true ansible.builtin.copy: - src: ../../docker + src: ../../docker/docker dest: /etc/pbri # Files should inaccessible to non-root users. mode: u=rw,g=,o= diff --git a/docker/caddy/Caddyfile b/docker/docker/caddy/Caddyfile similarity index 100% rename from docker/caddy/Caddyfile rename to docker/docker/caddy/Caddyfile diff --git a/docker/caddy/Dockerfile b/docker/docker/caddy/Dockerfile similarity index 100% rename from docker/caddy/Dockerfile rename to docker/docker/caddy/Dockerfile diff --git a/docker/caddy/docker-compose.yaml b/docker/docker/caddy/docker-compose.yaml similarity index 100% rename from docker/caddy/docker-compose.yaml rename to docker/docker/caddy/docker-compose.yaml diff --git a/docker/codi/README.md b/docker/docker/codi/README.md similarity index 100% rename from docker/codi/README.md rename to docker/docker/codi/README.md diff --git a/docker/codi/docker-compose.yaml b/docker/docker/codi/docker-compose.yaml similarity index 100% rename from docker/codi/docker-compose.yaml rename to docker/docker/codi/docker-compose.yaml diff --git a/docker/drone/README.md b/docker/docker/drone/README.md similarity index 100% rename from docker/drone/README.md rename to docker/docker/drone/README.md diff --git a/docker/drone/docker-compose.yaml b/docker/docker/drone/docker-compose.yaml similarity index 100% rename from docker/drone/docker-compose.yaml rename to docker/docker/drone/docker-compose.yaml diff --git a/docker/factorio/Dockerfile b/docker/docker/factorio/Dockerfile similarity index 100% rename from docker/factorio/Dockerfile rename to docker/docker/factorio/Dockerfile diff --git a/docker/factorio/README.md b/docker/docker/factorio/README.md similarity index 100% rename from docker/factorio/README.md rename to docker/docker/factorio/README.md diff --git a/docker/factorio/docker-compose.yaml b/docker/docker/factorio/docker-compose.yaml similarity index 100% rename from docker/factorio/docker-compose.yaml rename to docker/docker/factorio/docker-compose.yaml diff --git a/docker/factorio/server-settings.json b/docker/docker/factorio/server-settings.json similarity index 100% rename from docker/factorio/server-settings.json rename to docker/docker/factorio/server-settings.json diff --git a/docker/gitea/Dockerfile b/docker/docker/gitea/Dockerfile similarity index 100% rename from docker/gitea/Dockerfile rename to docker/docker/gitea/Dockerfile diff --git a/docker/gitea/README.md b/docker/docker/gitea/README.md similarity index 100% rename from docker/gitea/README.md rename to docker/docker/gitea/README.md diff --git a/docker/gitea/docker-compose.yaml b/docker/docker/gitea/docker-compose.yaml similarity index 100% rename from docker/gitea/docker-compose.yaml rename to docker/docker/gitea/docker-compose.yaml diff --git a/docker/glebby/docker-compose.yaml b/docker/docker/glebby/docker-compose.yaml similarity index 100% rename from docker/glebby/docker-compose.yaml rename to docker/docker/glebby/docker-compose.yaml diff --git a/docker/jupyter/docker-compose.yaml b/docker/docker/jupyter/docker-compose.yaml similarity index 100% rename from docker/jupyter/docker-compose.yaml rename to docker/docker/jupyter/docker-compose.yaml