diff --git a/.env.development b/.env.development index e0a13d7..2613c5d 100644 --- a/.env.development +++ b/.env.development @@ -1,16 +1,16 @@ NODE_ENV=development -DOMAIN=bitmill.io +DOMAIN=brf.lkm.nu PROTOCOL=https HOSTNAME=brf.local PORT=null FASTIFY_HOST=0.0.0.0 -FASTIFY_PORT=1337 +FASTIFY_PORT=3080 LOG_LEVEL=debug LOG_STREAM=console PGHOST=postgres PGPORT=5432 -PGDATABASE=brf_books -PGUSER=brf_books -PGPASSWORD=brf_books +PGDATABASE=brf +PGUSER=brf +PGPASSWORD=brf REDIS_HOST=redis VITE_HMR_PROXY=true diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..ab2d417 --- /dev/null +++ b/.env.production @@ -0,0 +1,13 @@ +NODE_ENV=production +DOMAIN=brf.lkm.nu +PROTOCOL=https +HOSTNAME=brf.lkm.nu +PORT=null +FASTIFY_HOST=localhost +FASTIFY_PORT=3080 +LOG_LEVEL=debug +LOG_STREAM=console +PGHOST=/run/postgresql +PGDATABASE=brf +REDIS_HOST=/run/redis/redis.sock +VITE_HMR_PROXY=false diff --git a/.env.testing b/.env.testing index cb032f9..c045dce 100644 --- a/.env.testing +++ b/.env.testing @@ -1,5 +1,5 @@ NODE_ENV=testing -DOMAIN=bitmill.io +DOMAIN=brf.lkm.nu PROTOCOL=https HOSTNAME=brf.local PORT=null @@ -9,9 +9,9 @@ LOG_LEVEL=debug LOG_STREAM=console PGHOST=localhost PGPORT=5432 -PGDATABASE=brf_books -PGUSER=brf_books -PGPASSWORD=brf_books +PGDATABASE=brf +PGUSER=brf +PGPASSWORD=brf REDIS_HOST=null VITE_HMR_PROXY=false MAILGUN_API_KEY=not_a_valid_key diff --git a/Dockerfile b/Dockerfile index 9649a8c..73d4f76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,8 @@ RUN groupmod -g $GID node RUN usermod -u $UID -g node node USER node -RUN mkdir /home/node/brf_books -WORKDIR /home/node/brf_books +RUN mkdir /home/node/brf +WORKDIR /home/node/brf COPY --chown=node pnpm-lock.yaml package.json . RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 35feab6..1eea2fc 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -21,9 +21,9 @@ services: image: postgres:18-alpine restart: always environment: - - POSTGRES_DB=brf_books - - POSTGRES_USER=brf_books - - POSTGRES_PASSWORD=brf_books + - POSTGRES_DB=brf + - POSTGRES_USER=brf + - POSTGRES_PASSWORD=brf volumes: - ./docker/postgres:/docker-entrypoint-initdb.d - postgres:/var/lib/postgresql/data diff --git a/docker-compose.local.yml b/docker-compose.local.yml index bb4afc2..17cb0e8 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -8,3 +8,10 @@ services: service: postgres ports: - ${PG_EXTERNAL_PORT-5432}:5432 + + redis: + extends: + file: docker-compose.base.yml + service: redis + ports: + - ${PG_EXTERNAL_PORT-6379}:6379 diff --git a/docker-compose.yml b/docker-compose.yml index 526cea1..9658539 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,14 +15,15 @@ services: ports: - 24678:24678 volumes: - - ./client:/home/node/brf_books/client - - ./server:/home/node/brf_books/server - - ./uploads:/home/node/brf_books/uploads + - ./client:/home/node/brf/client + - ./server:/home/node/brf/server + - ./uploads:/home/node/brf/uploads depends_on: - postgres - redis env_file: - ./.env.development + - ./.env.secrets caddy: extends: diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index cb07090..cf032b6 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -8,7 +8,7 @@ brf.local { } reverse_proxy @ws node:24678 - reverse_proxy node:1337 { + reverse_proxy node:3080 { lb_try_duration 30s lb_try_interval 1s } diff --git a/docker/postgres/dump.py b/docker/postgres/dump.py index 2a1b8b6..dca92f8 100755 --- a/docker/postgres/dump.py +++ b/docker/postgres/dump.py @@ -45,7 +45,7 @@ parser.add_argument('--accounting', action='store_true') parser.add_argument('tables', type=str, nargs='*', help='The tables to dump') args = parser.parse_args() -command = ['docker-compose', 'exec', '-T', 'postgres', 'pg_dump', '-U', 'brf_books', '-d', 'brf_books', '-O'] +command = ['docker-compose', 'exec', '-T', 'postgres', 'pg_dump', '-U', 'brf', '-d', 'brf', '-O'] for enabled, tables in [ (args.tables, args.tables), diff --git a/package.json b/package.json index 17d1df8..1b50454 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,15 @@ { - "name": "brf_books", + "name": "brf", "version": "0.0.1", "main": "server/index.js", "type": "module", - "repository": "git@git.bitmill.io:bitmill/brf_books.git", + "repository": "git@git.bitmill.io:lkm/brf.git", "author": "Linus Miller ", "license": "MIT", "private": true, "scripts": { "build": "pnpm run build:client && pnpm run build:server", - "build:client": "vite build", + "build:client": "VITE_ENTRY=public vite build && VITE_ENTRY=admin vite build", "build:server": "vite build --ssr", "clean": "rm -r dist", "format": "prettier --write .", diff --git a/server/config/mailgun.ts b/server/config/mailgun.ts index 1d5eb86..87f5db3 100644 --- a/server/config/mailgun.ts +++ b/server/config/mailgun.ts @@ -1,6 +1,6 @@ import env from '../env.ts' export default { - url: 'https://api.mailgun.net/v3/mg.bitmill.io/messages', + url: 'https://api.eu.mailgun.net/v3/mg.lkm.nu/messages', key: env.MAILGUN_API_KEY, } diff --git a/server/config/site.ts b/server/config/site.ts index 60b167c..c9532db 100644 --- a/server/config/site.ts +++ b/server/config/site.ts @@ -15,7 +15,7 @@ export default { return `${this.protocol}://${this.host}/` }, emails: { - robot: `no-reply@bitmill.io`, - info: 'contact@bitmill.io', + robot: `no-reply@${env.DOMAIN}`, + info: `contact@${env.DOMAIN}`, }, } diff --git a/server/plugins/vite/production.ts b/server/plugins/vite/production.ts index 9854d9a..c122f0e 100644 --- a/server/plugins/vite/production.ts +++ b/server/plugins/vite/production.ts @@ -16,6 +16,7 @@ export default async function viteProduction(fastify: FastifyInstance, config: P fastify.register(fstatic, { root: viteConfig.build.outDir, wildcard: false, + decorateReply: false, }) fastify.decorateReply('ctx', null) diff --git a/vite.config.js b/vite.config.js index d31f146..b28e4d9 100644 --- a/vite.config.js +++ b/vite.config.js @@ -23,7 +23,7 @@ export default defineConfig(({ isSsrBuild }) => { }, server: { allowedHosts: ['brf.local'], - port: 1338, + port: 3081, hmr: process.env.VITE_HMR_PROXY ? { clientPort: 443,