Merge pull request #5032 from scruel/patch-3
fix(config_migrate): always remove domain old key & replace old value by new valuepull/3441/merge
						commit
						2d4b900e33
					
				
							
								
								
									
										17
									
								
								acme.sh
								
								
								
								
							
							
						
						
									
										17
									
								
								acme.sh
								
								
								
								
							| 
						 | 
				
			
			@ -2396,13 +2396,18 @@ _migratedomainconf() {
 | 
			
		|||
  _old_key="$1"
 | 
			
		||||
  _new_key="$2"
 | 
			
		||||
  _b64encode="$3"
 | 
			
		||||
  _value=$(_readdomainconf "$_old_key")
 | 
			
		||||
  if [ -z "$_value" ]; then
 | 
			
		||||
    return 1 # oldkey is not found
 | 
			
		||||
  fi
 | 
			
		||||
  _savedomainconf "$_new_key" "$_value" "$_b64encode"
 | 
			
		||||
  _old_value=$(_readdomainconf "$_old_key")
 | 
			
		||||
  _cleardomainconf "$_old_key"
 | 
			
		||||
  _debug "Domain config $_old_key has been migrated to $_new_key"
 | 
			
		||||
  if [ -z "$_old_value" ]; then
 | 
			
		||||
    return 1 # migrated failed: old value is empty
 | 
			
		||||
  fi
 | 
			
		||||
  _new_value=$(_readdomainconf "$_new_key")
 | 
			
		||||
  if [ -n "$_new_value" ]; then
 | 
			
		||||
    _debug "Domain config new key exists, old key $_old_key='$_old_value' has been removed."
 | 
			
		||||
    return 1 # migrated failed: old value replaced by new value
 | 
			
		||||
  fi
 | 
			
		||||
  _savedomainconf "$_new_key" "$_old_value" "$_b64encode"
 | 
			
		||||
  _debug "Domain config $_old_key has been migrated to $_new_key."
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#_migratedeployconf   oldkey  newkey  base64encode
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue