فهرست منبع

Don't change original nginx conf file and add change_url

Jimmy Monin 6 سال پیش
والد
کامیت
dcb447c208
3فایلهای تغییر یافته به همراه18 افزوده شده و 11 حذف شده
  1. 12 7
      scripts/change_url
  2. 3 2
      scripts/install
  3. 3 2
      scripts/upgrade

+ 12 - 7
scripts/change_url

@@ -59,13 +59,18 @@ if [ $change_path -eq 1 ]
 then
   # Make a backup of the original nginx config file if modified
   ynh_backup_if_checksum_is_different "$nginx_conf_path"
-  # Replace locations starting with old_path
-  # Look for every location possible patterns (see https://nginx.org/en/docs/http/ngx_http_core_module.html#location)
-  ynh_replace_string "location\( \(=\|~\|~\*\|\^~\)\)\? $old_path" "location\1 $new_path"  "$nginx_conf_path"
-  # Replace path in "return" directives
-  ynh_replace_string "return \([[:digit:]]\{3\}\) $old_path" "return \1 $new_path"  "$nginx_conf_path"
-  # Calculate and store the nginx config file checksum
-  ynh_store_file_checksum "$nginx_conf_path"
+	# Set global variables for nginx helper
+	domain="$old_domain"
+	path_url="$new_path"
+	# Store path_url setting
+	ynh_app_setting_set $app path_url "$path_url"
+	# Create a dedicated nginx config
+	ynh_add_nginx_config
+	if [ "$path_url" != "/" ]
+	then
+		ynh_replace_string "^#sub_path_only" "" "$nginx_conf_path"
+	fi
+	ynh_store_file_checksum "$nginx_conf_path"
 fi
 
 # Change the domain for nginx

+ 3 - 2
scripts/install

@@ -104,11 +104,12 @@ ynh_setup_source "$final_path"
 #=================================================
 
 # Create a dedicated nginx config
+ynh_add_nginx_config
 if [ "$path_url" != "/" ]
 then
-	ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf"
+	ynh_replace_string "^#sub_path_only" "" "/etc/nginx/conf.d/$domain.d/$app.conf"
 fi
-ynh_add_nginx_config
+ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # CREATE DEDICATED USER

+ 3 - 2
scripts/upgrade

@@ -82,11 +82,12 @@ ynh_setup_source "$final_path"
 #=================================================
 
 # Create a dedicated nginx config
+ynh_add_nginx_config
 if [ "$path_url" != "/" ]
 then
-	ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf"
+	ynh_replace_string "^#sub_path_only" "" "/etc/nginx/conf.d/$domain.d/$app.conf"
 fi
-ynh_add_nginx_config
+ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # CREATE DEDICATED USER