From bcdaab9320a79315e9e8eb8708e3c82258da2cfc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 13:21:05 +0200 Subject: [PATCH 01/15] Update app.src --- conf/app.src | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 98917c3..0702e37 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,7 @@ -SOURCE_URL=https://github.com/elabftw/elabftw/archive/refs/tags/4.3.0-beta4.zip -SOURCE_SUM=7e76c884356312add88741bf26c0d0ad728101e9a824071bb7ab9b9c85363cc7 +SOURCE_URL=https://github.com/elabftw/elabftw/archive/refs/tags/4.0.11.zip +SOURCE_SUM=c1e093b4396712976ad89d7bbfb4db74c20d8df5a1f92bb378422ba9afe525a5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true SOURCE_EXTRACT=true +SOURCE_FILENAME= \ No newline at end of file From b5db3b70b8ba3049b7faa58804af7b38a50e2044 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 13:22:58 +0200 Subject: [PATCH 02/15] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3b1df0b..4a75d05 100644 --- a/scripts/install +++ b/scripts/install @@ -141,7 +141,7 @@ pushd "$final_path" ynh_script_progression --message="Install start..." ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" #sed -i '' 's/utf8mb4_0900_ai_ci/utf8mb4_unicode_ci/g' "$final_path/conf/sql/db.sql" - #ynh_exec_as $app php$phpversion bin/install start -q + ynh_exec_as $app php$phpversion bin/install start -q popd #ynh_script_progression --message="Configuring LDAP and emails..." --weight=2 From 69bebf088d1308259f641f5747993e78a9b44258 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 13:36:53 +0200 Subject: [PATCH 03/15] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 27fe4c2..86ded6a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=18 +nodejs_version=16 YNH_PHP_VERSION="8.0" From 9137aa84cb98886a82223c7d49a93a61d5e4ed29 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 13:49:54 +0200 Subject: [PATCH 04/15] Update _common.sh --- scripts/_common.sh | 60 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 86ded6a..df4b5aa 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,7 +10,36 @@ nodejs_version=16 YNH_PHP_VERSION="8.0" # dependencies used by the app -pkg_dependencies="zopfli brotli php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-xml" +pkg_dependencies="brotli \ + zopfli \ + php${YNH_PHP_VERSION}-bcmath \ + php${YNH_PHP_VERSION}-curl \ + php${YNH_PHP_VERSION}-ctype \ + php${YNH_PHP_VERSION}-dev \ + php${YNH_PHP_VERSION}-dom \ + php${YNH_PHP_VERSION}-exif \ + php${YNH_PHP_VERSION}-gd \ + php${YNH_PHP_VERSION}-gettext \ + php${YNH_PHP_VERSION}-fileinfo \ + php${YNH_PHP_VERSION}-fpm \ + php${YNH_PHP_VERSION}-json \ + php${YNH_PHP_VERSION}-intl \ + php${YNH_PHP_VERSION}-ldap \ + php${YNH_PHP_VERSION}-mbstring \ + php${YNH_PHP_VERSION}-opcache \ + php${YNH_PHP_VERSION}-openssl \ + php${YNH_PHP_VERSION}-mysql \ + php${YNH_PHP_VERSION}-pecl-imagick \ + php${YNH_PHP_VERSION}-phar \ + php${YNH_PHP_VERSION}-redis \ + php${YNH_PHP_VERSION}-simplexml \ + php${YNH_PHP_VERSION}-session \ + php${YNH_PHP_VERSION}-sodium \ + php${YNH_PHP_VERSION}-tokenizer \ + php${YNH_PHP_VERSION}-xml \ + php${YNH_PHP_VERSION}-xmlwriter \ + php${YNH_PHP_VERSION}-zip \ + php${YNH_PHP_VERSION}-zlib" YNH_COMPOSER_VERSION="2.2.7" @@ -26,3 +55,32 @@ YNH_COMPOSER_VERSION="2.2.7" # FUTURE OFFICIAL HELPERS #================================================= + + php${YNH_PHP_VERSION}-bcmath \ + php${YNH_PHP_VERSION}-curl \ + php${YNH_PHP_VERSION}-ctype \ + php${YNH_PHP_VERSION}-dev \ + php${YNH_PHP_VERSION}-dom \ + php${YNH_PHP_VERSION}-exif \ + php${YNH_PHP_VERSION}-gd \ + php${YNH_PHP_VERSION}-gettext \ + php${YNH_PHP_VERSION}-fileinfo \ + php${YNH_PHP_VERSION}-fpm \ + php${YNH_PHP_VERSION}-json \ + php${YNH_PHP_VERSION}-intl \ + php${YNH_PHP_VERSION}-ldap \ + php${YNH_PHP_VERSION}-mbstring \ + php${YNH_PHP_VERSION}-opcache \ + php${YNH_PHP_VERSION}-openssl \ + php${YNH_PHP_VERSION}-pdo_mysql \ + php${YNH_PHP_VERSION}-pecl-imagick \ + php${YNH_PHP_VERSION}-phar \ + php${YNH_PHP_VERSION}-redis \ + php${YNH_PHP_VERSION}-simplexml \ + php${YNH_PHP_VERSION}-session \ + php${YNH_PHP_VERSION}-sodium \ + php${YNH_PHP_VERSION}-tokenizer \ + php${YNH_PHP_VERSION}-xml \ + php${YNH_PHP_VERSION}-xmlwriter \ + php${YNH_PHP_VERSION}-zip \ + php${YNH_PHP_VERSION}-zlib \ No newline at end of file From 3e3f83c2af46996257a95941445966702e3628e9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 13:54:13 +0200 Subject: [PATCH 05/15] Update _common.sh --- scripts/_common.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index df4b5aa..91a216e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -27,19 +27,15 @@ pkg_dependencies="brotli \ php${YNH_PHP_VERSION}-ldap \ php${YNH_PHP_VERSION}-mbstring \ php${YNH_PHP_VERSION}-opcache \ - php${YNH_PHP_VERSION}-openssl \ php${YNH_PHP_VERSION}-mysql \ - php${YNH_PHP_VERSION}-pecl-imagick \ + php${YNH_PHP_VERSION}-imagick \ php${YNH_PHP_VERSION}-phar \ php${YNH_PHP_VERSION}-redis \ php${YNH_PHP_VERSION}-simplexml \ - php${YNH_PHP_VERSION}-session \ - php${YNH_PHP_VERSION}-sodium \ php${YNH_PHP_VERSION}-tokenizer \ php${YNH_PHP_VERSION}-xml \ php${YNH_PHP_VERSION}-xmlwriter \ - php${YNH_PHP_VERSION}-zip \ - php${YNH_PHP_VERSION}-zlib" + php${YNH_PHP_VERSION}-zip" YNH_COMPOSER_VERSION="2.2.7" From e8fba0d52b5d4bb5b4177d135fd6617dde3fe8b1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 14:03:50 +0200 Subject: [PATCH 06/15] Update _common.sh --- scripts/_common.sh | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 91a216e..7be55f8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -50,33 +50,3 @@ YNH_COMPOSER_VERSION="2.2.7" #================================================= # FUTURE OFFICIAL HELPERS #================================================= - - - php${YNH_PHP_VERSION}-bcmath \ - php${YNH_PHP_VERSION}-curl \ - php${YNH_PHP_VERSION}-ctype \ - php${YNH_PHP_VERSION}-dev \ - php${YNH_PHP_VERSION}-dom \ - php${YNH_PHP_VERSION}-exif \ - php${YNH_PHP_VERSION}-gd \ - php${YNH_PHP_VERSION}-gettext \ - php${YNH_PHP_VERSION}-fileinfo \ - php${YNH_PHP_VERSION}-fpm \ - php${YNH_PHP_VERSION}-json \ - php${YNH_PHP_VERSION}-intl \ - php${YNH_PHP_VERSION}-ldap \ - php${YNH_PHP_VERSION}-mbstring \ - php${YNH_PHP_VERSION}-opcache \ - php${YNH_PHP_VERSION}-openssl \ - php${YNH_PHP_VERSION}-pdo_mysql \ - php${YNH_PHP_VERSION}-pecl-imagick \ - php${YNH_PHP_VERSION}-phar \ - php${YNH_PHP_VERSION}-redis \ - php${YNH_PHP_VERSION}-simplexml \ - php${YNH_PHP_VERSION}-session \ - php${YNH_PHP_VERSION}-sodium \ - php${YNH_PHP_VERSION}-tokenizer \ - php${YNH_PHP_VERSION}-xml \ - php${YNH_PHP_VERSION}-xmlwriter \ - php${YNH_PHP_VERSION}-zip \ - php${YNH_PHP_VERSION}-zlib \ No newline at end of file From 2c5f5eb73125b5556679da391f3a9fef13ace119 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 14:04:32 +0200 Subject: [PATCH 07/15] Update install --- scripts/install | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 4a75d05..40a06fb 100644 --- a/scripts/install +++ b/scripts/install @@ -131,22 +131,22 @@ ynh_install_composer --install_args="--no-dev" ynh_script_progression --message="Installing $app..." --weight=30 pushd "$final_path" + ynh_composer_exec --commands="install --prefer-dist --no-cache --no-progress --no-dev -a" + #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH npm install --save https://github.com/foliojs/brotli.js/tarball/master ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --pure-lockfile --prod ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run buildall - ynh_composer_exec --commands="install --prefer-dist --no-cache --no-progress --no-dev -a" + ynh_secure_remove node_modules ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean - ynh_script_progression --message="Install start..." ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" - #sed -i '' 's/utf8mb4_0900_ai_ci/utf8mb4_unicode_ci/g' "$final_path/conf/sql/db.sql" ynh_exec_as $app php$phpversion bin/install start -q popd -#ynh_script_progression --message="Configuring LDAP and emails..." --weight=2 -#ynh_add_config --template="../conf/sql.template" --destination="../conf/sql" -#ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name < ../conf/sql +ynh_script_progression --message="Configuring LDAP and emails..." --weight=2 +ynh_add_config --template="../conf/sql.template" --destination="../conf/sql" +ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name < ../conf/sql #================================================= # GENERIC FINALIZATION From 6ee811ad491b11aa739d7ac4c8e93513898dc6f2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 14:06:00 +0200 Subject: [PATCH 08/15] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7be55f8..1a8d1c2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,7 +12,7 @@ YNH_PHP_VERSION="8.0" # dependencies used by the app pkg_dependencies="brotli \ zopfli \ - php${YNH_PHP_VERSION}-bcmath \ + php-bcmath \ php${YNH_PHP_VERSION}-curl \ php${YNH_PHP_VERSION}-ctype \ php${YNH_PHP_VERSION}-dev \ From cf77bcdb3cf9c6089338da7f5a1cf61566920b95 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 14:17:21 +0200 Subject: [PATCH 09/15] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 40a06fb..44d942c 100644 --- a/scripts/install +++ b/scripts/install @@ -145,8 +145,8 @@ pushd "$final_path" popd ynh_script_progression --message="Configuring LDAP and emails..." --weight=2 -ynh_add_config --template="../conf/sql.template" --destination="../conf/sql" -ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name < ../conf/sql +#ynh_add_config --template="../conf/sql.template" --destination="../conf/sql" +#ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name < ../conf/sql #================================================= # GENERIC FINALIZATION From c6c8015506861cd00c12b9c8380ae581d6ae426f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 14:33:42 +0200 Subject: [PATCH 10/15] Fix --- conf/nginx.conf | 13 ++++--------- scripts/install | 7 +++---- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index f4c59bf..7e82033 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,14 +5,12 @@ location / { index index.php; - try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; + try_files $uri $uri/ index.php; - location ~ \.php$ { - if (!-e $request_filename) { - rewrite ^__PATH__/?(.*)$ __PATH__/index.php?/$1 last; - break; - } + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; @@ -28,7 +26,4 @@ location / { more_set_headers "Referrer-Policy: no-referrer"; more_set_headers "Feature-Policy: autoplay 'none'; camera 'none'; document-domain 'none'; encrypted-media 'none'; fullscreen 'self'; geolocation 'none'; microphone 'none'; midi 'none'; payment 'none'; vr 'none'"; more_set_headers "Vary: Accept-Encoding"; - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; } diff --git a/scripts/install b/scripts/install index 44d942c..bb38d35 100644 --- a/scripts/install +++ b/scripts/install @@ -131,12 +131,11 @@ ynh_install_composer --install_args="--no-dev" ynh_script_progression --message="Installing $app..." --weight=30 pushd "$final_path" - ynh_composer_exec --commands="install --prefer-dist --no-cache --no-progress --no-dev -a" - - #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH npm install --save https://github.com/foliojs/brotli.js/tarball/master ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --pure-lockfile --prod ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run buildall + ynh_composer_exec --commands="install --prefer-dist --no-cache --no-progress --no-dev -a" + ynh_secure_remove node_modules ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean @@ -144,7 +143,7 @@ pushd "$final_path" ynh_exec_as $app php$phpversion bin/install start -q popd -ynh_script_progression --message="Configuring LDAP and emails..." --weight=2 +#ynh_script_progression --message="Configuring LDAP and emails..." --weight=2 #ynh_add_config --template="../conf/sql.template" --destination="../conf/sql" #ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name < ../conf/sql From 95db93f3b5b75387ab513449b662659ab3267e89 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 16:06:03 +0200 Subject: [PATCH 11/15] Update install --- scripts/install | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index bb38d35..e56114b 100644 --- a/scripts/install +++ b/scripts/install @@ -155,9 +155,13 @@ popd ynh_script_progression --message="Securing files and directories..." --weight=1 mkdir -p $final_path/{cache,uploads} -chown $app:www-data $final_path/{cache,uploads} -chmod 750 -R "$final_path" -chmod 700 $final_path/{cache,uploads} +#chown $app:www-data $final_path/{cache,uploads} +#chmod 750 -R "$final_path" +#chmod 700 $final_path/{cache,uploads} + +chmod 755 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" #================================================= # SETUP SSOWAT From cc16fe2629af434595ba521266b9c952ffd171a8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 16:21:43 +0200 Subject: [PATCH 12/15] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 4496105..74128eb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source electronic lab notebook for research labs", "fr": "Cahier de laboratoire électronique open source pour les laboratoires de recherche" }, - "version": "4.3.0~ynh1", + "version": "4.0.11~ynh1", "url": "https://www.elabftw.net", "upstream": { "license": "AGPL-3.0-only", From 473046da3005fb44149cd528e9945d30f8333abb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 17 May 2022 14:21:48 +0000 Subject: [PATCH 13/15] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f0e8783..99b61f1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ eLabFTW is an electronic lab notebook manager for research teams. It lets you store and organize your research experiments easily. It also features a database where any kind of objects (such as antibodies, plasmids, cell lines, boxes, etc.) can be stored. It is accessed via the browser. Several research teams can be hosted on the same installation. This means eLabFTW can be installed at the institute level and host all team members at the same place. This is what is done at Institut Curie and in several other research centers around the globe. -**Shipped version:** 4.3.0~ynh1 +**Shipped version:** 4.0.11~ynh1 **Demo:** https://demo.elabftw.net/login.php diff --git a/README_fr.md b/README_fr.md index f286e3e..71625d3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ eLabFTW is an electronic lab notebook manager for research teams. It lets you store and organize your research experiments easily. It also features a database where any kind of objects (such as antibodies, plasmids, cell lines, boxes, etc.) can be stored. It is accessed via the browser. Several research teams can be hosted on the same installation. This means eLabFTW can be installed at the institute level and host all team members at the same place. This is what is done at Institut Curie and in several other research centers around the globe. -**Version incluse :** 4.3.0~ynh1 +**Version incluse :** 4.0.11~ynh1 **Démo :** https://demo.elabftw.net/login.php From bccd1df7dba9d712026603c98099f5cbb08d1f62 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 17:01:17 +0200 Subject: [PATCH 14/15] Update nginx.conf --- conf/nginx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7e82033..3b07b7c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,6 +5,8 @@ location / { index index.php; + client_max_body_size 500M; + try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { From 84d9871736dbff37b9be28021b6e2860ed063439 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 May 2022 17:01:31 +0200 Subject: [PATCH 15/15] Update php-fpm.conf --- conf/php-fpm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab1a471..573704e 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,8 +419,8 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M +php_admin_value[upload_max_filesize] = 500M +php_admin_value[post_max_size] = 500M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters