From 35cc25ea21bc4cb1e9483852821a2f83462a13d4 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 4 Dec 2023 16:25:01 +0700 Subject: [PATCH] Revert "V7.6" --- conf/config.php | 2 -- conf/nginx.conf | 7 ++----- manifest.toml | 9 +++++---- scripts/_common.sh | 2 -- scripts/install | 16 +--------------- scripts/upgrade | 16 +--------------- 6 files changed, 9 insertions(+), 43 deletions(-) diff --git a/conf/config.php b/conf/config.php index c12e1ad..3bfef15 100644 --- a/conf/config.php +++ b/conf/config.php @@ -7,8 +7,6 @@ ** https://github.com/jean-io/moncycle.app */ -define("APP_URL", "__DOMAIN__/__PATH__"); - define("DB_HOST", "localhost"); define("DB_ID", "__DB_USER__"); define("DB_NAME", "__DB_NAME__"); diff --git a/conf/nginx.conf b/conf/nginx.conf index a48fa91..1a00e86 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -26,12 +26,9 @@ location __PATH__/ { } # Default indexes and catch-all - rewrite ^/(export|inscription|compte)$ /$1.php; - rewrite ^/(connexion)$ /$1.html; - rewrite ^/api/(deconnexion)$ /api/$1.php; - rewrite ^/img/(captcha)$ /img/$1.php; + rewrite ^__PATH__/(connexion|inscription|compte|export)$ __PATH__/$1.php; index index.html index.php; - try_files $uri $uri.php $uri/index.php $uri/ $1?$args $1.php?$args; + try_files $uri $uri/ __PATH__/index.php?$args; # Execute and serve PHP files location ~ [^/]\.php(/|$) { diff --git a/manifest.toml b/manifest.toml index a7d8eb0..0306217 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Moncycle" description.en = "Menstrual cycle follow-up for natural family planning" description.fr = "Suivi de cycle pour les méthodes naturelles de régulation de naissance" -version = "7.0~ynh6" +version = "7.0~ynh5" maintainers = ["Raoul de Limezy"] @@ -35,11 +35,12 @@ ram.runtime = "50M" [install.init_main_permission] type = "group" + default = false [resources] [resources.sources.main] - url = "https://github.com/jean-io/moncycle.app/archive/4ee55999138825fd2f309fa27a69bafe6f5a0c36.zip" - sha256 = "94c3010d12f9650ea87aecde046ef0ba4102308b566de94868adc76c69c22ccf" + url = "https://github.com/jean-io/moncycle.app/archive/v7.tar.gz" + sha256 = "25f435a55304a5692f55a681971ac41a034c527a87198612e3bfadb7a3b92028" [resources.system_user] @@ -49,7 +50,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.2-gd, php8.2-mysql, php8.2-mbstring" + packages = "mariadb-server, php8.2-gd, php8.2-mysql" [resources.database] type = "mysql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 68a2ae1..1e47ce7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,8 +6,6 @@ # PHP APP SPECIFIC #================================================= -YNH_COMPOSER_VERSION="2.6.5" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index c248549..e5bd13b 100755 --- a/scripts/install +++ b/scripts/install @@ -18,8 +18,6 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" ynh_exec_warn_less mkdir "$install_dir/sessions" -ynh_exec_warn_less mkdir "$install_dir/soap_cache" -ynh_exec_warn_less mkdir "$install_dir/composer" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" @@ -27,23 +25,11 @@ chown -R $app:www-data "$install_dir" pushd "$install_dir" ynh_exec_warn_less mv ./www_data/* . + ynh_exec_warn_less ./module/install.sh ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < db/table.sql ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < db/demo.sql popd -#================================================= - # SPECIFIC SETUP - #================================================= - # INSTALL COMPOSER DEPENDENCIES - #================================================= - ynh_script_progression --message="Installing composer dependencies..." --weight=1 - - ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --composerversion="$YNH_COMPOSER_VERSION" --workdir="$install_dir" - -# worckaround while https://github.com/chartjs/Chart.js/issues/11478 is not fixed -ynh_exec_warn_less mkdir "$install_dir/vendor/chartjs" -ynh_exec_warn_less curl -o "$install_dir/vendor/chartjs"/chart.js https://cdn.jsdelivr.net/npm/chart.js - #================================================= # PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 57542ea..bba3f33 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,8 +30,6 @@ popd ynh_setup_source --dest_dir="$install_dir" --full_replace=1 ynh_exec_warn_less mkdir "$install_dir/sessions" -ynh_exec_warn_less mkdir "$install_dir/soap_cache" -ynh_exec_warn_less mkdir "$install_dir/composer" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" @@ -40,21 +38,9 @@ chown -R $app:www-data "$install_dir" pushd "$install_dir" ynh_exec_warn_less mv ./www_data/* . ynh_exec_warn_less mv /tmp/config.php . + ynh_exec_warn_less ./module/install.sh popd -#================================================= - # SPECIFIC SETUP - #================================================= - # INSTALL COMPOSER DEPENDENCIES - #================================================= - ynh_script_progression --message="Installing composer dependencies..." --weight=1 - - ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --composerversion="$YNH_COMPOSER_VERSION" --workdir="$install_dir" - -# worckaround while https://github.com/chartjs/Chart.js/issues/11478 is not fixed -ynh_exec_warn_less mkdir "$install_dir/vendor/chartjs" -ynh_exec_warn_less curl -o "$install_dir/vendor/chartjs"/chart.js https://cdn.jsdelivr.net/npm/chart.js - #================================================= # PHP-FPM CONFIGURATION #=================================================