From b7aa3298e5e2b3cf82f45e09ce6ea2ff66310553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 13:41:33 +0200 Subject: [PATCH 1/5] Update tests.toml --- tests.toml | 62 ------------------------------------------------------ 1 file changed, 62 deletions(-) diff --git a/tests.toml b/tests.toml index 26bb7e4..94abb79 100644 --- a/tests.toml +++ b/tests.toml @@ -3,65 +3,3 @@ test_format = 1.0 [default] - - # ------------ - # Tests to run - # ------------ - - # NB: the tests to run are automatically deduced by the CI script according to the - # content of the app's manifest. The declarations below allow to customize which - # tests are ran, possibly add special test suite to test special args, or - # declare which commits to test upgrade from. - # - # You can also decide (though this is discouraged!) to ban/ignore some tests, - - exclude = ["install.private", "install.multi"] - # The test IDs to be used in only/exclude statements are: - # * install.root - # * install.subdir - # * install.nourl - # * install.multi - # * backup_restore - # * upgrade - # * upgrade.someCommitId - # * change_url - # NB: you should NOT need this except if you really have a good reason... - - # For special usecases, sometimes you need to setup other things on the machine - # prior to installing the app (such as installing another app) - # (Remove this key entirely if not needed) - preinstall = """ - sudo yunohost app install foobar - sudo yunohost user list - """ - - # ------------------------------- - # Default args to use for install - # ------------------------------- - - # By default, the CI will automagically fill the 'standard' args - # such as domain, path, admin, is_public and password with relevant values - # and also install args with a "default" provided in the manifest.. - # It should only make sense to declare custom args here for args with no default values - - args.language = "fr_FR" - args.multisite = 0 - # NB: you should NOT need those lines unless for custom questions with no obvious/default value - - # ------------------------------- - # Commits to test upgrade from - # ------------------------------- - - test_upgrade_from.00a1a6e7.name = "Upgrade from 5.4" - test_upgrade_from.00a1a6e7.args.foo = "bar" - - -# This is an additional test suite -[some_additional_testsuite] - - # On additional tests suites, you can decide to run only specific tests - - only = ["install.subdir"] - - args.language = "en_GB" - args.multisite = 1 From cb07c4f6cfcb8007fa9a85679a119ea024990530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 13:47:39 +0200 Subject: [PATCH 2/5] Update database.json --- conf/database.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/conf/database.json b/conf/database.json index e3e2ca6..efdf529 100644 --- a/conf/database.json +++ b/conf/database.json @@ -1,6 +1,14 @@ { - "OmbiDatabase": { - "Type":"MySQL", - "ConnectionString":"Server=localhost;Port=3306;Database=__DB_NAME__;User=__DB_USER__;Password=__DB_PWD__" +"OmbiDatabase": { + "Type": "MySQL", + "ConnectionString": "Server=localhost;Port=3306;Database=__DB_NAME__;User=__DB_USER__;Password=__DB_PWD__" + }, +"SettingsDatabase": { + "Type": "MySQL", + "ConnectionString": "Server=localhost;Port=3306;Database=__DB_NAME__;User=__DB_USER__;Password=__DB_PWD__" + }, +"ExternalDatabase": { + "Type": "MySQL", + "ConnectionString": "Server=localhost;Port=3306;Database=__DB_NAME__;User=__DB_USER__;Password=__DB_PWD__" } } From d3a5a02bb24ef853027eb2205815f2335472c97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 13:50:53 +0200 Subject: [PATCH 3/5] Update nginx.conf --- conf/nginx.conf | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 12bc97e..af69dcd 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,30 +1,15 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - client_max_body_size 10m; - client_body_buffer_size 128k; - - # Timeout if the real server is dead - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503; - - # Advanced Proxy Config - send_timeout 5m; - proxy_read_timeout 240; - proxy_send_timeout 240; - proxy_connect_timeout 240; - - # Basic Proxy Config - proxy_set_header Host $host:$server_port; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Host $server_name; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - proxy_redirect http:// $scheme://; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_cache_bypass $cookie_session; - proxy_no_cache $cookie_session; - proxy_buffers 32 4k; - proxy_pass http://127.0.0.1:__PORT__; -} \ No newline at end of file + proxy_pass http://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; + + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; +} From 97f462c2aead4300d71f17fa926248d7a85eb2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 13:53:10 +0200 Subject: [PATCH 4/5] Revert "Update nginx.conf" This reverts commit d3a5a02bb24ef853027eb2205815f2335472c97e. --- conf/nginx.conf | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index af69dcd..12bc97e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,15 +1,30 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - proxy_pass http://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; - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; -} + client_max_body_size 10m; + client_body_buffer_size 128k; + + # Timeout if the real server is dead + proxy_next_upstream error timeout invalid_header http_500 http_502 http_503; + + # Advanced Proxy Config + send_timeout 5m; + proxy_read_timeout 240; + proxy_send_timeout 240; + proxy_connect_timeout 240; + + # Basic Proxy Config + proxy_set_header Host $host:$server_port; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Host $server_name; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + proxy_redirect http:// $scheme://; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_cache_bypass $cookie_session; + proxy_no_cache $cookie_session; + proxy_buffers 32 4k; + proxy_pass http://127.0.0.1:__PORT__; +} \ No newline at end of file From 65b864484b9fcad0b3b90725eb1a994aff94b791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:00:19 +0200 Subject: [PATCH 5/5] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5f83177..741bd9a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,7 +29,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" + ynh_setup_source --dest_dir="$install_dir" --keep="database.json" fi chown -R $app:www-data "$install_dir"