From d2d694caedbc400a00c382857531d7a8c40d94a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 00:13:55 +0200 Subject: [PATCH 1/8] fix --- conf/config.php | 6 +++--- manifest.toml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/config.php b/conf/config.php index 1060ce3..f38a763 100644 --- a/conf/config.php +++ b/conf/config.php @@ -42,7 +42,7 @@ define('FILES_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'files'); define('MAIL_CONFIGURATION', true); // E-mail address used for the "From" header (notifications) -define('MAIL_FROM', '__EMAIL__'); +define('MAIL_FROM', '__APP__@__DOMAIN__'); // E-mail address used for the "Bcc" header to send a copy of all notifications define('MAIL_BCC', ''); @@ -53,8 +53,8 @@ define('MAIL_TRANSPORT', 'mail'); // SMTP configuration to use when the "smtp" transport is chosen define('MAIL_SMTP_HOSTNAME', 'localhost'); define('MAIL_SMTP_PORT', 25); -define('MAIL_SMTP_USERNAME', ''); -define('MAIL_SMTP_PASSWORD', ''); +define('MAIL_SMTP_USERNAME', '__APP__'); +define('MAIL_SMTP_PASSWORD', '__MAIL_PWD__'); define('MAIL_SMTP_ENCRYPTION', null); // Valid values are "null", "ssl" or "tls" // Sendmail command to use when the transport is "sendmail" diff --git a/manifest.toml b/manifest.toml index d44c71d..c2a3df8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -51,7 +51,8 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_tag" [resources.system_user] - + allow_email = true + [resources.install_dir] [resources.permissions] From 8e84dd99f03fad66ead74a6bb92bf96a9edfb7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:15:10 +0200 Subject: [PATCH 2/8] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 1af8129..d6b79f8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - main.auth_header = false + #main.auth_header = false ics.url = "/?controller=ICalendarController" ics.show_tile = false ics.allowed = "visitors" From 7ca19cb1b06103e960e9f96a0e374f320e407334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:21:43 +0200 Subject: [PATCH 3/8] Update config.php --- conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.php b/conf/config.php index f38a763..74318d9 100644 --- a/conf/config.php +++ b/conf/config.php @@ -48,7 +48,7 @@ define('MAIL_FROM', '__APP__@__DOMAIN__'); define('MAIL_BCC', ''); // Mail transport available: "smtp", "sendmail", "mail" (PHP mail function), "postmark", "mailgun", "sendgrid" -define('MAIL_TRANSPORT', 'mail'); +define('MAIL_TRANSPORT', 'smtp'); // SMTP configuration to use when the "smtp" transport is chosen define('MAIL_SMTP_HOSTNAME', 'localhost'); From 4a489302ac55c3f097be11bb1eda0b23f718a42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:47:47 +0200 Subject: [PATCH 4/8] Update config.php --- conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.php b/conf/config.php index e9be97b..4e4fdd3 100644 --- a/conf/config.php +++ b/conf/config.php @@ -42,7 +42,7 @@ define('FILES_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'files'); define('MAIL_CONFIGURATION', true); // E-mail address used for the "From" header (notifications) -define('MAIL_FROM', '__APP__@__DOMAIN__'); +define('MAIL_FROM', 'noreply@__DOMAIN__'); // E-mail address used for the "Bcc" header to send a copy of all notifications define('MAIL_BCC', ''); From f27d05ca6dad0d858168b0dbf81455da83827913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:52:14 +0200 Subject: [PATCH 5/8] fix --- conf/config.php | 2 +- manifest.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.php b/conf/config.php index 4e4fdd3..fefd269 100644 --- a/conf/config.php +++ b/conf/config.php @@ -205,7 +205,7 @@ define('LDAP_GROUP_ATTRIBUTE_NAME', 'cn'); define('LDAP_GROUP_SYNC', true); // Enable/disable the reverse proxy authentication -define('REVERSE_PROXY_AUTH', true); +define('REVERSE_PROXY_AUTH', false); // Header name to use for the username define('REVERSE_PROXY_USER_HEADER', 'REMOTE_USER'); diff --git a/manifest.toml b/manifest.toml index d6b79f8..1af8129 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - #main.auth_header = false + main.auth_header = false ics.url = "/?controller=ICalendarController" ics.show_tile = false ics.allowed = "visitors" From d7b51e7fbb61ca5eb55af77c0ecebf0f425592be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:54:32 +0200 Subject: [PATCH 6/8] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 1af8129..b04c07d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,6 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - main.auth_header = false ics.url = "/?controller=ICalendarController" ics.show_tile = false ics.allowed = "visitors" From dd9f30978468159e01af7554608f3c19b7e22f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:56:57 +0200 Subject: [PATCH 7/8] Update config.php --- conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.php b/conf/config.php index fefd269..4e4fdd3 100644 --- a/conf/config.php +++ b/conf/config.php @@ -205,7 +205,7 @@ define('LDAP_GROUP_ATTRIBUTE_NAME', 'cn'); define('LDAP_GROUP_SYNC', true); // Enable/disable the reverse proxy authentication -define('REVERSE_PROXY_AUTH', false); +define('REVERSE_PROXY_AUTH', true); // Header name to use for the username define('REVERSE_PROXY_USER_HEADER', 'REMOTE_USER'); From d6fb8b4ca01cd670846eeaa5f424d8c69938ee2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:57:59 +0200 Subject: [PATCH 8/8] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 160ea05..3840432 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,7 +65,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config