X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fsfa_config;h=aa2ab292f5e8cd14a3a2377aca0264fe7232e0dc;hb=46d88522f413cd62c60b081b296634444564813e;hp=c72e80ed7d69a1142b1bd1123c9fc19ad5946d83;hpb=ae17f5340af09279591c75fcd1cff5e6d093bdd9;p=sfa.git

diff --git a/config/sfa_config b/config/sfa_config
index c72e80ed..aa2ab292 100644
--- a/config/sfa_config
+++ b/config/sfa_config
@@ -1,83 +1,93 @@
-# Directory where SFA interfaces are installed
-GENI_BASE_DIR="/usr/share/sfa/" 
-
 # HRN
 # Human readable name for the interfaces
-GENI_INTERFACE_HRN="plc"   
+SFA_INTERFACE_HRN="plc"   
 
 
 # API Debug
 # Are we logging
-GENI_API_DEBUG=1
+SFA_API_DEBUG=1
 
 # Registry Configuration
 #
 # Enabled
 # Enable the registry interface 
-GENI_REGISTRY_ENABLED=1
+SFA_REGISTRY_ENABLED=1
 
 # Root Auth
 # The hrn of the registry's root auth
-GENI_REGISTRY_ROOT_AUTH="plc"
+SFA_REGISTRY_ROOT_AUTH="plc"
 
 # Level1 Auth
 # The hrn of the registry's level1 auth
 # xxx could be determined from hrn above
-GENI_REGISTRY_LEVEL1_AUTH=""
+SFA_REGISTRY_LEVEL1_AUTH=""
 
 # Hostname
 # The fully qualified hostname of the registry server
-GENI_REGISTRY_HOST="localhost"
+SFA_REGISTRY_HOST="localhost"
 
 # Port
 # Geni registry port
-GENI_REGISTRY_PORT=12345
+SFA_REGISTRY_PORT=12345
 
 
 ## Aggregate Configuration
 ##
 ## Enable aggregate inteface
 ## Enable the aggregate inteface.
-GENI_AGGREGATE_ENABLED=1
+SFA_AGGREGATE_ENABLED=1
 #
 ## Hostname
 ## The fully qualified hostname of the aggregate server
-GENI_AGGREGATE_HOST="localhost"
+SFA_AGGREGATE_HOST="localhost"
 #
 ## Port
 ## Geni aggregate server port
-GENI_AGGREGATE_PORT=12346
+SFA_AGGREGATE_PORT=12346
 
 # Slice Manager Configuration
 #
 # Enabled
 # Enable the slice manager  
-GENI_SM_ENABLED=1 
+SFA_SM_ENABLED=1 
 
 # Host
 ## The fully qualified hostname or IP address of the slice manager server
-GENI_SM_HOST="localhost"
+SFA_SM_HOST="localhost"
 
 # Port
 # Geni slice manager server port  
-GENI_SM_PORT=12347
+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
 
-GENI_PLC_USER='root@localhost.localdomain'
+SFA_PLC_USER='root@localhost.localdomain'
 
-# Passowrd
+# Password
 # Password for user account
-GENI_PLC_PASSWORD='root'
+SFA_PLC_PASSWORD='root'
 
-# Hostname
-# Fully qualified hostname of PLC interface
-GENI_PLC_URL='https://localhost:443/PLCAPI/'
+# Full URL of PLC interface
+SFA_PLC_URL='https://localhost:443/PLCAPI/'
+
+# PLC DB Name
+SFA_PLC_DB_NAME='planetlab5'
+
+# PLC DB Host
+SFA_PLC_DB_HOST='localhost'
+
+# PLC DB port
+SFA_PLC_DB_PORT=5432
+
+# PLC DB User
+SFA_PLC_DB_USER='pgsqluser'
+
+# PLC DB Password
+SFA_PLC_DB_PASSWORD=''
 
-# PLC Shell PATH
-# Path of PLC shell. This only applies if Geni interfaces and PLC interface are running on the same 
-# machine
-GENI_PLC_SHELL_PATH='/usr/share/plc_api'
+# Directory internal data gets stored
+# using /etc/sfa until gec5 but /var/lib/sfa would be a more reasonable choice
+SFA_BASE_DIR="/etc/sfa"