diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 18da98c..b1e82fb 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -90,7 +90,7 @@ quodatum.duckdns.org { @warden host warden.quodatum.duckdns.org handle @warden { import auth_quodatum - import omv 8882 + import xu4 8882 } @nextcloud host nextcloud.quodatum.duckdns.org diff --git a/vaultwarden/Caddyfile b/vaultwarden/Caddyfile deleted file mode 100644 index 4d0cb11..0000000 --- a/vaultwarden/Caddyfile +++ /dev/null @@ -1,56 +0,0 @@ -{$DOMAIN}:443 { - - log { - level INFO - - output file {$LOG_FILE} { - - roll_size 10MB - - roll_keep 10 - } - - } - - # Get a cert by using the ACME HTTP-01 challenge. - - tls {$EMAIL} - encode gzip - - # Headers to improve security. - - header { - - # Enable HSTS - - Strict-Transport-Security "max-age=31536000;" - - # Enable cross-site filter (XSS) - - X-XSS-Protection "1; mode=block" - - # Disallow the site to be rendered within a frame (clickjacking protection) - - X-Frame-Options "DENY" - - # Prevent search engines from indexing - - X-Robots-Tag "none" - - # Remove Caddy branding - - -Server - - } - - # Redirect notifications to the WebSocket. - - reverse_proxy /notifications/hub vaultwarden:3012 - - reverse_proxy vaultwarden:80 { - - header_up X-Real-IP {remote_host} - - } - -} \ No newline at end of file diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index c596d55..67649a1 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -1,29 +1,11 @@ version: '3' services: - vaultwarden: - image: vaultwarden/server:latest container_name: vaultwarden - restart: always - environment: - - WEBSOCKET_ENABLED=true + image: vaultwarden/server:latest + restart: unless-stopped volumes: - - ./vw-data:/data - - caddy: - image: caddy:2 - container_name: vaultcaddy - restart: always + - ./data/:/data/ ports: - - 84:80 - - 444:443 - volumes: - - ./Caddyfile:/etc/caddy/Caddyfile:ro - - ./caddy-config:/config - - ./caddy-data:/data - environment: - - DOMAIN=https://vault.quodatum.duckdns.org - - EMAIL=bunce.andy@gmail.com - - LOG_FILE=/data/access.log - + - 8882:80 \ No newline at end of file