diff --git a/conf/app.src b/conf/app.src index 480a7dc..329ba60 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/emoncms/emoncms/archive/refs/tags/10.8.5.tar.gz -SOURCE_SUM=796f604c011feaaf5a48d4f5756962e5f1af758e8ec744e7acfd9880aa47d87c +SOURCE_URL=https://github.com/emoncms/emoncms/archive/refs/tags/11.3.0.tar.gz +SOURCE_SUM=a374ad0a950c5d966b62d54266bf6761d641417785b64fbf6442f7753b386d6f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/graph.src b/conf/graph.src index 38320dc..dce9a43 100644 --- a/conf/graph.src +++ b/conf/graph.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/emoncms/graph/archive/refs/tags/2.1.1.tar.gz -SOURCE_SUM=4224c3f02c9fb525a7d4d07eeafc9de6c2dc79370117e9fa22c2c17abb5226b2 +SOURCE_URL=https://github.com/emoncms/graph/archive/refs/tags/2.2.3.tar.gz +SOURCE_SUM=a110e881638a07e82b23a5d8df860b49af1e067eb98f4e93a8bad8aebc4ec882 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/nginx.conf b/conf/nginx.conf index 757b46d..d9fdc4e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,7 +1,8 @@ -location / { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { # Path to source - alias __FINALPATH__/ ; + alias __FINALPATH__/; index index.php; diff --git a/manifest.json b/manifest.json index 3ec1233..0ab3148 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "id": "emoncms", "packaging_format": 1, "description": { - "en": "Web-app for processing, logging and visualising energy, temperature and other environmental data", - "fr": "Application Web pour le traitement, l'enregistrement et la visualisation de l'énergie, de la température et d'autres données environnementales" + "en": "Processing, logging and visualising energy, temperature and other environmental data", + "fr": "Traitement enregistrement et la visualisation de l'énergie, de la température et d'autres données environnementales" }, - "version": "10.8.5~ynh1", + "version": "11.3.0~ynh1", "url": "https://emoncms.org/", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 7113f60..cae289b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,16 +7,6 @@ YNH_PHP_VERSION="8.0" # dependencies used by the app -pkg_dependencies="php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-mysql" +php_dependencies="php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-mysql" -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= +pkg_dependencies="$php_dependencies" diff --git a/scripts/install b/scripts/install index 010f74a..27eaf9b 100755 --- a/scripts/install +++ b/scripts/install @@ -85,14 +85,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -101,6 +93,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # CREATE DATA DIRECTORY #================================================= diff --git a/scripts/restore b/scripts/restore index 63d359d..8dc8d41 100755 --- a/scripts/restore +++ b/scripts/restore @@ -41,13 +41,6 @@ test ! -d $final_path || ynh_die --message="There is already a directory: $final #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -87,6 +80,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # SPECIFIC RESTORATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ff23841..8a90065 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,14 +89,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -112,6 +104,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # UPDATE A CONFIG FILE #=================================================