bpt22 pushed to branch main at Root / DBRoot / PostgreSQL

Commits:

2 changed files:

Changes:

  • ansible/Containerfile
    ... ... @@ -6,7 +6,9 @@ RUN apt-get update
    6 6
     RUN apt-get install --no-install-recommends -y  \
    
    7 7
         python3                                     \
    
    8 8
         ansible                                     \
    
    9
    +    jq                                          \
    
    9 10
         openssh-client                              \
    
    11
    +    curl                                        \
    
    10 12
         dnsutils
    
    11 13
     
    
    12 14
     
    

  • ansible/verify-hostnames.sh
    ... ... @@ -36,7 +36,7 @@ verify_reverse_lookup() {
    36 36
         local host="$1"
    
    37 37
         local ip_addr="$2"
    
    38 38
     
    
    39
    -    reverse=$(nslookup "$ip_addr" 2>/dev/null | awk '$2 == "name" { print $4 }')
    
    39
    +    reverse=$(dig -x "$ip_addr" @"$DNS_SERVER" +short 2>/dev/null)
    
    40 40
         if [ -z "$reverse" ]; then
    
    41 41
             echo "    ! No reverse DNS found for $ip_addr"
    
    42 42
             return 1
    
    ... ... @@ -61,7 +61,9 @@ verify_hostname() {
    61 61
         echo "Checking $host"
    
    62 62
     
    
    63 63
         local host=$1
    
    64
    -    local ip_addrs=$(nslookup "$host" 2> /dev/null | awk '/^Address: / { print $2 }')
    
    64
    +    local ipv4=$(dig A "$host" @"$DNS_SERVER" +short 2> /dev/null)
    
    65
    +    local ipv6=$(dig AAAA "$host" @"$DNS_SERVER" +short 2> /dev/null)
    
    66
    +    local ip_addrs=("${ipv4[@]}" "${ipv6[@]}")
    
    65 67
     
    
    66 68
         if [ -n "$ip_addrs" ]; then
    
    67 69
             for ip_addr in $ip_addrs; do