From 71f08d6cf053384c51dbda8304d551af28513a97 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 5 May 2024 17:21:19 +0200 Subject: [PATCH 1/5] Enhance env file --- conf/.env.example | 9 +++++++-- conf/systemd.service | 1 + scripts/_common.sh | 2 -- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index b4d7b7e..b5c02db 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -1,7 +1,10 @@ # Create .env from this example file and replace values for the environment. # The application expects a separate .env.test for test environment configuration -TOOLJET_HOST=https://__DOMAIN____PATH__ +NODE_ENV=production + +TOOLJET_HOST=https://__DOMAIN__ +SUB_PATH=__PATH__/ LOCKBOX_MASTER_KEY=__LOCKBOX_MASTER_KEY__ SECRET_KEY_BASE=__SECRET_KEY_BASE__ PORT=__PORT__ @@ -20,7 +23,9 @@ CHECK_FOR_UPDATES=0 # EMAIL CONFIGURATION DEFAULT_FROM_EMAIL=__APP__@__DOMAIN__ -SMTP_DOMAIN=__MAIN_DOMAIN__ +SMTP_USERNAME=__APP__ +SMTP_PASSWORD=__MAIL_PWD__ +SMTP_DOMAIN=__DOMAIN__ SMTP_PORT=25 # DISABLE USER SIGNUPS (true or false). Default: true diff --git a/conf/systemd.service b/conf/systemd.service index 14d602e..63fd9c7 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,6 +8,7 @@ User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ Environment="__YNH_NODE_LOAD_PATH__" +EnvironmentFile=__INSTALL_DIR__/.env ExecStart=__YNH_NPM__ run start:prod StandardOutput=journal StandardError=inherit diff --git a/scripts/_common.sh b/scripts/_common.sh index 3ee64f3..f227381 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,8 +7,6 @@ NODEJS_VERSION="18.18.2" NPM_VERSION="9.8.1" -main_domain=$(cat /etc/yunohost/current_host) - #================================================= # PERSONAL HELPERS #================================================= From 2feeb57323a4ddeaeb580beda57f31a9f80325e3 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 5 May 2024 18:08:09 +0200 Subject: [PATCH 2/5] Remove full_domain key in manifest --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ea5ce7f..98c9036 100644 --- a/manifest.toml +++ b/manifest.toml @@ -28,7 +28,6 @@ ram.runtime = "300M" [install] [install.domain] type = "domain" - full_domain = true [install.init_main_permission] type = "group" From e217e37b29e43c3ce00c0edcb0d3b7fbeec16a2e Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 5 May 2024 18:13:10 +0200 Subject: [PATCH 3/5] Disable SSL for smtp --- conf/.env.example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/.env.example b/conf/.env.example index b5c02db..68aa9dd 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -25,8 +25,9 @@ CHECK_FOR_UPDATES=0 DEFAULT_FROM_EMAIL=__APP__@__DOMAIN__ SMTP_USERNAME=__APP__ SMTP_PASSWORD=__MAIL_PWD__ -SMTP_DOMAIN=__DOMAIN__ +SMTP_DOMAIN=127.0.0.1 SMTP_PORT=25 +SMTP_SSL=false # DISABLE USER SIGNUPS (true or false). Default: true DISABLE_SIGNUPS= From 518e1b32099318e3e85f6cf97ba26d0b2a0de034 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 5 May 2024 18:26:35 +0200 Subject: [PATCH 4/5] :blue_book::worm: add g++ dependency --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 98c9036..27aab55 100644 --- a/manifest.toml +++ b/manifest.toml @@ -55,7 +55,7 @@ ram.runtime = "300M" main.default = 8095 [resources.apt] - packages = "postgresql, postgresql-contrib" + packages = "g++, postgresql, postgresql-contrib" [resources.database] type = "postgresql" From 091668e048e1ed9dce3dfe4e642d2cbd76406036 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 5 May 2024 18:45:46 +0200 Subject: [PATCH 5/5] Set SMTP domain not to localhost --- conf/.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env.example b/conf/.env.example index 68aa9dd..04c22f9 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -25,7 +25,7 @@ CHECK_FOR_UPDATES=0 DEFAULT_FROM_EMAIL=__APP__@__DOMAIN__ SMTP_USERNAME=__APP__ SMTP_PASSWORD=__MAIL_PWD__ -SMTP_DOMAIN=127.0.0.1 +SMTP_DOMAIN=__DOMAIN__ SMTP_PORT=25 SMTP_SSL=false