mirror of
				https://framagit.org/YunoHost-Apps/gitea_ynh.git
				synced 2025-10-30 21:35:36 +01:00 
			
		
		
		
	Simplify change-url script
This commit is contained in:
		| @@ -18,9 +18,8 @@ cp -r  /etc/yunohost/apps/${app}/conf ../ # Quick hack for https://github.com/Yu | |||||||
|  |  | ||||||
| # RETRIEVE ARGUMENTS | # RETRIEVE ARGUMENTS | ||||||
| old_domain=$YNH_APP_OLD_DOMAIN | old_domain=$YNH_APP_OLD_DOMAIN | ||||||
| old_path=$YNH_APP_OLD_PATH | domain=$YNH_APP_NEW_DOMAIN | ||||||
| new_domain=$YNH_APP_NEW_DOMAIN | path_url=$(ynh_normalize_url_path ${YNH_APP_NEW_PATH:-'/'}) | ||||||
| new_path=$YNH_APP_NEW_PATH |  | ||||||
| app=$YNH_APP_INSTANCE_NAME | app=$YNH_APP_INSTANCE_NAME | ||||||
|  |  | ||||||
| dbpass=$(ynh_app_setting_get "$app" mysqlpwd) | dbpass=$(ynh_app_setting_get "$app" mysqlpwd) | ||||||
| @@ -28,28 +27,6 @@ admin=$(ynh_app_setting_get "$app" adminusername) | |||||||
| key=$(ynh_app_setting_get "$app" secret_key) | key=$(ynh_app_setting_get "$app" secret_key) | ||||||
| port=$(ynh_app_setting_get "$app" web_port) | port=$(ynh_app_setting_get "$app" web_port) | ||||||
|  |  | ||||||
| # CHECK THE SYNTAX OF THE PATHS |  | ||||||
| test -n "$old_path" || old_path="/" |  | ||||||
| test -n "$new_path" || new_path="/" |  | ||||||
| new_path=$(ynh_normalize_url_path $new_path) |  | ||||||
| old_path=$(ynh_normalize_url_path $old_path) |  | ||||||
|  |  | ||||||
| domain="$new_domain" |  | ||||||
| path_url="$new_path" |  | ||||||
|  |  | ||||||
| # CHECK WHICH PARTS SHOULD BE CHANGED |  | ||||||
| change_domain=0 |  | ||||||
| if [ "$old_domain" != "$new_domain" ] |  | ||||||
| then |  | ||||||
|     change_domain=1 |  | ||||||
| fi |  | ||||||
|  |  | ||||||
| change_path=0 |  | ||||||
| if [ "$old_path" != "$new_path" ] |  | ||||||
| then |  | ||||||
|     change_path=1 |  | ||||||
| fi |  | ||||||
|  |  | ||||||
| #================================================= | #================================================= | ||||||
| # STANDARD MODIFICATIONS | # STANDARD MODIFICATIONS | ||||||
| #================================================= | #================================================= | ||||||
| @@ -58,13 +35,13 @@ fi | |||||||
| nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf | nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf | ||||||
|  |  | ||||||
| # Change the domain for nginx | # Change the domain for nginx | ||||||
| if [ $change_domain -eq 1 ] | # Change the domain for nginx | ||||||
| then | if [[ "$old_domain" != "$domain" ]]; then | ||||||
|     # Delete file checksum for the old conf file location |     # Delete file checksum for the old conf file location | ||||||
|     ynh_delete_file_checksum "$nginx_conf_path" |     ynh_delete_file_checksum "$nginx_conf_path" | ||||||
|     mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf |     mv $nginx_conf_path /etc/nginx/conf.d/$domain.d/$app.conf | ||||||
|     # Store file checksum for the new config file location |     # Store file checksum for the new config file location | ||||||
|     ynh_store_file_checksum "/etc/nginx/conf.d/$new_domain.d/$app.conf" |     ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf" | ||||||
| fi | fi | ||||||
|  |  | ||||||
| config_nginx | config_nginx | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Josué Tille
					Josué Tille