Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ SMTP_HOST=your.smtpserver.com
SMTP_PORT=587
SMTP_USER=yoursmtpuser
SMTP_PASS=yoursmtppassword
SMTP_REJECT_UNAUTHORIZED=false
ADMIN_EMAIL=adminaccountemail@example.com
EMAIL_SENDER=automatedemailfromaddress@example.com
HOME_URL=your.domain.com
Expand Down
9 changes: 6 additions & 3 deletions ON_PREM_DEPLOYMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ Nginx Proxy Manager should not be exposed to the internet. It is recommended to

Find the container ID of the mongo container with `docker ps` and then run `docker exec -it <container-id> /bin/bash` to get a terminal within the container. From there you can run `mongosh` to connect to the database.

Alternatively, you can download [mongosh](https://www.mongodb.com/try/download/shell) and connect directly as:

```
mongosh "mongodb://127.0.0.1:27017/dpdmongo?directConnection=true&serverSelectionTimeoutMS=2000&appName=mongosh+2.3.8"
```

### 2. Importing charts, configs, users

Due to Gnar company's changes in database structure, [this](https://github.com/AMP-SCZ/utility/blob/f84e3d5a211d5e10020c670994dd78e79f07fb17/dpdash_ci_cd/dpdash_ci_cd.sh#L22-L29) method of `mongoimport` no longer works. The new method is:
Expand All @@ -145,9 +151,6 @@ The trailing JSONs can be obtained from rc-predict.partners.org's `mongoexport`.

</details>

```

```

### 2. Importing data

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ services:
networks:
- app-tier
# Expose port for Nginx Proxy Manager to access
expose:
- 8000
ports:
- 8000:8000
environment:
- HOME_URL=https://dpdash.local

Expand Down
5 changes: 5 additions & 0 deletions server/mailer/BaseMailer.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
user: process.env.SMTP_USER,
pass: process.env.SMTP_PASS,
},
tls: {
// to not fail on invalid certs:
// set SMTP_REJECT_UNAUTHORIZED=false in .env file
rejectUnauthorized: process.env.SMTP_REJECT_UNAUTHORIZED == 'true',

Check warning on line 28 in server/mailer/BaseMailer.js

View workflow job for this annotation

GitHub Actions / Test on Node latest and ubuntu-latest

Expected '===' and instead saw '=='

Check warning on line 28 in server/mailer/BaseMailer.js

View workflow job for this annotation

GitHub Actions / Test on Node latest and ubuntu-latest

Insert `⏎···············`

Check warning on line 28 in server/mailer/BaseMailer.js

View workflow job for this annotation

GitHub Actions / Test on Node latest and ubuntu-latest

Expected '===' and instead saw '=='

Check warning on line 28 in server/mailer/BaseMailer.js

View workflow job for this annotation

GitHub Actions / Test on Node latest and ubuntu-latest

Insert `⏎···············`
},
})

return await transporter.sendMail({
Expand Down
1 change: 0 additions & 1 deletion server/services/FiltersService/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export const FILTER_TO_MONGO_VALUE_MAP = {
Missing: null,
Recruited: 'recruited',
'Not recruited': 'not recruited',
Excluded: 0,
Male: 1,
Female: 2,
}
Expand Down
Loading