X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=docs%2Fconfiguration.rst;fp=docs%2Fconfiguration.rst;h=b55d07306a2cd03bd1eb4ea52c09039a374335dc;hp=f7fa4bcff4702f05b788f48afc3bafe0840d3bf9;hb=e49f6d600a6bdc828a2cd8a8e04b1182586a5e19;hpb=65cdebe21011e11405c6959ccd750bf1f8ddba49

diff --git a/docs/configuration.rst b/docs/configuration.rst
index f7fa4bcf..b55d0730 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -6,38 +6,37 @@
 Configuration
 =============
 
-Configuration properties for both Data Router Provisioning server and Data Router Node server should remain as default values.
+Most configuration properties for both Data Router Provisioning server and Data Router Node server
+should remain as default values.
 
-The only exception to this, is when enabling the AAF CADI framework to authorize the DR provisioning requests.
+An exception to this is when a user wants to run over HTTP (non TLS).
 
-.. note:: The AAF CADI filtering feature is disabled by default. When AAF CADI auth is enabled, all DR API calls must provide an AAF AppID to access the relevant API endpoint.
+For DR Provisioning server config, edit the following props in the provserver.properties file.
 
-To enable DR AAF CADI authorization, the following steps are required:
+.. code-block:: bash
 
-DR CADI Prerequisites:
-    * AAF deployment
+    org.onap.dmaap.datarouter.provserver.tlsenabled  = false
 
-Update the following properties at deployment time.
+and ensure aaf cadi is disabled also
 
+.. code-block:: bash
 
-**DMaaP DR Prov AAF properties**
+    org.onap.dmaap.datarouter.provserver.cadi.enabled = false
 
-::
 
-    # AAF config
-    org.onap.dmaap.datarouter.provserver.cadi.enabled = true
+For DR Node server config, edit the following props in the node.properties file to target http.
 
-    # AAF URL to connect to AAF server
-    org.onap.dmaap.datarouter.provserver.cadi.aaf.url = https://<RELEVANT_AAF_URL>:8095
-
-
-**DMaaP DR Node AAF properties**
-
-::
-
-    # AAF URL to connect to AAF server
-    AafUrl = https://<RELEVANT_AAF_URL>:8095
-
-    # AAF CADI enabled flag
-    CadiEnabled = true
+.. code-block:: bash
 
+    #    URL to retrieve dynamic configuration
+    ProvisioningURL = http://dmaap-dr-prov:8080/internal/prov
+    #
+    #    URL to upload PUB/DEL/EXP logs
+    LogUploadURL = http://dmaap-dr-prov:8080/internal/logs
+    ...
+    #
+    #    AAF CADI enabled flag
+    CadiEnabled = false
+    #
+    #    Enable to run over http or https (default true|https)
+    TlsEnabled = false