twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-12-30 15:53:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Updating server configuration (#145)

Browse Source 
Update server deploy staging
This commit is contained in:
Charles Bochet 2023-05-26 16:30:41 +02:00 committed by GitHub
parent 26d3716ae7
commit 29fb781c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/prod/server/Dockerfile
View File

@ -1,7 +1,5 @@
FROM node:18.16.0-alpine as server FROM node:18.16.0-alpine as server
ARG SERVER_DATABASE_URL
WORKDIR /app/server WORKDIR /app/server
COPY ./server/package.json ./ COPY ./server/package.json ./
COPY ./server/package-lock.json ./ COPY ./server/package-lock.json ./

6
server/.env.example
View File

@ -1,7 +1,7 @@
AUTH_GOOGLE_CLIENT_ID=REPLACE_ME AUTH_GOOGLE_CLIENT_ID=REPLACE_ME
AUTH_GOOGLE_SECRET=REPLACE_ME AUTH_GOOGLE_CLIENT_SECRET=REPLACE_ME
AUTH_GOOGLE_CALLBACK_URL='http://localhost:3000/google/redirect' AUTH_GOOGLE_CALLBACK_URL=http://localhost:3000/google/redirect
JWT_SECRET=secret_jwt JWT_SECRET=secret_jwt
JWT_EXPIRES_IN=300 JWT_EXPIRES_IN=300
SERVER_DATABASE_URL=postgres://postgres:postgrespassword@postgres:5432/default?connection_limit=1 PG_DATABASE_URL=postgres://postgres:postgrespassword@postgres:5432/default?connection_limit=1
FRONT_AUTH_CALLBACK_URL=http://localhost:3001/auth/callback FRONT_AUTH_CALLBACK_URL=http://localhost:3001/auth/callback

2
server/src/auth/strategies/google.auth.strategy.ts
View File

@ -10,7 +10,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
constructor(configService: ConfigService) { constructor(configService: ConfigService) {
super({ super({
clientID: configService.get<string>('AUTH_GOOGLE_CLIENT_ID'), clientID: configService.get<string>('AUTH_GOOGLE_CLIENT_ID'),
clientSecret: configService.get<string>('AUTH_GOOGLE_SECRET'), clientSecret: configService.get<string>('AUTH_GOOGLE_CLIENT_SECRET'),
callbackURL: configService.get<string>('AUTH_GOOGLE_CALLBACK_URL'), callbackURL: configService.get<string>('AUTH_GOOGLE_CALLBACK_URL'),
scope: ['email', 'profile'], scope: ['email', 'profile'],
}); });

2
server/src/database/schema.prisma
View File

@ -5,7 +5,7 @@ generator client {
datasource db { datasource db {
provider = "postgresql" provider = "postgresql"
url = env("SERVER_DATABASE_URL") url = env("PG_DATABASE_URL")
} }
generator nestgraphql { generator nestgraphql {