diff --git a/conf/nginx.conf b/conf/nginx.conf index e07a530..daaf001 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location __PATH__ { +location __PATH__/ { # Protecting sensibles urls location ~ 403 { diff --git a/scripts/_common.sh b/scripts/_common.sh index 54847ea..3460676 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,9 @@ # COMMON VARIABLES #================================================= # dependencies used by the app -if [ "$lsb_release --codename --short" = "buster"]; then +if [ "$lsb_release --codename --short" = "buster" ]; then pkg_dependencies="php7.3-sqlite3" -else [ "$lsb_release --codename --short" = "stretch"] +else [ "$lsb_release --codename --short" = "stretch" ] pkg_dependencies="php7.0-sqlite3" fi diff --git a/scripts/install b/scripts/install index b54b211..4a3cb53 100644 --- a/scripts/install +++ b/scripts/install @@ -122,7 +122,6 @@ cp -a $final_path/config.dist.php $final_path/config.local.php key=$(ynh_string_random --length=50) # edit config.local.php ynh_replace_string --match_string="const SECRET_KEY = '3xUhIgGwuovRKOjVsVPQ5yUMfXUSIOX2GKzcebsz5OINrYC50r';" --replace_string="const SECRET_KEY = '$key';" --target_file="$final_path/config.local.php" -ynh_replace_string --match_string="const ROOT = __DIR__;" --replace_string="const ROOT = '/var/www/garradin';" --target_file="$final_path/config.local.php" if [ "$path_url" == "/" ]; then ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url';" --target_file="$final_path/config.local.php" else diff --git a/scripts/remove b/scripts/remove index a51df4f..ca7bbc5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -22,7 +22,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --time --weight=10 +ynh_script_progression --message="Removing dependencies..." --weight=10 # Remove metapackage and its dependencies ynh_remove_app_dependencies diff --git a/scripts/upgrade b/scripts/upgrade index 98339c4..e34ec4f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -170,7 +170,6 @@ fi key=$(ynh_string_random --length=50) cp -a $final_path/config.dist.php $final_path/config.local.php ynh_replace_string --match_string="const SECRET_KEY = '3xUhIgGwuovRKOjVsVPQ5yUMfXUSIOX2GKzcebsz5OINrYC50r';" --replace_string="const SECRET_KEY = '$key';" --target_file="$final_path/config.local.php" -ynh_replace_string --match_string="const ROOT = __DIR__;" --replace_string="'/var/www/garradin';" --target_file="$final_path/config.local.php" if [ "$path_url" == "/" ]; then ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url';" --target_file="$final_path/config.local.php" else