diff options
5 files changed, 8 insertions, 21 deletions
diff --git a/datarouter-docker-compose/src/main/resources/database/sql_init_01.sql b/datarouter-docker-compose/src/main/resources/database/sql_init_01.sql index d2bd1cb3..61079faa 100644 --- a/datarouter-docker-compose/src/main/resources/database/sql_init_01.sql +++ b/datarouter-docker-compose/src/main/resources/database/sql_init_01.sql @@ -16,8 +16,7 @@ CREATE TABLE FEEDS ( DELETED BOOLEAN DEFAULT FALSE, LAST_MOD TIMESTAMP DEFAULT CURRENT_TIMESTAMP, SUSPENDED BOOLEAN DEFAULT FALSE, - CREATED_DATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - AAF_INSTANCE VARCHAR(256) + CREATED_DATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); CREATE TABLE FEED_ENDPOINT_IDS ( @@ -48,8 +47,7 @@ CREATE TABLE SUBSCRIPTIONS ( SUSPENDED BOOLEAN DEFAULT FALSE, PRIVILEGED_SUBSCRIBER BOOLEAN DEFAULT FALSE, CREATED_DATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - DECOMPRESS BOOLEAN DEFAULT FALSE, - AAF_INSTANCE VARCHAR(256) + DECOMPRESS BOOLEAN DEFAULT FALSE ); diff --git a/datarouter-docker-compose/src/main/resources/node_data/node.properties b/datarouter-docker-compose/src/main/resources/node_data/node.properties index ddd4ebc8..e6050140 100644 --- a/datarouter-docker-compose/src/main/resources/node_data/node.properties +++ b/datarouter-docker-compose/src/main/resources/node_data/node.properties @@ -56,6 +56,9 @@ SpoolDir = /opt/app/datartr/spool # The path to the redirection data file RedirectionFile = etc/redirections.dat # +# https security required for publish request +TlsEnabled = false +# # The type of keystore for https KeyStoreType = PKCS12 # diff --git a/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties b/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties index b620f1fa..de83456d 100755 --- a/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties +++ b/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties @@ -27,8 +27,6 @@ org.onap.dmaap.datarouter.provserver.http.port = 8080 org.onap.dmaap.datarouter.provserver.https.port = 8443 org.onap.dmaap.datarouter.provserver.https.relaxation = true -org.onap.dmaap.datarouter.provserver.aafprops.path = /opt/app/osaaf/local/org.onap.dmaap-dr.props - org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool org.onap.dmaap.datarouter.provserver.dbscripts = /opt/app/datartr/etc/misc @@ -36,7 +34,6 @@ org.onap.dmaap.datarouter.provserver.logretention = 30 #DMAAP-597 (Tech Dept) REST request source IP auth # relaxation to accommodate OOM kubernetes deploy -org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false #Localhost address config org.onap.dmaap.datarouter.provserver.localhost = 127.0.0.1 @@ -51,10 +48,5 @@ org.onap.dmaap.datarouter.db.password = datarouter org.onap.dmaap.datarouter.provserver.https.include.protocols = TLSv1.1|TLSv1.2 # AAF config -org.onap.dmaap.datarouter.provserver.cadi.enabled = false - -org.onap.dmaap.datarouter.provserver.aaf.feed.type = org.onap.dmaap-dr.feed -org.onap.dmaap.datarouter.provserver.aaf.sub.type = org.onap.dmaap-dr.sub -org.onap.dmaap.datarouter.provserver.aaf.instance = legacy -org.onap.dmaap.datarouter.provserver.aaf.action.publish = publish -org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe
\ No newline at end of file +org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false +org.onap.dmaap.datarouter.provserver.tlsenabled = false diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java index d02bedb2..2e2dc5f0 100644 --- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java +++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java @@ -142,7 +142,7 @@ public class NodeConfigManager implements DeliveryQueueHelper { } eelfLogger.debug("NODE0304 My certificate says my name is {}", myname); } catch (Exception e) { - eelfLogger.error("NODE0314 Failed to load AAF props. Exiting", e); + eelfLogger.error("NODE0314 Failed to set up TLS config. Exiting", e); exit(1); } } @@ -64,7 +64,6 @@ <javax.servlet-api.version>4.0.1</javax.servlet-api.version> <qos.logback.version>1.2.7</qos.logback.version> <qos.logback.classic.version>1.2.3</qos.logback.classic.version> - <aaf-cadi-aaf.version>2.1.15</aaf-cadi-aaf.version> <commons-codec.version>1.15</commons-codec.version> <gmaven-plugin.version>1.5</gmaven-plugin.version> <io.fabric8.version>0.33.0</io.fabric8.version> @@ -182,11 +181,6 @@ <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.onap.aaf.authz</groupId> - <artifactId>aaf-cadi-core</artifactId> - <version>${aaf-cadi-aaf.version}</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons-io.version}</version> |