diff --git a/.gitignore b/.gitignore index a7ae3e7..6526594 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,9 @@ .idea/ client/.next data/ +docker-compose.yml config.js .DS_Store dist/ -letsencrypt/ \ No newline at end of file +letsencrypt/ +traefik.yml diff --git a/api/Dockerfile b/api/Dockerfile index 3d12460..df94a6e 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,9 +1,9 @@ FROM node:16-alpine ENV NODE_ENV=production ENV SENTRY_DSN="https://9b9761216607428180ea3b32bd1c8e58@o140996.ingest.sentry.io/4504645996576768" -LABEL org.opencontainers.image.source=https://github.com/tdjsnelling/sqtracker +LABEL org.opencontainers.image.source=https://github.com/Rasbj/sqtracker WORKDIR /sqtracker/app COPY . . RUN yarn install EXPOSE 3001 -CMD yarn start \ No newline at end of file +CMD yarn start diff --git a/api/src/index.js b/api/src/index.js index 4c27291..7c25f97 100644 --- a/api/src/index.js +++ b/api/src/index.js @@ -119,8 +119,8 @@ validateConfig(config).then(() => { // prevent avoiding a client spoofing this to avoid the limit, we also verify // a secret only available to the server const limiter = ratelimit({ - windowMs: 1000 * 60, - max: 30, + windowMs: 1000 * 30, + max: 150, keyGenerator: (req) => { if ( req.headers["x-forwarded-for"] && diff --git a/docker-compose.yml b/docker-compose.example.yml similarity index 82% rename from docker-compose.yml rename to docker-compose.example.yml index 0a7cdb6..a0f2a95 100644 --- a/docker-compose.yml +++ b/docker-compose.example.yml @@ -11,15 +11,18 @@ services: - "--entrypoints.web.address=:443" - "--entryPoints.web.proxyProtocol.insecure" - "--entryPoints.web.forwardedHeaders.insecure" - - "--certificatesresolvers.tlsresolver.acme.email=email@example.com" + - "--certificatesresolvers.tlsresolver.acme.email=admin@example.com" - "--certificatesresolvers.tlsresolver.acme.storage=/letsencrypt/acme.json" - "--certificatesresolvers.tlsresolver.acme.httpchallenge=true" - "--certificatesresolvers.tlsresolver.acme.httpchallenge.entrypoint=webinsecure" + - "--accesslog=true" + - "--accesslog.filePath=/var/log/traefik/access.log" ports: - "80:80" - "443:443" - "8080:8080" volumes: + - "/var/log/traefik/:/var/log/traefik/" - "/var/run/docker.sock:/var/run/docker.sock:ro" - ./letsencrypt:/letsencrypt - ./traefik.yml:/config/traefik.yml @@ -46,7 +49,7 @@ services: - "127.0.0.1:3000:3000" volumes: - ./config.js:/sqtracker/config.js - # - ./favicon.png:/sqtracker/public/favicon.png - # - ./favicon.ico:/sqtracker/public/favicon.ico + #- ./favicon.png:/sqtracker/client/public/favicon.png + #- ./favicon.ico:/sqtracker/client/public/favicon.ico depends_on: - api diff --git a/traefik.yml b/traefik.example.yml similarity index 100% rename from traefik.yml rename to traefik.example.yml