From fbb7e72cf17ffe0fcefdfbaeeae09e0184afbc5e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 28 Nov 2023 09:59:15 +0100 Subject: [PATCH] Testing (#25) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update check_process * Set badge to SVG * Set badge to SVG * Upgrade to 1.12.0 (#3) * Upgrade to 1.13.0 (#5) * Fix linter warnings * Update manifest.json * Cleaning up (#8) * Cleaning up * Update database.php * [autopatch] Update issue and PR templates (#10) * Testing (#9) * Fix linter warnings * [autopatch] Update issue and PR templates Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: Yunohost-Bot <> * Fix (#11) * Fix * Update upgrade * 1.14.1 * Auto-update README * 1.14.3 * Auto-update README * 1.14.5 * Auto-update README * Update manifest.json * 1.14.9 (#15) * 1.14.9 * Update manifest.json * Auto-update README * 4.3 (#17) * 1.15.1 * Auto-update README * Bullseye (#20) * set relative path for --keep opt * Auto-update README * Fix * Update restore * Update restore Co-authored-by: yunohost-bot * Update manifest.json * Auto-update README * Upgrade auto-updater (#22) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean * Version 2 (#23) * v2 * v2 * Auto-update README * fix * Update manifest.toml * Auto-update README * Update manifest.toml * Update backup --------- Co-authored-by: yunohost-bot * Auto-update README * Update restore * cleaning * Delete .DS_Store * Auto-update README * Update manifest.toml * cleaning * Update manifest.toml Co-authored-by: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> * Update manifest.toml * Auto-update README --------- Co-authored-by: YunoHost Bot Co-authored-by: Yunohost-Bot <> Co-authored-by: yunohost-bot Co-authored-by: tituspijean Co-authored-by: Alexandre Aubin Co-authored-by: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> --- .DS_Store | Bin 6148 -> 0 bytes README.md | 2 +- README_fr.md | 2 +- manifest.toml | 9 ++++++--- scripts/install | 4 ++-- scripts/remove | 1 - scripts/upgrade | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index b5f9911dac78a8ffc8d9e67b686e5b6a6ca5830b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}(1u5S|Tzcnd;Ckz*%^D3Zkk z@Br-<+Se$3ioQo*pfkH0RGRi!1ZYN@{l@dR_GfF?3jm^1h8qAj09dGmHHpJtgyN(# zQZpVxp?dV8gdi9V&Vyton;j340eW{0Scfx+p@84sUlw5GXK8=`Gtlh zpUEY;ESHYGem3$7zbFSCKkwPEy*P{lKR=AaqQ4)dyGb;R(!KnhUqtywO5V@11QWFF z2M2L9>e(-Lvb6ByG|E*!-Q(ymPQz@}$;vbwsC?60+3)?LkA37DH>wn)(vm%UWjt=K zIh(E4WX&13+h}jKwkH#5S+7>#emE&FE&TkRvL9V2sJbIF*6HuLJ?|q^gAjYgsYK9 zW`G&E%fOtzv}ym}{rCC*ZV_KG1I)maVnEcpUblmfWcJpXhoimLK|Mt!p}b1tZ3!A` iE5=;fieI8CLBB%=qHD0yh#nOF5l}Snzzp0g1HS;liDC8t diff --git a/README.md b/README.md index 7be3eb9..5d0e5ca 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ MineWeb is a CMS (i.e. a content management system), in simpler terms, a complet You can keep your players up to date with news, have them buy items from the store... You can customize the CMS with all kinds of themes or plugins! These are available on the market or can be developed by yourself. -**Shipped version:** 1.15.2~ynh1 +**Shipped version:** 1.15.2~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 97d2992..a78e97f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ MineWeb est un CMS (c'est-à-dire un système de gestion de contenu), en plus si Vous pourrez tenir vos joueurs au courant des actualités, leur faire acheter des articles sur la boutique... Vous pourrez personnaliser le CMS avec toutes sortes de thèmes ou plugins ! Ceux-ci sont disponibles sur le market ou peuvent être développés par vous-même. -**Version incluse :** 1.15.2~ynh1 +**Version incluse :** 1.15.2~ynh2 ## Captures d’écran diff --git a/manifest.toml b/manifest.toml index a225b07..2b2b858 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,9 +5,9 @@ name = "MineWeb" description.en = "Customizable and intuitive CMS" description.fr = "CMS personnalisable et intuitif" -version = "1.15.2~ynh1" +version = "1.15.2~ynh2" -maintainers = ["liberodark"] +maintainers = [] [upstream] license = "AGPL-3.0-only" @@ -19,8 +19,11 @@ code = "https://github.com/MineWeb/MineWebCMS/" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -53,7 +56,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php7.4-zip php7.4-gd php7.4-curl" + packages = "mariadb-server, php8.2-zip, php8.2-gd, php8.2-curl" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index c472b05..aacb8e4 100644 --- a/scripts/install +++ b/scripts/install @@ -29,13 +29,13 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 ynh_add_nginx_config # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # MODIFY A CONFIG FILE #================================================= -ynh_add_config --template="../conf/database.php" --destination="$install_dir/app/Config/database.php" +ynh_add_config --template="database.php" --destination="$install_dir/app/Config/database.php" #================================================= # MODIFY FIRST.CTP diff --git a/scripts/remove b/scripts/remove index e161d9c..7822e02 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,7 +17,6 @@ ynh_script_progression --message="Stopping and removing the systemd service..." # Remove the dedicated systemd config ynh_remove_systemd_config - # Remove the dedicated NGINX config ynh_remove_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index f796fc1..be7498d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,7 +41,7 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - ynh_add_nginx_config # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # MODIFY A CONFIG FILE