exoscale: Fix assigning domain name

[ipfire-2.x.git] / src / initscripts / helper / exoscale-setup

diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup
index 59859a6e92ff5a9ccc8f3398711fc4763c196283..24e98d38bab773b170107502bb8474433b9a8268 100644 (file)
--- a/src/initscripts/helper/exoscale-setup
+++ b/src/initscripts/helper/exoscale-setup
@@ -33,10 +33,13 @@ import_exoscale_configuration() {
 
        # Set domainname
        if ! grep -q "^DOMAINNAME=" /var/ipfire/main/settings; then
-               local domainname="${hostname#*.}"
+               local domainname="localdomain"
 
-               # Fall back to localdomain
-               [ -z "${domainname}" ] && domainname="localdomain"
+               # If the hostname contains a dot we strip the last
+               # part and use it as our domain name
+               if [[ ${hostname} =~ "\." ]]; then
+                       domainname="${hostname#*.}"
+               fi
 
                echo "DOMAINNAME=${domainname}" >> /var/ipfire/main/settings
        fi