1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dotclear2_ynh.git synced 2024-09-03 18:26:29 +02:00

Merge pull request #36 from YunoHost-Apps/testing

Fix the admin url
This commit is contained in:
Kayou 2021-09-14 12:59:12 +02:00 committed by GitHub
commit bbf1665e66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions

View file

@ -6,7 +6,7 @@
"en": "Blog publishing application", "en": "Blog publishing application",
"fr": "Moteur de blog" "fr": "Moteur de blog"
}, },
"version": "2.19~ynh1", "version": "2.19~ynh2",
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"url": "https://dotclear.org/", "url": "https://dotclear.org/",
"maintainer": { "maintainer": {

View file

@ -120,8 +120,8 @@ php_config=$final_path/inc/config.php
ynh_backup_if_checksum_is_different --file="$php_config" ynh_backup_if_checksum_is_different --file="$php_config"
new_admin_url="${new_path%/}/admin/index.php" new_admin_url="${new_path%/}/admin/"
old_admin_url="${old_path%/}/admin/index.php" old_admin_url="${old_path%/}/admin/"
ynh_replace_string --match_string="'DC_ADMIN_URL', 'https://$old_domain$old_admin_url'" --replace_string="'DC_ADMIN_URL', 'https://$new_domain$new_admin_url'" --target_file=$php_config ynh_replace_string --match_string="'DC_ADMIN_URL', 'https://$old_domain$old_admin_url'" --replace_string="'DC_ADMIN_URL', 'https://$new_domain$new_admin_url'" --target_file=$php_config
ynh_store_file_checksum --file="$php_config" ynh_store_file_checksum --file="$php_config"

View file

@ -115,7 +115,7 @@ ynh_app_setting_set --app=$app --key=master_key --value=$master_key
cp $php_config.in $php_config cp $php_config.in $php_config
admin_url="${path_url%/}/admin/index.php" admin_url="${path_url%/}/admin/"
email=$(ynh_user_get_info --username=$admin --key=mail) email=$(ynh_user_get_info --username=$admin --key=mail)

View file

@ -147,7 +147,7 @@ ynh_backup_if_checksum_is_different --file=$php_config
cp $php_config.in $php_config cp $php_config.in $php_config
admin_url="${path_url%/}/admin/index.php" admin_url="${path_url%/}/admin/"
email=$(ynh_user_get_info --username=$admin --key=mail) email=$(ynh_user_get_info --username=$admin --key=mail)