diff --git a/arty.yml b/arty.yml index b413371..4d2c24d 100644 --- a/arty.yml +++ b/arty.yml @@ -10,6 +10,7 @@ envs: ADMIN_EMAIL: valknar@pivoine.art NETWORK_NAME: falcon_network TIMEZONE: Europe/Berlin + EMAIL_FROM: hi@pivoine.art # Core CORE_COMPOSE_PROJECT_NAME: core CORE_DB_HOST: postgres @@ -186,8 +187,8 @@ envs: ASCIINEMA_IMAGE: ghcr.io/asciinema/asciinema-server:latest ASCIINEMA_TRAEFIK_HOST: asciinema.pivoine.art ASCIINEMA_DB_NAME: asciinema + ASCIINEMA_SIGN_UP_DISABLED: false ASCIINEMA_UNCLAIMED_TTL: 30 - ASCIINEMA_MAIL_FROM: noreply@pivoine.art ASCIINEMA_MAIL_REPLY_TO: valknar@pivoine.art # Watchtower WATCHTOWER_POLL_INTERVAL: 300 diff --git a/asciinema/compose.yaml b/asciinema/compose.yaml index f75ca60..bc1a8ed 100644 --- a/asciinema/compose.yaml +++ b/asciinema/compose.yaml @@ -18,29 +18,35 @@ services: SMTP_PORT: ${EMAIL_SMTP_PORT} SMTP_USERNAME: ${EMAIL_SMTP_USER} SMTP_PASSWORD: ${EMAIL_SMTP_PASSWORD} - SMTP_SSL: ${SMTP_SSL:-true} - MAIL_FROM_ADDRESS: ${ASCIINEMA_MAIL_FROM} + SMTP_SSL: true + MAIL_FROM_ADDRESS: ${EMAIL_FROM} MAIL_REPLY_TO_ADDRESS: ${ASCIINEMA_MAIL_REPLY_TO} + SIGN_UP_DISABLED: ${ASCIINEMA_SIGN_UP_DISABLED:-false} UNCLAIMED_RECORDING_TTL: ${ASCIINEMA_UNCLAIMED_TTL:-30} labels: - - traefik.enable=${ASCIINEMA_TRAEFIK_ENABLED:-true} - - traefik.docker.network=${NETWORK_NAME} - - traefik.http.routers.asciinema.rule=Host(`${ASCIINEMA_TRAEFIK_HOST}`) - - traefik.http.routers.asciinema.entrypoints=web-secure - - traefik.http.routers.asciinema.tls=true - - traefik.http.routers.asciinema.tls.certresolver=letsencrypt - - traefik.http.services.asciinema.loadbalancer.server.port=4000 - - traefik.http.routers.asciinema.middlewares=compress@file - - com.centurylinklabs.watchtower.enable=true - depends_on: - - postgres - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:4000/health"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 40s + - 'traefik.enable=${ASCIINEMA_TRAEFIK_ENABLED}' + # HTTP to HTTPS redirect + - 'traefik.http.middlewares.${ASCIINEMA_COMPOSE_PROJECT_NAME}-redirect-web-secure.redirectscheme.scheme=https' + - 'traefik.http.routers.${ASCIINEMA_COMPOSE_PROJECT_NAME}-web.middlewares=${ASCIINEMA_COMPOSE_PROJECT_NAME}-redirect-web-secure' + - 'traefik.http.routers.${ASCIINEMA_COMPOSE_PROJECT_NAME}-web.rule=Host(`${ASCIINEMA_TRAEFIK_HOST}`)' + - 'traefik.http.routers.${ASCIINEMA_COMPOSE_PROJECT_NAME}-web.entrypoints=web' + # HTTPS router + - 'traefik.http.routers.${ASCIINEMA_COMPOSE_PROJECT_NAME}-web-secure.rule=Host(`${ASCIINEMA_TRAEFIK_HOST}`)' + - 'traefik.http.routers.${ASCIINEMA_COMPOSE_PROJECT_NAME}-web-secure.tls.certresolver=resolver' + - 'traefik.http.routers.${ASCIINEMA_COMPOSE_PROJECT_NAME}-web-secure.entrypoints=web-secure' + - 'traefik.http.middlewares.${ASCIINEMA_COMPOSE_PROJECT_NAME}-compress.compress=true' + - 'traefik.http.routers.${ASCIINEMA_COMPOSE_PROJECT_NAME}-web-secure.middlewares=${ASCIINEMA_COMPOSE_PROJECT_NAME}-compress,security-headers@file' + # Service + - 'traefik.http.services.${ASCIINEMA_COMPOSE_PROJECT_NAME}.loadbalancer.server.port=4000' + - 'traefik.docker.network=${NETWORK_NAME}' + # Watchtower + - 'com.centurylinklabs.watchtower.enable=${WATCHTOWER_LABEL_ENABLE}' volumes: asciinema_data: name: ${ASCIINEMA_COMPOSE_PROJECT_NAME}_data + +networks: + compose_network: + name: ${NETWORK_NAME} + external: true