diff --git a/api/src/swagger.ts b/api/src/swagger.ts index ac2c6ca..e572cc2 100644 --- a/api/src/swagger.ts +++ b/api/src/swagger.ts @@ -4,7 +4,7 @@ import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; export const setupSwagger = (app: INestApplication) => { const options = new DocumentBuilder() .setTitle('Klubitus API') - .setSchemes('https') + // .setSchemes('https') .addTag('Events', 'Event calendar') .addTag('Forum', 'Discussion forums') .addTag('Images', 'Image galleries') diff --git a/docker-compose.yml b/docker-compose.yml index 20429fe..65ac9ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,13 +19,11 @@ services: - web restart: always volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ./traefik/traefik.toml:/traefik.toml + - "/var/run/docker.sock:/var/run/docker.sock:ro" + - ./traefik/traefik.yml:/traefik.yml - ./traefik/acme.json:/acme.json labels: - - "traefik.backend=dashboard" - - "traefik.enable=true" - - "traefik.frontend.rule=Host:${DASHBOARD_HOST}" + - "traefik.http.routers.dashboard.rule=Host(`${DASHBOARD_HOST}`)" - "traefik.port=${DASHBOARD_PORT}" db: @@ -88,10 +86,10 @@ services: expose: - ${API_PORT} labels: - - "traefik.backend=api" - "traefik.docker.network=web" - "traefik.enable=true" - - "traefik.frontend.rule=Host:${API_HOST}" + - "traefik.http.routers.api.rule=Host(`${API_HOST}`)" +# - "traefik.http.routers.default.tls.certresolver=default" - "traefik.port=${API_PORT}" depends_on: - reverse-proxy @@ -111,7 +109,8 @@ services: environment: - API_HOST - API_PORT - - "API_URL_BROWSER=https://${API_HOST}" + - API_PROTOCOL + - "API_URL_BROWSER=${API_PROTOCOL}://${API_HOST}" - AWS_BUCKET - CLIENT_HOST - CLIENT_PORT @@ -125,10 +124,9 @@ services: expose: - ${CLIENT_PORT} labels: - - "traefik.backend=client" - "traefik.docker.network=web" - "traefik.enable=true" - - "traefik.frontend.rule=Host:${CLIENT_HOST}" + - "traefik.http.routers.client.rule=Host(`${CLIENT_HOST}`)" - "traefik.port=${CLIENT_PORT}" depends_on: - reverse-proxy diff --git a/traefik/acme.json b/traefik/acme.json new file mode 100644 index 0000000..e69de29 diff --git a/traefik/traefik.yml b/traefik/traefik.yml new file mode 100644 index 0000000..46b46cc --- /dev/null +++ b/traefik/traefik.yml @@ -0,0 +1,45 @@ +global: + checkNewVersion: true + +log: + level: INFO + + +entryPoints: + http: + address: :80 + https: + address: :443 + +http: + routers: + dashboard: + service: api@internal + + api: + entryPoints: + - http + # - https + + client: + entryPoints: + - http +# - https + + +providers: + docker: + exposedByDefault: false + +# Dashboard +api: + insecure: true + +# Let's Encrypt +certificatesResolvers: + default: + acme: + email: anqqa@klubitus.org + storage: acme.json + httpChallenge: + entryPoint: http