diff --git a/README.md b/README.md index aa92d39..f976e48 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview [Flarum](http://flarum.org/), an open-source forum software, packaged for [YunoHost](https://yunohost.org/), a self-hosting server operating server. -**Shipped version:** 0.1.0-beta.13 +**Shipped version:** 0.1.0-beta.14 ## Screenshots diff --git a/conf/nginx.conf b/conf/nginx.conf index 477f982..576ce49 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,8 +11,8 @@ location __PATH__/ { index index.php; # Bug in Nginx with locations and aliases (see http://stackoverflow.com/a/35102259 ) - # try_files $uri $uri/ /index.php?$query_string; # will not work for /admin and /api - if (!-e $request_filename) { rewrite ^ __PATH_HACK__/index.php last; } + try_files $uri $uri/ __PATH_HACK__/index.php?$query_string; + #if (!-e $request_filename) { rewrite ^ __PATH_HACK__/index.php last; } location ~* \.php$ { fastcgi_split_path_info ^(.+.php)(/.+)$; diff --git a/manifest.json b/manifest.json index 7a70155..f33ccfd 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Un forum de nouvelle génération, simplement.", "de": "Forum der nächsten Generation leicht gemacht." }, - "version": "0.1.0-beta.13~ynh1", + "version": "0.1.0-beta.14~ynh1", "url": "http://flarum.org/", "license": "MIT", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 23ccc41..fd5bf28 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,9 +12,9 @@ YNH_PHP_VERSION="7.3" extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo-mysql php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-zip" # Version numbers -project_version="~0.1.0-beta.13" -core_version="~0.1.0-beta.13" -ssowat_version="~0.1.0-beta.13" +project_version="~0.1.0-beta.14" +core_version="~0.1.0-beta.14" +ssowat_version="~0.1.0-beta.14" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index cac165b..aa2f994 100644 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ ynh_setup_source --dest_dir="$final_path" if [ $path_url = "/" ]; then ynh_replace_string "__PATH_HACK__" "" "../conf/nginx.conf" else - ynh_replace_string "__PATH_HACK__" "$path_url" "../conf/nginx.conf" + ynh_replace_string "__PATH_HACK__" "$path_url/$path_url" "../conf/nginx.conf" fi # Create a dedicated nginx config diff --git a/scripts/upgrade b/scripts/upgrade index c71ac3b..0e92323 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -164,7 +164,7 @@ ynh_script_progression --message="Upgrading nginx web server configuration..." - if [ $path_url = "/" ]; then ynh_replace_string "__PATH_HACK__" "" "../conf/nginx.conf" else - ynh_replace_string "__PATH_HACK__" "$path_url" "../conf/nginx.conf" + ynh_replace_string "__PATH_HACK__" "$path_url/$path_url" "../conf/nginx.conf" fi # Create a dedicated nginx config