From 8a717936a1471c5166aa5f6b0112c667c269c4d3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 15 Oct 2020 09:43:25 +0200 Subject: [PATCH 01/13] Update nginx.conf --- conf/nginx.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1a25cdf..5f3c860 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -15,10 +15,10 @@ location __PATH__/ { #try_files $uri $uri/ /bludit//bludit/index.php?$args; - #location __PATH__/bl-content/databases/ { deny all; } - #location __PATH__/bl-content/workspaces/ { deny all; } - #location __PATH__/bl-content/pages/ { deny all; } - #location __PATH__/bl-kernel/*.php { deny all; } + location __PATH__/bl-content/databases/ { deny all; } + location __PATH__/bl-content/workspaces/ { deny all; } + location __PATH__/bl-content/pages/ { deny all; } + location __PATH__/bl-kernel/*.php { deny all; } try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { From 7f7b8219641c7ea59ee95cc32d1fc2a33cb16388 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 15 Oct 2020 09:44:31 +0200 Subject: [PATCH 02/13] Update nginx.conf --- conf/nginx.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 5f3c860..0e41766 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -31,6 +31,11 @@ location __PATH__/ { fastcgi_param SCRIPT_FILENAME $request_filename; } + location ~ \.(jpg|jpeg|gif|png|css|js|ico|svg|eot|ttf|woff|woff2|otf)$ { + access_log off; + expires 30d; + } + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } From 2b1bed249d56b701bec00c03180f41d271d259cc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 18 Oct 2020 12:15:37 +0200 Subject: [PATCH 03/13] Add issue template --- issue_template.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 issue_template.md diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 0000000..36ef360 --- /dev/null +++ b/issue_template.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Make sure you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *In doubt, ask here and we will figure it out together.* +3. *Delete these italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install bludit + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* From c0d5b1dfa54db2d8b8a1c496ae26bbae7f4005d3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 18 Oct 2020 12:21:33 +0200 Subject: [PATCH 04/13] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 0e41766..be77c05 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,7 +11,7 @@ location __PATH__/ { index index.php; - if (!-e $request_filename) { rewrite ^ /bludit/index.php last; } + if (!-e $request_filename) { rewrite ^ /__PATH__/index.php last; } #try_files $uri $uri/ /bludit//bludit/index.php?$args; From d8191017f29bf277fd8426209971e7ac7503a609 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 18 Oct 2020 12:25:45 +0200 Subject: [PATCH 05/13] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index be77c05..6c1a65d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,7 +11,7 @@ location __PATH__/ { index index.php; - if (!-e $request_filename) { rewrite ^ /__PATH__/index.php last; } + if (!-e $request_filename) { rewrite ^ __PATH__/index.php last; } #try_files $uri $uri/ /bludit//bludit/index.php?$args; From 355fb8d83f3468992b3ec97116ed1e318e31f29b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 18 Oct 2020 12:36:55 +0200 Subject: [PATCH 06/13] Update nginx.conf --- conf/nginx.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6c1a65d..7a947c5 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,16 +11,16 @@ location __PATH__/ { index index.php; - if (!-e $request_filename) { rewrite ^ __PATH__/index.php last; } + #if (!-e $request_filename) { rewrite ^ /bludit/index.php last; } - #try_files $uri $uri/ /bludit//bludit/index.php?$args; + try_files $uri $uri/ /bludit//bludit/index.php?$args; location __PATH__/bl-content/databases/ { deny all; } location __PATH__/bl-content/workspaces/ { deny all; } location __PATH__/bl-content/pages/ { deny all; } location __PATH__/bl-kernel/*.php { deny all; } - try_files $uri $uri/ index.php; + #try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; From 8b2d61627be808f6a34dd4542667f5cffbc798d6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 18 Oct 2020 13:29:13 +0200 Subject: [PATCH 07/13] Add .htaccess config --- conf/nginx.conf | 4 ++-- scripts/install | 8 ++++++++ scripts/upgrade | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7a947c5..0db689a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,9 +11,9 @@ location __PATH__/ { index index.php; - #if (!-e $request_filename) { rewrite ^ /bludit/index.php last; } + if (!-e $request_filename) { rewrite ^ __PATH__/index.php last; } - try_files $uri $uri/ /bludit//bludit/index.php?$args; + #try_files $uri $uri/ /bludit//bludit/index.php?$args; location __PATH__/bl-content/databases/ { deny all; } location __PATH__/bl-content/workspaces/ { deny all; } diff --git a/scripts/install b/scripts/install index 4276fe2..f340a82 100644 --- a/scripts/install +++ b/scripts/install @@ -83,6 +83,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#================================================= +# CONFIGURE BLUDIT +#================================================= +ynh_script_progression --message="Configuring .htaccess..." --weight=1 + +# Change variables in ttrss configuration +ynh_replace_string --match_string="on" --replace_string="off" --target_file="$final_path/.htaccess" + #================================================= # SECURE FILES AND DIRECTORIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6f1179f..5a5b492 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,6 +94,14 @@ then ynh_setup_source --dest_dir=$final_path fi +#================================================= +# CONFIGURE BLUDIT +#================================================= +ynh_script_progression --message="Configuring .htaccess..." --weight=1 + +# Change variables in ttrss configuration +ynh_replace_string --match_string="on" --replace_string="off" --target_file="$final_path/.htaccess" + #================================================= # SECURE FILES AND DIRECTORIES #================================================= From 7c6f233218ada20c79d19ca17255a8391dd8d36f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 18 Oct 2020 14:00:04 +0200 Subject: [PATCH 08/13] Remove config settings --- scripts/install | 8 -------- scripts/upgrade | 8 -------- 2 files changed, 16 deletions(-) diff --git a/scripts/install b/scripts/install index f340a82..4276fe2 100644 --- a/scripts/install +++ b/scripts/install @@ -83,14 +83,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#================================================= -# CONFIGURE BLUDIT -#================================================= -ynh_script_progression --message="Configuring .htaccess..." --weight=1 - -# Change variables in ttrss configuration -ynh_replace_string --match_string="on" --replace_string="off" --target_file="$final_path/.htaccess" - #================================================= # SECURE FILES AND DIRECTORIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5a5b492..6f1179f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,14 +94,6 @@ then ynh_setup_source --dest_dir=$final_path fi -#================================================= -# CONFIGURE BLUDIT -#================================================= -ynh_script_progression --message="Configuring .htaccess..." --weight=1 - -# Change variables in ttrss configuration -ynh_replace_string --match_string="on" --replace_string="off" --target_file="$final_path/.htaccess" - #================================================= # SECURE FILES AND DIRECTORIES #================================================= From a8f0da501d7fac34046a5b1a1fe6cb629e0d1d0d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Nov 2020 09:49:47 +0100 Subject: [PATCH 09/13] Update check_process --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 4dab04f..1b18955 100644 --- a/check_process +++ b/check_process @@ -8,8 +8,8 @@ setup_sub_dir=1 setup_root=1 setup_nourl=0 - setup_private=0 - setup_public=0 + setup_private=1 + setup_public=1 upgrade=1 backup_restore=1 multi_instance=1 From d081d98f31c91714a823f574039b6b5fcca02a01 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Nov 2020 09:53:40 +0100 Subject: [PATCH 10/13] Add maintainer --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 575c260..246207f 100644 --- a/manifest.json +++ b/manifest.json @@ -10,7 +10,7 @@ "url": "www.bludit.com", "license": "MIT", "maintainer": { - "name": "", + "name": "eric_G", "email": "" }, "requirements": { From 9d6a4be8555dfc7ea3d5ca9d1f9223aade78eb2f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 11:19:19 +0100 Subject: [PATCH 11/13] Small fixes --- check_process | 2 -- manifest.json | 4 ++++ scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/check_process b/check_process index 1b18955..c2dc531 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/manifest.json b/manifest.json index 246207f..79c598b 100644 --- a/manifest.json +++ b/manifest.json @@ -49,6 +49,10 @@ "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, + "help": { + "en": "If enabled, Bludit will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Bludit sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] diff --git a/scripts/install b/scripts/install index 4276fe2..95771dc 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/restore b/scripts/restore index 8c4d6e0..33d914d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -74,7 +74,7 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # GENERIC FINALIZATION @@ -83,7 +83,7 @@ ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependenc #================================================= ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2 -ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload +ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6f1179f..7ebb002 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -75,7 +75,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SPECIFIC UPGRADE From 6c4bbffd231efa3aaec02c4258705dc1708232b9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Dec 2020 11:06:26 +0100 Subject: [PATCH 12/13] Update install --- scripts/install | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/install b/scripts/install index 95771dc..82a0fae 100644 --- a/scripts/install +++ b/scripts/install @@ -34,9 +34,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" -# Normalize the url path syntax -path_url=$(ynh_normalize_url_path $path_url) - # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url From fc2b5a7266a6806f092e7f3746f946dec2dd635c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Dec 2020 10:42:07 +0100 Subject: [PATCH 13/13] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 79c598b..6f993ce 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Simple, Fast, Secure, Flat-File CMS", "fr": "CMS simple, rapide, sécurisé et à fichier plat" }, - "version": "3.13.1~ynh1", + "version": "3.13.1~ynh2", "url": "www.bludit.com", "license": "MIT", "maintainer": { @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.0.0" }, "multi_instance": true, "services": [