infra/image/system-services: Enhance checks, also fix reverse zone #1282
Conversation
t-woerner
force-pushed
the
infra_image_enhance_system_services
branch
from
4d7839a
to
f3493ab
Compare
t-woerner
changed the title
t-woerner
force-pushed
the
infra_image_enhance_system_services
branch
from
f3493ab
to
27b6131
Compare
| @@ -1,26 +1,82 @@ | |||
| #!/bin/bash -eu | |||
|
|
|||
| function validFQDN() | |||
There was a problem hiding this comment.
really minor and cosmetic: shell naming conventions lowercase and separate words with underscore, what about
valid_fqdn()
| return 0 | ||
| } | ||
|
|
||
| function validIPv4() |
| local rematch="^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" | ||
|
|
||
| [[ "${ip}" =~ ${rematch} ]] || return 1 | ||
| for i in ${ip//./ }; do |
There was a problem hiding this comment.
cosmetic:
s/i/octet/g
octet has a meaning
There was a problem hiding this comment.
This is a bash syntax to replace "." (dot) with " " (space). ${parameter//pattern/string} replaces in the whole string and ${parameter/pattern/string} only the first match.
infra/image/system-service/fixnet.sh
Outdated
| echo " IP: '${IP}'" | ||
| echo | ||
|
|
||
| if grep -Pq "[[:space:]]${HOSTNAME}([[:space:]]|$)" /etc/hosts |
There was a problem hiding this comment.
grep -P is not available on all systems by default, what about
grep -qE "\s$HOSTNAME(\s|$)" /etc/hosts
infra/image/system-service/fixnet.sh
Outdated
| echo | ||
|
|
||
| if grep -Pq "[[:space:]]${HOSTNAME}([[:space:]]|$)" /etc/hosts | ||
| then | ||
| sed -ie "s/.*${HOSTNAME}/${IP}\t${HOSTNAME}/" /etc/hosts |
There was a problem hiding this comment.
sed sometimes is risky,
what about
sed -i.bak
it will create a backup before modifying.
There was a problem hiding this comment.
LGTM! feel free to merge.
@t-woerner I just have cosmetics changes for your consideration, really minor things.
t-woerner
force-pushed
the
infra_image_enhance_system_services
branch
from
27b6131
to
929ccb1
Compare
Checks for IPv4 addresses have been added and reverse zone handling for fixipaip.sh The services are logging StandardOutput and StandardError to journal now.
t-woerner
force-pushed
the
infra_image_enhance_system_services
branch
from
929ccb1
to
e05fbce
Compare
Checks for IPv4 addresses have been added and reverse zone handling for fixipaip.sh
The services are logging StandardOutput and StandardError to journal now.