diff options
-rw-r--r-- | .env.example | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | app/Controllers/Http/ServiceController.js | 8 | ||||
-rw-r--r-- | config/mail.js | 2 | ||||
-rw-r--r-- | docker/README.md | 4 | ||||
-rw-r--r-- | docker/docker-compose.yml | 2 | ||||
-rw-r--r-- | start/events.js | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/.env.example b/.env.example index 6cd9ad3..36ae547 100644 --- a/.env.example +++ b/.env.example | |||
@@ -3,7 +3,7 @@ PORT=3333 | |||
3 | NODE_ENV=development | 3 | NODE_ENV=development |
4 | 4 | ||
5 | APP_NAME=Ferdi-server | 5 | APP_NAME=Ferdi-server |
6 | EXTERNAL_DOMAIN=https://ferdi.domain.tld | 6 | APP_URL=localhost |
7 | 7 | ||
8 | CACHE_VIEWS=false | 8 | CACHE_VIEWS=false |
9 | 9 | ||
@@ -54,7 +54,7 @@ After setting up the docker container we recommend you set up an NGINX reverse p | |||
54 | docker create \ | 54 | docker create \ |
55 | --name=ferdi-server \ | 55 | --name=ferdi-server \ |
56 | -e NODE_ENV=development \ | 56 | -e NODE_ENV=development \ |
57 | -e EXTERNAL_DOMAIN=https://<ferdi-serverdomain> \ | 57 | -e APP_URL=<ferdi-server-url> \ |
58 | -e DB_CONNECTION=<database> \ | 58 | -e DB_CONNECTION=<database> \ |
59 | -e DB_HOST=<yourdbhost> \ | 59 | -e DB_HOST=<yourdbhost> \ |
60 | -e DB_PORT=<yourdbport> \ | 60 | -e DB_PORT=<yourdbport> \ |
diff --git a/app/Controllers/Http/ServiceController.js b/app/Controllers/Http/ServiceController.js index 3ce6acd..ef8b168 100644 --- a/app/Controllers/Http/ServiceController.js +++ b/app/Controllers/Http/ServiceController.js | |||
@@ -98,7 +98,7 @@ class ServiceController { | |||
98 | workspaces: [], | 98 | workspaces: [], |
99 | ...settings, | 99 | ...settings, |
100 | iconUrl: settings.iconId | 100 | iconUrl: settings.iconId |
101 | ? `${Env.get('EXTERNAL_DOMAIN')}/v1/icon/${settings.iconId}` | 101 | ? `${Env.get('APP_URL')}/v1/icon/${settings.iconId}` |
102 | : null, | 102 | : null, |
103 | id: service.serviceId, | 103 | id: service.serviceId, |
104 | name: service.name, | 104 | name: service.name, |
@@ -176,7 +176,7 @@ class ServiceController { | |||
176 | id, | 176 | id, |
177 | name: service.name, | 177 | name: service.name, |
178 | ...newSettings, | 178 | ...newSettings, |
179 | iconUrl: `${Env.get('EXTERNAL_DOMAIN')}/v1/icon/${newSettings.iconId}`, | 179 | iconUrl: `${Env.get('APP_URL')}/v1/icon/${newSettings.iconId}`, |
180 | userId: auth.user.id, | 180 | userId: auth.user.id, |
181 | }, | 181 | }, |
182 | status: ['updated'], | 182 | status: ['updated'], |
@@ -223,7 +223,7 @@ class ServiceController { | |||
223 | id, | 223 | id, |
224 | name: service.name, | 224 | name: service.name, |
225 | ...settings, | 225 | ...settings, |
226 | iconUrl: `${Env.get('EXTERNAL_DOMAIN')}/v1/icon/${settings.iconId}`, | 226 | iconUrl: `${Env.get('APP_URL')}/v1/icon/${settings.iconId}`, |
227 | userId: auth.user.id, | 227 | userId: auth.user.id, |
228 | }, | 228 | }, |
229 | status: ['updated'], | 229 | status: ['updated'], |
@@ -293,7 +293,7 @@ class ServiceController { | |||
293 | workspaces: [], | 293 | workspaces: [], |
294 | ...settings, | 294 | ...settings, |
295 | iconUrl: settings.iconId | 295 | iconUrl: settings.iconId |
296 | ? `${Env.get('EXTERNAL_DOMAIN')}/v1/icon/${settings.iconId}` | 296 | ? `${Env.get('APP_URL')}/v1/icon/${settings.iconId}` |
297 | : null, | 297 | : null, |
298 | id: service.serviceId, | 298 | id: service.serviceId, |
299 | name: service.name, | 299 | name: service.name, |
diff --git a/config/mail.js b/config/mail.js index da41ed4..2518772 100644 --- a/config/mail.js +++ b/config/mail.js | |||
@@ -25,7 +25,7 @@ module.exports = { | |||
25 | smtp: { | 25 | smtp: { |
26 | driver: 'smtp', | 26 | driver: 'smtp', |
27 | pool: true, | 27 | pool: true, |
28 | name: Env.get('EXTERNAL_DOMAIN'), | 28 | name: Env.get('APP_URL'), |
29 | port: Env.get('SMTP_PORT', '2525'), | 29 | port: Env.get('SMTP_PORT', '2525'), |
30 | host: Env.get('SMTP_HOST', 'localhost'), | 30 | host: Env.get('SMTP_HOST', 'localhost'), |
31 | secure: JSON.parse(Env.get('MAIL_SSL', 'false')), | 31 | secure: JSON.parse(Env.get('MAIL_SSL', 'false')), |
diff --git a/docker/README.md b/docker/README.md index 2d5e6ba..3cb49be 100644 --- a/docker/README.md +++ b/docker/README.md | |||
@@ -35,7 +35,7 @@ To create the docker container with the proper parameters: | |||
35 | docker create \ | 35 | docker create \ |
36 | --name=ferdi-server \ | 36 | --name=ferdi-server \ |
37 | -e NODE_ENV=development \ | 37 | -e NODE_ENV=development \ |
38 | -e EXTERNAL_DOMAIN=https://<ferdi-serverdomain> \ | 38 | -e APP_URL=<ferdi-server-url> \ |
39 | -e DB_CONNECTION=<database> \ | 39 | -e DB_CONNECTION=<database> \ |
40 | -e DB_HOST=<yourdbhost> \ | 40 | -e DB_HOST=<yourdbhost> \ |
41 | -e DB_PORT=<yourdbport> \ | 41 | -e DB_PORT=<yourdbport> \ |
@@ -79,7 +79,7 @@ Container images are configured using parameters passed at runtime (such as thos | |||
79 | | :----: | --- | | 79 | | :----: | --- | |
80 | | `-p <port>:3333` | Will map the container's port 3333 to a port on the host, default is 3333. See the [Docker docs](https://docs.docker.com/config/containers/container-networking/) for more information about port mapping | | 80 | | `-p <port>:3333` | Will map the container's port 3333 to a port on the host, default is 3333. See the [Docker docs](https://docs.docker.com/config/containers/container-networking/) for more information about port mapping | |
81 | | `-e NODE_ENV=development` | for specifying Node environment, production or development, default is development **currently this should not be changed**. See the [Docker docs](https://docs.docker.com/) for more information on the use of environmental variables in [Command-line](https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only) and [Docker Compose](https://docs.docker.com/compose/environment-variables/) | | 81 | | `-e NODE_ENV=development` | for specifying Node environment, production or development, default is development **currently this should not be changed**. See the [Docker docs](https://docs.docker.com/) for more information on the use of environmental variables in [Command-line](https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only) and [Docker Compose](https://docs.docker.com/compose/environment-variables/) | |
82 | | `-e EXTERNAL_DOMAIN=https://<ferdi-serverdomain>` | for specifying the external https domain address of the Ferdi-server | | 82 | | `-e APP_URL=<ferdi-server-url>` | for specifying the URL of the Ferdi-server, including `http://` or `https://` as relevant. | |
83 | | `-e DB_CONNECTION=<databasedriver` | for specifying the database being used, default is sqlite, see [below](#supported-databases-and-drivers) for other options | | 83 | | `-e DB_CONNECTION=<databasedriver` | for specifying the database being used, default is sqlite, see [below](#supported-databases-and-drivers) for other options | |
84 | | `-e DB_HOST=<yourdbhost>` | for specifying the database host, default is 127.0.0.1 | | 84 | | `-e DB_HOST=<yourdbhost>` | for specifying the database host, default is 127.0.0.1 | |
85 | | `-e DB_PORT=<yourdbport>` | for specifying the database port, default is 3306 | | 85 | | `-e DB_PORT=<yourdbport>` | for specifying the database port, default is 3306 | |
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 3d3f66d..4902331 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml | |||
@@ -5,7 +5,7 @@ services: | |||
5 | container_name: ferdi-server | 5 | container_name: ferdi-server |
6 | environment: | 6 | environment: |
7 | - NODE_ENV=development | 7 | - NODE_ENV=development |
8 | - EXTERNAL_DOMAIN=localhost | 8 | - APP_URL=localhost |
9 | - DB_CONNECTION=sqlite | 9 | - DB_CONNECTION=sqlite |
10 | - DB_HOST=127.0.0.1 | 10 | - DB_HOST=127.0.0.1 |
11 | - DB_PORT=3306 | 11 | - DB_PORT=3306 |
diff --git a/start/events.js b/start/events.js index b734797..481ad98 100644 --- a/start/events.js +++ b/start/events.js | |||
@@ -8,7 +8,7 @@ Hello ${user.username}, | |||
8 | we received a request to reset your Ferdi account password. | 8 | we received a request to reset your Ferdi account password. |
9 | Use the link below to reset your password. If you didn't requested that your password be reset, please ignore this message. | 9 | Use the link below to reset your password. If you didn't requested that your password be reset, please ignore this message. |
10 | 10 | ||
11 | ${Env.get('EXTERNAL_DOMAIN')}/user/reset?token=${encodeURIComponent(token)} | 11 | ${Env.get('APP_URL')}/user/reset?token=${encodeURIComponent(token)} |
12 | 12 | ||
13 | This message was sent automatically. Please do not reply. | 13 | This message was sent automatically. Please do not reply. |
14 | `; | 14 | `; |