Browse Source

Try to obtain domain name from config file

Bob Mottram 7 years ago
parent
commit
467f6c22ab
2 changed files with 9 additions and 1 deletions
  1. 0
    1
      src/freedombone-app-edith
  2. 9
    0
      src/freedombone-controlpanel

+ 0
- 1
src/freedombone-app-edith View File

@@ -266,7 +266,6 @@ function install_edith {
266 266
         fi
267 267
     fi
268 268
 
269
-
270 269
     if [ -d /var/www/$EDITH_DOMAIN_NAME/htdocs ]; then
271 270
         rm -rf /var/www/$EDITH_DOMAIN_NAME/htdocs
272 271
     fi

+ 9
- 0
src/freedombone-controlpanel View File

@@ -174,6 +174,15 @@ function get_app_icann_address {
174 174
     if grep -q "${app_name} domain" $COMPLETION_FILE; then
175 175
         echo $(cat ${COMPLETION_FILE} | grep "${app_name} domain" | head -n 1 | awk -F ':' '{print $2}')
176 176
         return
177
+    else
178
+        app_name_upper=$(echo "$app_name" | tr '[:lower:]' '[:upper:]')_DOMAIN_NAME
179
+        if [ $app_name_upper ]; then
180
+            param_value=$(cat $CONFIGURATION_FILE | grep "${app_name_upper}=" | head -n 1 | awk -F '=' '{print $2}')
181
+            if [ ${param_value} ]; then
182
+                echo ${param_value}
183
+                return
184
+            fi
185
+        fi
177 186
     fi
178 187
     echo "${DEFAULT_DOMAIN_NAME}"
179 188
 }