add localhost in CONFIG_COMMON, and 127.0.0.1 to a default value in i…

…ni.in
jeonghanlee · Oct 12, 2022 · 4ab10ad · 4ab10ad
1 parent 275e2d1
commit 4ab10ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
@@ -1,6 +1,6 @@
 # Debian
 
-JAVA_HOME:=/usr/lib/jvm/default-java
+JAVA_HOME:=/usr
 MAVEN_HOME:=/usr/share/maven
 
 JAVA_PATH:=$(JAVA_HOME)/bin
@@ -33,7 +33,7 @@ OG_PORT:=8181
 
 RS_ADDR_LIST:=localhost
 AS_ADDR_LIST:=localhost
-PS_ADDR_LIST:=
+PS_ADDR_LIST:=localhost
 
 # These allow developers to override the variable
 -include $(TOP)/../CONFIG_COMMON.local

diff --git a/site-template/phoebus_settings.ini.in b/site-template/phoebus_settings.ini.in
@@ -106,7 +106,7 @@ org.phoebus.logbook.ui/logbook_factory=olog
 org.phoebus.pv/default=ca
 
 # pv.ca
-org.phoebus.pv.ca/addr_list=@PS_CA_ADDR_LIST@
+org.phoebus.pv.ca/addr_list=127.0.0.1 @PS_CA_ADDR_LIST@
 #org.phoebus.pv.ca/name_servers=