diff --git a/.env.example b/.env.example index 46f3dfcd89f8be34b9a66b545141ea3865a5db8e..255dd99cdf0cc2d64110c3ceffcc851cc27b1dee 100644 --- a/.env.example +++ b/.env.example @@ -1,30 +1,41 @@ NODE_ENV=development # db config +# Machine that hosts the database DB_HOST=localhost -MAILER_HOST=smtp.c3sl.ufpr.br -MAILER_PORT=25 DB_USER=postgres DB_PASSWORD=postgres DB_NAME=hono_db DB_PORT=5433 +# Usually a URL is used for connections DB_URL=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME} -URL=https://mecred.c3sl.ufpr.br/ -# secret -APP_SECRET= +# Mailer config +# Mailer service address +MAILER_HOST=smtp.c3sl.ufpr.br +# Mailer service port +MAILER_PORT=25 +# URL used for email riderecting, this should be the frontend site name like "https://mecred.c3sl.ufpr.br" +URL=EmailURL + +# secret used for JWT and crypt +APP_SECRET=VeryLongUniqueSecret -#s3 +#s3 config AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_REGION=default -S3_BUCKET=mecredteste +S3_BUCKET=BucketName +# ElasticSearch config ELASTICSEARCH_USER=elastic -ELASTICSEARCH_PASSWORD=123 +ELASTICSEARCH_PASSWORD=ChangeThis ELASTICSEARCH_HOST=localhost ELASTICSEARCH_PORT=9200 ELASTICSEARCH_URL=http://${ELASTICSEARCH_USER}:${ELASTICSEARCH_PASSWORD}@${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT} + +# ES Index config +# Index can be anything, as long as it identifies who is indexing ELASTIC_INDEX_PREFIX= ELASTIC_INDEX_RESOURCES=${ELASTIC_INDEX_PREFIX}_resources ELASTIC_INDEX_COLLECTIONS=${ELASTIC_INDEX_PREFIX}_collections diff --git a/bun.lockb b/bun.lockb index 07d65b227b112081b8a5c9b3bf38892687972d65..10a4490e6fafd56fcb781b598b737b0f6840c33c 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/src/search/index.ts b/src/search/index.ts index 3269b06dd5f6f0d5be213f3c87eefc2eef590fb1..4d209a0d82e7f2b10fd400f4dbf3a2663445d85e 100644 --- a/src/search/index.ts +++ b/src/search/index.ts @@ -6,6 +6,11 @@ import { Container } from 'typedi' export const es = new Client({ node: env.ELASTICSEARCH_URL, Connection: HttpConnection, + tls: { + // This ignores TLS. This can only be used when ES is protected behind + // a firewall, like in c3sl. Otherwise this has to use certs. + rejectUnauthorized: false + } }) // Register the Elasticsearch client in the DI container @@ -26,4 +31,4 @@ checkElasticsearchConnection() export type es = typeof es -export default es \ No newline at end of file +export default es