diff --git a/README.md b/README.md index b938fa7..1cca73e 100644 --- a/README.md +++ b/README.md @@ -33,10 +33,10 @@ All services below are running under Docker, except NSD and Borg. ## TODO +- Forward to https not working correctly yet. I think it works now? Should check it. +- Expose treafik dashboard only on local network - Clear view of what services + which versions we are running. This way, we can track security updates better. -- Delegate pim.kunis.nl to my server -- Host tobb website? -- Move from Ubuntu to Debian +- Mastodon links verifications ### NSD diff --git a/roles/blog/meta/main.yml b/roles/blog/meta/main.yml deleted file mode 100644 index 6b03734..0000000 --- a/roles/blog/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: - - role: common - - role: docker - - role: traefik diff --git a/roles/traefik/files/basic_auth_users b/roles/traefik/files/basic_auth_users new file mode 100644 index 0000000..e26bc55 --- /dev/null +++ b/roles/traefik/files/basic_auth_users @@ -0,0 +1,9 @@ +$ANSIBLE_VAULT;1.1;AES256 +33333836626532396564616664353836636164386437323234333464336432663266663038313138 +3563663134333236366433636134653965393932343362360a306236343538663836633761353262 +65353961376230333530616465353735626232373132613635653162353634353865386638633365 +3762636464663532360a633162646365653764666563383632393738343931656366343336653437 +36656535346432313036323433396432303563663836303964643731326364306530636332346163 +36353034366562386664376565316339616466323133303464326637366432623164666332313762 +38663138613534363361376161376363666134336466303436643035356438303832333639373266 +62313730633763633066 diff --git a/roles/traefik/tasks/main.yml b/roles/traefik/tasks/main.yml index d190b3f..e589108 100644 --- a/roles/traefik/tasks/main.yml +++ b/roles/traefik/tasks/main.yml @@ -20,6 +20,10 @@ copy: src: "{{ role_path }}/files/services.toml" dest: "{{ service_dir }}/services.toml" +- name: Copy basic_auth_users file + copy: + src: "{{ role_path }}/files/basic_auth_users" + dest: "{{ service_dir }}/basic_auth_users" - name: Create traefik network docker_network: name: "traefik" diff --git a/roles/traefik/templates/docker-compose.yml.j2 b/roles/traefik/templates/docker-compose.yml.j2 index 7db26ed..cfc1843 100644 --- a/roles/traefik/templates/docker-compose.yml.j2 +++ b/roles/traefik/templates/docker-compose.yml.j2 @@ -18,6 +18,7 @@ services: - {{ service_dir }}/traefik.toml:/etc/traefik/traefik.toml - {{ service_dir }}/services.toml:/etc/traefik/services.toml - {{ service_dir }}/acme.json:/acme.json + - {{ service_dir }}/basic_auth_users:/basic_auth_users networks: - traefik labels: @@ -34,5 +35,5 @@ services: - traefik.http.routers.traefik.tls=true - traefik.http.routers.traefik.tls.certresolver=pizzapim - traefik.http.routers.traefik.service=api@internal - - traefik.http.routers.traefik.middlewares=whitelist-local - - "traefik.http.middlewares.whitelist-local.ipwhitelist.sourcerange=127.0.0.1/32,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,::1,fc00::/7" + - traefik.http.routers.traefik.middlewares=basic-auth + - traefik.http.middlewares.basic-auth.basicauth.usersfile=/basic_auth_users