diff --git a/ansible/inventory/pilot b/ansible/inventory/pilot new file mode 100644 index 0000000..7470e82 --- /dev/null +++ b/ansible/inventory/pilot @@ -0,0 +1,6 @@ +[workspace] +pilot1.sram.surf.nl + +[pilot:vars] +ansible_python_interpreter=/usr/bin/python3 +ansible_user=harry diff --git a/ansible/inventory/vault b/ansible/inventory/vault new file mode 100644 index 0000000..42b0547 --- /dev/null +++ b/ansible/inventory/vault @@ -0,0 +1,6 @@ +[vault] +vault.fried-air.com + +[vault:vars] +ansible_python_interpreter=/usr/bin/python3 +ansible_user=debian diff --git a/ansible/roles/rclone/templates/docker-compose.yml.j2 b/ansible/roles/rclone/templates/docker-compose.yml.j2 index c7721a0..40c5882 100644 --- a/ansible/roles/rclone/templates/docker-compose.yml.j2 +++ b/ansible/roles/rclone/templates/docker-compose.yml.j2 @@ -103,7 +103,7 @@ services: - redis labels: - "traefik.enable=true" - - "traefik.http.routers.mount.rule=Host(`{{ inventory_hostname }}`) && (PathPrefix(`/admin`) || PathPrefix(`/webdav`))" + - "traefik.http.routers.mount.rule=Host(`{{ inventory_hostname }}`) && (PathPrefix(`/`) ||PathPrefix(`/admin`) || PathPrefix(`/webdav`))" - "traefik.http.routers.mount.tls=true" - "traefik.http.routers.mount.tls.certresolver=le" - "traefik.http.routers.mount.entrypoints=https" diff --git a/ansible/roles/vault/templates/docker-compose.yml.j2 b/ansible/roles/vault/templates/docker-compose.yml.j2 index 09e9301..f77f384 100644 --- a/ansible/roles/vault/templates/docker-compose.yml.j2 +++ b/ansible/roles/vault/templates/docker-compose.yml.j2 @@ -20,7 +20,7 @@ services: - ./file:/vault/file labels: - "traefik.enable=true" - - "traefik.http.routers.vault.rule=Host(`{{ inventory_hostname }}`)" + - "traefik.http.routers.vault.rule=Host(`{{ inventory_hostname }}`) && (PathPrefix(`/ui`) || PathPrefix(`/v1`))" - "traefik.http.routers.vault.tls=true" - "traefik.http.routers.vault.tls.certresolver=le" - "traefik.http.routers.vault.entrypoints=https" diff --git a/mount/Dockerfile b/mount/Dockerfile index ca40084..ca331c8 100644 --- a/mount/Dockerfile +++ b/mount/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y \ - nginx nginx-full libnginx-mod-http-lua \ + nginx nginx-full libnginx-mod-http-lua libnginx-mod-http-fancyindex \ wget cron curl vim git sudo \ ca-certificates autoconf build-essential make \ libpam-dev libcurl4-gnutls-dev libhiredis-dev libssl-dev \