From 016a95899c697e81ad526d210b90360621c3ff6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:11:00 +0100 Subject: [PATCH 1/9] Update .env --- conf/.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/.env b/conf/.env index f80b51f..4081fb4 100644 --- a/conf/.env +++ b/conf/.env @@ -3,8 +3,8 @@ PROXY_HTTP_ADDR=127.0.0.1:__PORT__ PROXY_TLS=true OCIS_INSECURE=false -#OCIS_HTTP_TLS_CERTIFICATE="/etc/yunohost/certs/__DOMAIN__/crt.pem" -#OCIS_HTTP_TLS_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem" +PROXY_TRANSPORT_TLS_CERT="/etc/yunohost/certs/__DOMAIN__/crt.pem" +PROXY_TRANSPORT_TLS_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem" OCIS_LOG_LEVEL=warn From 2cd7bf00d5570478801346c2705e6c4b7a51f015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:12:42 +0100 Subject: [PATCH 2/9] Update .env --- conf/.env | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/.env b/conf/.env index 4081fb4..d294f8a 100644 --- a/conf/.env +++ b/conf/.env @@ -1,10 +1,7 @@ OCIS_URL=https://__DOMAIN__ PROXY_HTTP_ADDR=127.0.0.1:__PORT__ PROXY_TLS=true -OCIS_INSECURE=false - -PROXY_TRANSPORT_TLS_CERT="/etc/yunohost/certs/__DOMAIN__/crt.pem" -PROXY_TRANSPORT_TLS_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem" +OCIS_INSECURE=true OCIS_LOG_LEVEL=warn From db8362e9697cf45b2adfaf62ec8fc8b0dee9f74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:13:16 +0100 Subject: [PATCH 3/9] Update manifest.toml --- manifest.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 93fcf9b..7287364 100644 --- a/manifest.toml +++ b/manifest.toml @@ -44,9 +44,6 @@ ram.runtime = "50M" choices = ["de", "fr", "en"] default = "fr" - [install.admin] - type = "user" - [install.password] type = "password" From d4a656e70ce88df55500d9c785815a9cfa71390a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:20:54 +0100 Subject: [PATCH 4/9] Update .env --- conf/.env | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/conf/.env b/conf/.env index d294f8a..1fa2f28 100644 --- a/conf/.env +++ b/conf/.env @@ -10,17 +10,15 @@ OCIS_FORCE_CONFIG_OVERWRITE=true OCIS_CONFIG_DIR=__INSTALL_DIR__ OCIS_BASE_DATA_PATH=__DATA_DIR__ - -IDM_ADMIN_PASSWORD=__PASSWORD__ - +#IDM_ADMIN_PASSWORD=__PASSWORD__ OCIS_DEFAULT_LANGUAGE=__LANGUAGE__ #AUTH_BASIC_AUTH_MANAGER=ldap -#OCIS_LDAP_URI=ldap://localhost:9235 -#OCIS_LDAP_USER_BASE_DN="ou=users,dc=yunohost,dc=org" +#OCIS_LDAP_URI=ldap://127.0.0.1:389 +#OCIS_LDAP_USER_BASE_DN='ou=users,dc=yunohost,dc=org' #OCIS_LDAP_GROUP_BASE_DN="ou=groups,dc=yunohost,dc=org" -#OCIS_LDAP_USER_FILTER=(&(|(objectclass=posixAccount))(uid=%uid)(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)) -#OCIS_LDAP_LOGIN_ATTRIBUTES="uid" -#OCIS_LDAP_USER_SCHEMA_MAIL="mail" -#OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME="cn" \ No newline at end of file +#OCIS_LDAP_USER_FILTER='(&(|(objectclass=posixAccount))(uid=%uid)(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))' +#OCIS_LDAP_LOGIN_ATTRIBUTES=uid +#OCIS_LDAP_USER_SCHEMA_MAIL=mail +#OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME=cn From a570d4aeb04d5642f85e12e664d4e35a30e3e774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:25:05 +0100 Subject: [PATCH 5/9] Update .env --- conf/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env b/conf/.env index 1fa2f28..e0f110b 100644 --- a/conf/.env +++ b/conf/.env @@ -17,7 +17,7 @@ OCIS_DEFAULT_LANGUAGE=__LANGUAGE__ #AUTH_BASIC_AUTH_MANAGER=ldap #OCIS_LDAP_URI=ldap://127.0.0.1:389 #OCIS_LDAP_USER_BASE_DN='ou=users,dc=yunohost,dc=org' -#OCIS_LDAP_GROUP_BASE_DN="ou=groups,dc=yunohost,dc=org" +#OCIS_LDAP_GROUP_BASE_DN='ou=groups,dc=yunohost,dc=org' #OCIS_LDAP_USER_FILTER='(&(|(objectclass=posixAccount))(uid=%uid)(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))' #OCIS_LDAP_LOGIN_ATTRIBUTES=uid #OCIS_LDAP_USER_SCHEMA_MAIL=mail From d7b5c8c1999717c9c22f002e5e5cab93c4d19e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:30:11 +0100 Subject: [PATCH 6/9] Update nginx.conf --- conf/nginx.conf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1bf9fb3..764474b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,16 +2,18 @@ location __PATH__/ { proxy_pass https://127.0.0.1:__PORT__; - proxy_redirect off; + #proxy_redirect off; proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; + #proxy_set_header X-Real-IP $remote_addr; + #proxy_set_header X-Forwarded-Proto $scheme; + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + #proxy_set_header X-Forwarded-Host $server_name; + # OIDC Tokens in headers are quite large and can exceed default limits of reverse proxies proxy_buffers 4 256k; proxy_buffer_size 128k; proxy_busy_buffers_size 256k; + # Disable checking of client request body size client_max_body_size 0; } From ad837341817741513d1cfbd05916e2606ea6b27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 14:04:41 +0100 Subject: [PATCH 7/9] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index a0a93fe..4767d8d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep=".ocis ocis.env" + ynh_setup_source --dest_dir="$install_dir" --keep="ocis.env ocis.yaml" fi chmod -R o-rwx "$install_dir" From 26f31a1cd3bb1a54b8f7b814797534f3cdb5ac87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 14:05:26 +0100 Subject: [PATCH 8/9] Update restore --- scripts/restore | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 5660de6..712a42c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod +x $install_dir/ocis From ec34b585c446f9b98ff5291bff3fabcb5db1c90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 14:06:48 +0100 Subject: [PATCH 9/9] Update nginx.conf --- conf/nginx.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 764474b..9e7b372 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,12 +2,7 @@ location __PATH__/ { proxy_pass https://127.0.0.1:__PORT__; - #proxy_redirect off; proxy_set_header Host $host; - #proxy_set_header X-Real-IP $remote_addr; - #proxy_set_header X-Forwarded-Proto $scheme; - #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - #proxy_set_header X-Forwarded-Host $server_name; # OIDC Tokens in headers are quite large and can exceed default limits of reverse proxies proxy_buffers 4 256k;