Renamed SFA_BASE_DIR to SFA_CONFIG_DIR. Added SFA_DATA_DIR

[sfa.git] / config / sfa_config

diff --git a/config/sfa_config b/config/sfa_config
index c4bae71..ec8d726 100644 (file)
--- a/config/sfa_config
+++ b/config/sfa_config
@@ -1,8 +1,5 @@
-# Directory where SFA interfaces are installed
-SFA_BASE_DIR="/usr/share/sfa/" 
-
 # HRN
-# Human readable name for the interfaces
+# Human readable name for this interface
 SFA_INTERFACE_HRN="plc"   
 
 
@@ -21,7 +18,9 @@ SFA_REGISTRY_ENABLED=1
 SFA_REGISTRY_ROOT_AUTH="plc"
 
 # Level1 Auth
-# The hrn of the registry's level1 auth
+# The hrn of the registry's level1 auth (sub authority)
+# The full name of this interface (only secify if this 
+# interface is a sub authority)
 # xxx could be determined from hrn above
 SFA_REGISTRY_LEVEL1_AUTH=""
 
@@ -65,7 +64,7 @@ SFA_SM_PORT=12347
 # PLC Interface Access Configuration
 #
 # PLC user
-# Valid plc account geni interfaces will use for plc requests   
+# sfa services will use this account for issuing plc requests - must have admin rights
 
 SFA_PLC_USER='root@localhost.localdomain'
 
@@ -73,20 +72,14 @@ SFA_PLC_USER='root@localhost.localdomain'
 # Password for user account
 SFA_PLC_PASSWORD='root'
 
-# Hostname
-# Fully qualified hostname of PLC interface
+# Full URL of PLC interface
 SFA_PLC_URL='https://localhost:443/PLCAPI/'
 
-# PLC Shell PATH
-# Path of PLC shell. This only applies if Geni interfaces and PLC interface are running on the same 
-# machine
-SFA_PLC_SHELL_PATH='/usr/share/plc_api'
-
 # PLC DB Name
 SFA_PLC_DB_NAME='planetlab5'
 
 # PLC DB Host
-SFA_PLC_DB_HOST='www.planet-lab.org'
+SFA_PLC_DB_HOST='localhost'
 
 # PLC DB port
 SFA_PLC_DB_PORT=5432
@@ -96,3 +89,11 @@ SFA_PLC_DB_USER='pgsqluser'
 
 # PLC DB Password
 SFA_PLC_DB_PASSWORD=''
+
+# Directory internal data gets stored
+# using /etc/sfa until gec5 but /var/lib/sfa would be a more reasonable choice
+SFA_CONFIG_DIR="/etc/sfa"
+
+# Directory internal data gets stored
+SFA_DATA_DIR="/var/lib/sfa"
+