pari: trunk r949 - /trunk/Makefile

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Wed May 16 18:11:03 2007
New Revision: 949

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=949
Log:
fix for http://bugs.digium.com/view.php?id=9133

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-gui/trunk/Makefile?view=diff&rev=949&r1=948&r2=949
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed May 16 18:11:03 2007
@@ -89,6 +89,15 @@
 CONFIGDIR:=$(HTTPDIR)/config
 
 HTTPHOST?=$(shell hostname)
+
+HTTPBINDADDR?=$(shell cat $(ASTETCDIR)/http.conf  2>/dev/null | grep -v ^\; | grep bindaddr | cut -f 2 -d '=')
+ifeq ($(HTTPBINDADDR),0.0.0.0)
+  HTTPBINDADDR:=$(HTTPHOST)
+endif
+ifeq ($(HTTPBINDADDR),)
+  HTTPBINDADDR:=$(HTTPHOST)
+endif
+
 HTTPBINDPORT?=$(shell cat $(ASTETCDIR)/http.conf  2>/dev/null | grep -v ^\; | grep bindport | cut -f 2 -d '=')
 ifeq ($(HTTPBINDPORT),)
   HTTPBINDPORT:=8088
@@ -98,9 +107,9 @@
 ifeq ($(HTTPPREFIXBASE),)
   HTTPPREFIX:=asterisk
 endif
-HTTPURL:=http://$(HTTPHOST):$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/cfgbasic.html
-HTTPSETUPURL:=http://$(HTTPHOST):$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/setup/install.html
-HTTPSETUPURL:=http://localhost:$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/setup/install.html
+HTTPURL:=http://$(HTTPBINDADDR):$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/cfgbasic.html
+HTTPSETUPURL:=http://$(HTTPBINDADDR):$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/setup/install.html
+HTTPLOCALURL:=http://127.0.0.1:$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/cfgbasic.html
 
 SUBDIRS:=tools
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
@@ -177,13 +186,18 @@
 		exit 1; \
 	fi
 
+	@echo ""
+	@echo ""
 	@echo " --- Everything looks good ---	"
+	@echo ""
 	@echo " * GUI should be available at $(HTTPURL) "
-	@echo " * Before using the GUI, Please visit the install page at $(HTTPSETUPURL) "
+	@echo ""
+	@echo " * Before using the GUI, Please visit the install page at"
+	@echo " * $(HTTPSETUPURL) "
 	@echo "" 
+	@echo ""
 	@echo " * Note: If you have bindaddr=127.0.0.1 in $(ASTETCDIR)/http.conf "
 	@echo "   you will only be able to visit it from the local machine. "
-	@echo ""
 	@echo "   Example: $(HTTPLOCALURL)"
 	@echo ""
 	@echo " * The login and password should be an entry from $(ASTETCDIR)/manager.conf"