mirror of
				https://github.com/angristan/openvpn-install.git
				synced 2025-11-04 07:57:37 +01:00 
			
		
		
		
	refactor(install): simplify detection of public IP4, add fallback to IPv6 (#589)
This commit is contained in:
		@@ -208,7 +208,11 @@ function installQuestions() {
 | 
				
			|||||||
	echo "Unless your server is behind NAT, it should be your public IPv4 address."
 | 
						echo "Unless your server is behind NAT, it should be your public IPv4 address."
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	# Detect public IPv4 address and pre-fill for the user
 | 
						# Detect public IPv4 address and pre-fill for the user
 | 
				
			||||||
	IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
 | 
						IP=$(ip -4 addr | sed -ne 's|^.* inet \([^/]*\)/.* scope global.*$|\1|p' | head -1)
 | 
				
			||||||
 | 
						if [[ -z "$IP" ]]; then
 | 
				
			||||||
 | 
							# Detect public IPv6 address
 | 
				
			||||||
 | 
							IP=$(ip -6 addr | sed -ne 's|^.* inet6 \([^/]*\)/.* scope global.*$|\1|p' | head -1)
 | 
				
			||||||
 | 
						fi
 | 
				
			||||||
	APPROVE_IP=${APPROVE_IP:-n}
 | 
						APPROVE_IP=${APPROVE_IP:-n}
 | 
				
			||||||
	if [[ $APPROVE_IP =~ n ]]; then
 | 
						if [[ $APPROVE_IP =~ n ]]; then
 | 
				
			||||||
		read -rp "IP address: " -e -i "$IP" IP
 | 
							read -rp "IP address: " -e -i "$IP" IP
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user