diff --git a/scripts/install b/scripts/install index 4797384..5cc2bcc 100644 --- a/scripts/install +++ b/scripts/install @@ -125,11 +125,11 @@ ynh_app_setting_set "$app" db_pwd "$db_pwd" # Bug in Nginx with locations and aliases (see http://stackoverflow.com/a/35102259 ) if [ $path_url = "/" ]; then - sed -i "s@__LOCATION_HACK__@@g" ../conf/nginx.conf - sed -i "s@__PATH_HACK__@/@g" ../conf/nginx.conf + ynh_replace_string "__LOCATION_HACK__" "" "../conf/nginx.conf" + ynh_replace_string "__PATH_HACK__" "/" "../conf/nginx.conf" else - sed -i "s@__LOCATION_HACK__@$path_url@g" ../conf/nginx.conf - sed -i "s@__PATH_HACK__@$path_url$path_url@g" ../conf/nginx.conf + ynh_replace_string "__LOCATION_HACK__" "$path_url" "../conf/nginx.conf" + ynh_replace_string "__PATH_HACK__" "$path_url$path_url" "../conf/nginx.conf" fi # Create a dedicated nginx config ynh_add_nginx_config @@ -181,14 +181,14 @@ chown $app:www-data $finalflarumconf admin_pwd=$(ynh_string_random 8) admin_mail=$(ynh_user_get_info $admin mail) # Populate configuration.yml -sed -i "s@__DOMAIN__@$domain@g" $finalflarumconf -sed -i "s@/__PATH__@$path_url@g" $finalflarumconf -sed -i "s@__USER__@$app@g" $finalflarumconf -sed -i "s@__DB_PWD__@$db_pwd@g" $finalflarumconf -sed -i "s@__ADMIN__@$admin@g" $finalflarumconf -sed -i "s@__ADMIN_PWD__@$admin_pwd@g" $finalflarumconf -sed -i "s%__ADMIN_EML__%$admin_mail%g" $finalflarumconf -sed -i "s@__FORUM_TITLE__@$title@g" $finalflarumconf +ynh_replace_string "__DOMAIN__" "$domain" "$finalflarumconf" +ynh_replace_string "/__PATH__" "$path_url" "$finalflarumconf" +ynh_replace_string "__USER__" "$app" "$finalflarumconf" +ynh_replace_string "__DB_PWD__" "$db_pwd" "$finalflarumconf" +ynh_replace_string "__ADMIN__" "$admin" "$finalflarumconf" +ynh_replace_string "__ADMIN_PWD__" "$admin_pwd" "$finalflarumconf" +ynh_replace_string "__ADMIN_EML__" "$admin_mail" "$finalflarumconf" +ynh_replace_string "__FORUM_TITLE__" "$title" "$finalflarumconf" # Execute post-installation pushd $final_path exec_as $app "php -d $final_path -d memory_limit=-1 flarum install -f configuration.yml"