diff --git a/conf/nginx.conf b/conf/nginx.conf
index d2fd210..5c003bb 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -13,8 +13,8 @@ location __PATH__/ {
     proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header  X-Forwarded-Proto $scheme;
 
-    #wrewrite               ^__PATH__/gogs/(.*) /$1 break;
-    #rewrite               ^__PATH__/gogs$ /$1 break;
+    #wrewrite          ^__PATH__/gogs/(.*) /$1 break;
+    #rewrite           ^__PATH__/gogs$ /$1 break;
 
     #proxy_read_timeout    90;
     client_max_body_size  200M;
diff --git a/scripts/backup b/scripts/backup
index aa34e44..b9bc0ec 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -58,6 +58,12 @@ ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 ynh_backup --src_path="/var/log/$app"
 
+#=================================================
+# BACKUP LOGROTATE
+#=================================================
+
+ynh_backup --src_path="/etc/logrotate.d/$app"
+
 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================
diff --git a/scripts/change_url b/scripts/change_url
index 896239c..e8c9218 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -29,6 +29,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
+admin=$(ynh_app_setting_get --app=$app --key=admin)
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
@@ -112,19 +113,19 @@ cp ../conf/ldap.conf "$final_path/custom/conf/auth.d/ldap.conf"
 
 if [ "$path_url" = "/" ]
 then
-    ynh_replace_string --match_string="__URL__" --replace_string="$domain" --target_file="$final_path/custom/conf/app.ini"
+    ynh_replace_string --match_string="__URL__" --replace_string="$new_domain" --target_file="$final_path/custom/conf/app.ini"
 else
-    ynh_replace_string --match_string="__URL__" --replace_string="$domain${path_url%/}" --target_file="$final_path/custom/conf/app.ini"
+    ynh_replace_string --match_string="__URL__" --replace_string="$new_domain${new_path%/}" --target_file="$final_path/custom/conf/app.ini"
 fi
 
-ynh_replace_string --match_string="__REPOS_PATH__"  --replace_string="$REPO_PATH" --target_file="$final_path/custom/conf/app.ini"
-ynh_replace_string --match_string="__DB_PASSWORD__" --replace_string="$db_pwd"    --target_file="$final_path/custom/conf/app.ini"
+ynh_replace_string --match_string="__REPOS_PATH__"  --replace_string="$REPO_PATH"  --target_file="$final_path/custom/conf/app.ini"
+ynh_replace_string --match_string="__DB_PASSWORD__" --replace_string="$db_pwd"     --target_file="$final_path/custom/conf/app.ini"
 ynh_replace_string --match_string="__DB_USER__"     --replace_string="$db_user"    --target_file="$final_path/custom/conf/app.ini"
-ynh_replace_string --match_string="__DOMAIN__"      --replace_string="$domain"    --target_file="$final_path/custom/conf/app.ini"
+ynh_replace_string --match_string="__DOMAIN__"      --replace_string="$new_domain" --target_file="$final_path/custom/conf/app.ini"
 ynh_replace_string --match_string="__KEY__"         --replace_string="$(ynh_string_random)" --target_file="$final_path/custom/conf/app.ini"
-ynh_replace_string --match_string="__DATA_PATH__"   --replace_string="$DATA_PATH" --target_file="$final_path/custom/conf/app.ini"
-ynh_replace_string --match_string="__PORT__"        --replace_string="$port"      --target_file="$final_path/custom/conf/app.ini"
-ynh_replace_string --match_string="__APP__"         --replace_string="$app"       --target_file="$final_path/custom/conf/app.ini"
+ynh_replace_string --match_string="__DATA_PATH__"   --replace_string="$DATA_PATH"  --target_file="$final_path/custom/conf/app.ini"
+ynh_replace_string --match_string="__PORT__"        --replace_string="$port"       --target_file="$final_path/custom/conf/app.ini"
+ynh_replace_string --match_string="__APP__"         --replace_string="$app"        --target_file="$final_path/custom/conf/app.ini"
 
 if [[ "$is_public" = '1' ]]
 then
diff --git a/scripts/restore b/scripts/restore
index d57cdd5..b699b72 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-admin=$(ynh_app_setting_get --app=$app --key=adminusername)
+admin=$(ynh_app_setting_get --app=$app --key=admin)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
@@ -99,6 +99,12 @@ ynh_script_progression --message="Starting a systemd service..." --weight=3
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP Server listening"
 
+#=================================================
+# RESTORE THE LOGROTATE CONFIGURATION
+#=================================================
+
+ynh_restore_file --origin_path="/etc/logrotate.d/$app"
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 31e14e7..336d457 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -24,7 +24,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-admin=$(ynh_app_setting_get --app=$app --key=adminusername)
+admin=$(ynh_app_setting_get --app=$app --key=admin)
 is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 port=$(ynh_app_setting_get --app=$app --key=port)
 architecture=$(ynh_detect_arch)
@@ -85,9 +85,9 @@ cp ../conf/ldap.conf "$final_path/custom/conf/auth.d/ldap.conf"
 
 if [ "$path_url" = "/" ]
 then
-    ynh_replace_string "__URL__" "$domain" "$final_path/custom/conf/app.ini"
+    ynh_replace_string --match_string="__URL__" --replace_string="$domain" --target_file="$final_path/custom/conf/app.ini"
 else
-    ynh_replace_string "__URL__" "$domain${path_url%/}" "$final_path/custom/conf/app.ini"
+    ynh_replace_string --match_string="__URL__" --replace_string="$domain${path_url%/}" --target_file="$final_path/custom/conf/app.ini"
 fi
 
 ynh_replace_string --match_string="__REPOS_PATH__"  --replace_string="$REPO_PATH" --target_file="$final_path/custom/conf/app.ini"