Repository: nifi-minifi Updated Branches: refs/heads/master 617f1be57 -> 8913a9026
MINIFI-60 Removing unused configuration files in minifi-resources and removing unused nifi.properties from the minifi-assembly pom. This closes #48 Signed-off-by: Joseph Percivall <joeperciv...@yahoo.com> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/8913a902 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/8913a902 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/8913a902 Branch: refs/heads/master Commit: 8913a9026914af3eaeba4831e97a4dacdc4662fe Parents: 617f1be Author: Aldrin Piri <ald...@apache.org> Authored: Mon Oct 24 10:32:08 2016 -0400 Committer: Joseph Percivall <joeperciv...@yahoo.com> Committed: Mon Oct 24 17:07:51 2016 -0400 ---------------------------------------------------------------------- minifi-assembly/pom.xml | 148 --------------- .../main/resources/conf/authority-providers.xml | 43 ----- .../main/resources/conf/authorized-users.xml | 57 ------ .../conf/bootstrap-notification-services.xml | 46 ----- .../resources/conf/login-identity-providers.xml | 109 ----------- .../src/main/resources/conf/nifi.properties | 188 ------------------- .../main/resources/conf/zookeeper.properties | 45 ----- 7 files changed, 636 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8913a902/minifi-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml index dbe9849..ac5ed31 100644 --- a/minifi-assembly/pom.xml +++ b/minifi-assembly/pom.xml @@ -233,154 +233,6 @@ limitations under the License. <minifi.jvm.heap.mb>512</minifi.jvm.heap.mb> <minifi.jvm.permgen.mb>128</minifi.jvm.permgen.mb> <minifi.run.as /> - - <!-- nifi.properties: core properties --> - <nifi.version>${project.version}</nifi.version> - <nifi.flowcontroller.autoResumeState>true</nifi.flowcontroller.autoResumeState> - <nifi.flowcontroller.graceful.shutdown.period>10 sec</nifi.flowcontroller.graceful.shutdown.period> - <nifi.flowservice.writedelay.interval>500 ms</nifi.flowservice.writedelay.interval> - <nifi.administrative.yield.duration>30 sec</nifi.administrative.yield.duration> - <nifi.bored.yield.duration>10 millis</nifi.bored.yield.duration> - - <nifi.flow.configuration.file>./conf/flow.xml.gz</nifi.flow.configuration.file> - <nifi.flow.configuration.archive.dir>./conf/archive/</nifi.flow.configuration.archive.dir> - <nifi.login.identity.provider.configuration.file>./conf/login-identity-providers.xml</nifi.login.identity.provider.configuration.file> - <nifi.authority.provider.configuration.file>./conf/authority-providers.xml</nifi.authority.provider.configuration.file> - <nifi.templates.directory>./conf/templates</nifi.templates.directory> - <nifi.database.directory>./database_repository</nifi.database.directory> - - <nifi.state.management.configuration.file>./conf/state-management.xml</nifi.state.management.configuration.file> - <nifi.state.management.embedded.zookeeper.start>false</nifi.state.management.embedded.zookeeper.start> - <nifi.state.management.embedded.zookeeper.properties>./conf/zookeeper.properties</nifi.state.management.embedded.zookeeper.properties> - <nifi.state.management.provider.local>local-provider</nifi.state.management.provider.local> - <nifi.state.management.provider.cluster>zk-provider</nifi.state.management.provider.cluster> - - <nifi.flowfile.repository.implementation>org.apache.nifi.controller.repository.WriteAheadFlowFileRepository</nifi.flowfile.repository.implementation> - <nifi.flowfile.repository.directory>./flowfile_repository</nifi.flowfile.repository.directory> - <nifi.flowfile.repository.partitions>256</nifi.flowfile.repository.partitions> - <nifi.flowfile.repository.checkpoint.interval>2 mins</nifi.flowfile.repository.checkpoint.interval> - <nifi.flowfile.repository.always.sync>false</nifi.flowfile.repository.always.sync> - <nifi.swap.manager.implementation>org.apache.nifi.controller.FileSystemSwapManager</nifi.swap.manager.implementation> - <nifi.queue.swap.threshold>20000</nifi.queue.swap.threshold> - <nifi.swap.in.period>5 sec</nifi.swap.in.period> - <nifi.swap.in.threads>1</nifi.swap.in.threads> - <nifi.swap.out.period>5 sec</nifi.swap.out.period> - <nifi.swap.out.threads>4</nifi.swap.out.threads> - - <nifi.content.repository.implementation>org.apache.nifi.controller.repository.FileSystemRepository</nifi.content.repository.implementation> - <nifi.content.claim.max.appendable.size>10 MB</nifi.content.claim.max.appendable.size> - <nifi.content.claim.max.flow.files>100</nifi.content.claim.max.flow.files> - <nifi.content.repository.directory.default>./content_repository</nifi.content.repository.directory.default> - <nifi.content.repository.archive.max.retention.period>12 hours</nifi.content.repository.archive.max.retention.period> - <nifi.content.repository.archive.max.usage.percentage>50%</nifi.content.repository.archive.max.usage.percentage> - <nifi.content.repository.archive.enabled>true</nifi.content.repository.archive.enabled> - <nifi.content.repository.always.sync>false</nifi.content.repository.always.sync> - <nifi.content.viewer.url>/nifi-content-viewer/</nifi.content.viewer.url> - - <nifi.restore.directory /> - <nifi.ui.banner.text /> - <nifi.ui.autorefresh.interval>30 sec</nifi.ui.autorefresh.interval> - <nifi.nar.library.directory>./lib</nifi.nar.library.directory> - <nifi.nar.working.directory>./work/nar/</nifi.nar.working.directory> - <nifi.documentation.working.directory>./work/docs/components</nifi.documentation.working.directory> - - <nifi.sensitive.props.algorithm>PBEWITHMD5AND256BITAES-CBC-OPENSSL</nifi.sensitive.props.algorithm> - <nifi.sensitive.props.provider>BC</nifi.sensitive.props.provider> - <nifi.h2.url.append>;LOCK_TIMEOUT=25000;WRITE_DELAY=0;AUTO_SERVER=FALSE</nifi.h2.url.append> - - <nifi.remote.input.socket.port>9990</nifi.remote.input.socket.port> - - <!-- persistent provenance repository properties --> - <nifi.provenance.repository.implementation>org.apache.nifi.provenance.MiNiFiPersistentProvenanceRepository</nifi.provenance.repository.implementation> - <nifi.provenance.repository.directory.default>./provenance_repository</nifi.provenance.repository.directory.default> - <nifi.provenance.repository.max.storage.time>24 hours</nifi.provenance.repository.max.storage.time> - <nifi.provenance.repository.max.storage.size>1 GB</nifi.provenance.repository.max.storage.size> - <nifi.provenance.repository.rollover.time>30 secs</nifi.provenance.repository.rollover.time> - <nifi.provenance.repository.rollover.size>100 MB</nifi.provenance.repository.rollover.size> - <nifi.provenance.repository.query.threads>2</nifi.provenance.repository.query.threads> - <nifi.provenance.repository.index.threads>1</nifi.provenance.repository.index.threads> - <nifi.provenance.repository.compress.on.rollover>true</nifi.provenance.repository.compress.on.rollover> - <nifi.provenance.repository.indexed.fields>EventType, FlowFileUUID, Filename, ProcessorID, Relationship</nifi.provenance.repository.indexed.fields> - <nifi.provenance.repository.indexed.attributes /> - <nifi.provenance.repository.index.shard.size>500 MB</nifi.provenance.repository.index.shard.size> - <nifi.provenance.repository.always.sync>false</nifi.provenance.repository.always.sync> - <nifi.provenance.repository.journal.count>16</nifi.provenance.repository.journal.count> - <nifi.provenance.repository.max.attribute.length>65536</nifi.provenance.repository.max.attribute.length> - - <!-- volatile provenance repository properties --> - <nifi.provenance.repository.buffer.size>100000</nifi.provenance.repository.buffer.size> - - <!-- Component status repository properties --> - <nifi.components.status.repository.implementation>org.apache.nifi.controller.status.history.VolatileComponentStatusRepository</nifi.components.status.repository.implementation> - <nifi.components.status.repository.buffer.size>1440</nifi.components.status.repository.buffer.size> - <nifi.components.status.snapshot.frequency>1 min</nifi.components.status.snapshot.frequency> - - <!-- nifi.properties: web properties --> - <nifi.web.war.directory>./lib</nifi.web.war.directory> - <nifi.web.http.host /> - <nifi.web.http.port>8081</nifi.web.http.port> - <nifi.web.https.host /> - <nifi.web.https.port /> - <nifi.jetty.work.dir>./work/jetty</nifi.jetty.work.dir> - <nifi.web.jetty.threads>200</nifi.web.jetty.threads> - - <!-- nifi.properties: security properties --> - <nifi.security.keystore /> - <nifi.security.keystoreType /> - <nifi.security.keystorePasswd /> - <nifi.security.keyPasswd /> - <nifi.security.truststore /> - <nifi.security.truststoreType /> - <nifi.security.truststorePasswd /> - <nifi.security.needClientAuth /> - <nifi.security.authorizedUsers.file>./conf/authorized-users.xml</nifi.security.authorizedUsers.file> - <nifi.security.user.credential.cache.duration>24 hours</nifi.security.user.credential.cache.duration> - <nifi.security.user.authority.provider>file-provider</nifi.security.user.authority.provider> - <nifi.security.user.login.identity.provider /> - <nifi.security.x509.principal.extractor /> - <nifi.security.support.new.account.requests /> - <nifi.security.anonymous.authorities /> - <nifi.security.ocsp.responder.url /> - <nifi.security.ocsp.responder.certificate /> - - <!-- nifi.properties: cluster common properties (cluster manager and nodes must have same values) --> - <nifi.cluster.protocol.heartbeat.interval>5 sec</nifi.cluster.protocol.heartbeat.interval> - <nifi.cluster.protocol.is.secure>false</nifi.cluster.protocol.is.secure> - <nifi.cluster.protocol.socket.timeout>30 sec</nifi.cluster.protocol.socket.timeout> - <nifi.cluster.protocol.connection.handshake.timeout>45 sec</nifi.cluster.protocol.connection.handshake.timeout> - <nifi.cluster.protocol.use.multicast>false</nifi.cluster.protocol.use.multicast> - <nifi.cluster.protocol.multicast.address /> - <nifi.cluster.protocol.multicast.port /> - <nifi.cluster.protocol.multicast.service.broadcast.delay>500 ms</nifi.cluster.protocol.multicast.service.broadcast.delay> - <nifi.cluster.protocol.multicast.service.locator.attempts>3</nifi.cluster.protocol.multicast.service.locator.attempts> - <nifi.cluster.protocol.multicast.service.locator.attempts.delay>1 sec</nifi.cluster.protocol.multicast.service.locator.attempts.delay> - - <!-- nifi.properties: cluster node properties (only configure for cluster nodes) --> - <nifi.cluster.is.node>false</nifi.cluster.is.node> - <nifi.cluster.node.address /> - <nifi.cluster.node.protocol.port /> - <nifi.cluster.node.protocol.threads>2</nifi.cluster.node.protocol.threads> - <nifi.cluster.node.unicast.manager.address /> - <nifi.cluster.node.unicast.manager.protocol.port /> - - <!-- nifi.properties: cluster manager properties (only configure for cluster manager) --> - <nifi.cluster.is.manager>false</nifi.cluster.is.manager> - <nifi.cluster.manager.address /> - <nifi.cluster.manager.protocol.port /> - <nifi.cluster.manager.node.firewall.file /> - <nifi.cluster.manager.node.event.history.size>10</nifi.cluster.manager.node.event.history.size> - <nifi.cluster.manager.node.api.connection.timeout>30 sec</nifi.cluster.manager.node.api.connection.timeout> - <nifi.cluster.manager.node.api.read.timeout>30 sec</nifi.cluster.manager.node.api.read.timeout> - <nifi.cluster.manager.node.api.request.threads>10</nifi.cluster.manager.node.api.request.threads> - <nifi.cluster.manager.flow.retrieval.delay>5 sec</nifi.cluster.manager.flow.retrieval.delay> - <nifi.cluster.manager.protocol.threads>10</nifi.cluster.manager.protocol.threads> - <nifi.cluster.manager.safemode.duration>0 sec</nifi.cluster.manager.safemode.duration> - - <!-- nifi.properties: kerberos properties --> - <nifi.kerberos.krb5.file> </nifi.kerberos.krb5.file> - <nifi.kerberos.service.principal /> - <nifi.kerberos.keytab.location /> - <nifi.kerberos.authentication.expiration>12 hours</nifi.kerberos.authentication.expiration> </properties> </project> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8913a902/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/authority-providers.xml ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/authority-providers.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/authority-providers.xml deleted file mode 100644 index cb68e15..0000000 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/authority-providers.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!-- - This file lists the authority providers to use when running securely. In order - to use a specific provider it must be configured here and it's identifier - must be specified in the nifi.properties file. ---> -<authorityProviders> - <provider> - <identifier>file-provider</identifier> - <class>org.apache.nifi.authorization.FileAuthorizationProvider</class> - <property name="Authorized Users File">./conf/authorized-users.xml</property> - <property name="Default User Roles"></property> - </provider> - - <!--<provider> - <identifier>cluster-ncm-provider</identifier> - <class>org.apache.nifi.cluster.authorization.ClusterManagerAuthorizationProvider</class> - <property name="Authority Provider Port"></property> - <property name="Authority Provider Threads">10</property> - <property name="Authorized Users File">./conf/authorized-users.xml</property> - <property name="Default User Roles"></property> - </provider>--> - - <!--<provider> - <identifier>cluster-node-provider</identifier> - <class>org.apache.nifi.cluster.authorization.NodeAuthorizationProvider</class> - <property name="Cluster Manager Authority Provider Port"></property> - </provider>--> -</authorityProviders> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8913a902/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/authorized-users.xml ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/authorized-users.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/authorized-users.xml deleted file mode 100644 index 6b07165..0000000 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/authorized-users.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!-- - This file lists all authorized users for this NiFi instance when using - the FileAuthorizationProvider or ClusterManagerAuthorizationProvider. If one of - these providers is not in use then this file is not used. Refer to the properties - file and authority-providers.xml for configuration details. - - Available roles: - ROLE_MONITOR - for users - read only access to flow - ROLE_DFM - for users - can build and configure data flows - ROLE_PROVENANCE - for users - can access data flow provenance - ROLE_ADMIN - for users - read only access to flow; modify user access; can purge flow configuration history - ROLE_PROXY - for systems - can proxy requests on behalf of users - ROLE_NIFI - for systems - can perform site to site ---> -<users> - <!-- - <user dn="[user dn - read only]"> - <role name="ROLE_MONITOR"/> - </user> - <user dn="[user dn - data flow manager]"> - <role name="ROLE_DFM"/> - </user> - <user dn="[user dn - read only and admin]"> - <role name="ROLE_ADMIN"/> - </user> - <user dn="[user dn - data flow manager and admin]"> - <role name="ROLE_DFM"/> - <role name="ROLE_ADMIN"/> - </user> - <user dn="[user dn - read only and provenance details]"> - <role name="ROLE_MONITOR"/> - <role name="ROLE_PROVENANCE"/> - </user> - <user dn="[user dn - data flow manager and provenance details]"> - <role name="ROLE_DFM"/> - <role name="ROLE_PROVENANCE"/> - </user> - <user dn="[system dn - remote NiFi performing site to site]"> - <role name="ROLE_NIFI"/> - </user> - --> -</users> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8913a902/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap-notification-services.xml ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap-notification-services.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap-notification-services.xml deleted file mode 100644 index 260eaf7..0000000 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap-notification-services.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<services> - <!-- This file is used to define how interested parties are notified when events in NiFi's lifecycle occur. --> - <!-- The format of this file is: - <services> - <service> - <id>service-identifier</id> - <class>org.apache.nifi.notifications.DesiredNotificationService</class> - <property name="property name">property value</property> - <property name="another property">another property value</property> - </service> - </services> - - This file can contain 0 to many different service definitions. - The id can then be referenced from the bootstrap.conf file in order to configure the notification service - to be used when particular lifecycle events occur. - --> - -<!-- - <service> - <id>email-notification</id> - <class>org.apache.nifi.bootstrap.notification.email.EmailNotificationService</class> - <property name="SMTP Hostname"></property> - <property name="SMTP Port"></property> - <property name="SMTP Username"></property> - <property name="SMTP Password"></property> - <property name="SMTP TLS"></property> - <property name="From"></property> - <property name="To"></property> - </service> ---> -</services> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8913a902/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/login-identity-providers.xml ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/login-identity-providers.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/login-identity-providers.xml deleted file mode 100644 index 3a57e35..0000000 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/login-identity-providers.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!-- - This file lists the login identity providers to use when running securely. In order - to use a specific provider it must be configured here and it's identifier - must be specified in the nifi.properties file. ---> -<loginIdentityProviders> - <!-- - Identity Provider for users logging in with username/password against an LDAP server. - - 'Authentication Strategy' - How the connection to the LDAP server is authenticated. Possible - values are ANONYMOUS, SIMPLE, or START_TLS. - - 'Manager DN' - The DN of the manager that is used to bind to the LDAP server to search for users. - 'Manager Password' - The password of the manager that is used to bind to the LDAP server to - search for users. - - 'TLS - Keystore' - Path to the Keystore that is used when connecting to LDAP using START_TLS. - 'TLS - Keystore Password' - Password for the Keystore that is used when connecting to LDAP - using START_TLS. - 'TLS - Keystore Type' - Type of the Keystore that is used when connecting to LDAP using - START_TLS (i.e. JKS or PKCS12). - 'TLS - Truststore' - Path to the Truststore that is used when connecting to LDAP using START_TLS. - 'TLS - Truststore Password' - Password for the Truststore that is used when connecting to - LDAP using START_TLS. - 'TLS - Truststore Type' - Type of the Truststore that is used when connecting to LDAP using - START_TLS (i.e. JKS or PKCS12). - 'TLS - Client Auth' - Client authentication policy when connecting to LDAP using START_TLS. - Possible values are REQUIRED, WANT, NONE. - 'TLS - Protocol' - Protocol to use when connecting to LDAP using START_TLS. (i.e. TLS, - TLSv1.1, TLSv1.2, etc). - 'TLS - Shutdown Gracefully' - Specifies whether the TLS should be shut down gracefully - before the target context is closed. Defaults to false. - - 'Referral Strategy' - Strategy for handling referrals. Possible values are FOLLOW, IGNORE, THROW. - 'Connect Timeout' - Duration of connect timeout. (i.e. 10 secs). - 'Read Timeout' - Duration of read timeout. (i.e. 10 secs). - - 'Url' - Url of the LDAP servier (i.e. ldap://<hostname>:<port>). - 'User Search Base' - Base DN for searching for users (i.e. CN=Users,DC=example,DC=com). - 'User Search Filter' - Filter for searching for users against the 'User Search Base'. - (i.e. sAMAccountName={0}). The user specified name is inserted into '{0}'. - - 'Authentication Expiration' - The duration of how long the user authentication is valid - for. If the user never logs out, they will be required to log back in following - this duration. - --> - <!-- To enable the ldap-provider remove 2 lines. This is 1 of 2. - <provider> - <identifier>ldap-provider</identifier> - <class>org.apache.nifi.ldap.LdapProvider</class> - <property name="Authentication Strategy">START_TLS</property> - - <property name="Manager DN"></property> - <property name="Manager Password"></property> - - <property name="TLS - Keystore"></property> - <property name="TLS - Keystore Password"></property> - <property name="TLS - Keystore Type"></property> - <property name="TLS - Truststore"></property> - <property name="TLS - Truststore Password"></property> - <property name="TLS - Truststore Type"></property> - <property name="TLS - Client Auth"></property> - <property name="TLS - Protocol"></property> - <property name="TLS - Shutdown Gracefully"></property> - - <property name="Referral Strategy">FOLLOW</property> - <property name="Connect Timeout">10 secs</property> - <property name="Read Timeout">10 secs</property> - - <property name="Url"></property> - <property name="User Search Base"></property> - <property name="User Search Filter"></property> - - <property name="Authentication Expiration">12 hours</property> - </provider> - To enable the ldap-provider remove 2 lines. This is 2 of 2. --> - - <!-- - Identity Provider for users logging in with username/password against a Kerberos KDC server. - - 'Default Realm' - Default realm to provide when user enters incomplete user principal (i.e. NIFI.APACHE.ORG). - 'Kerberos Config File' - Absolute path to Kerberos client configuration file. - 'Authentication Expiration' - The duration of how long the user authentication is valid for. If the user never logs out, they will be required to log back in following this duration. - --> - <!-- To enable the kerberos-provider remove 2 lines. This is 1 of 2. - <provider> - <identifier>kerberos-provider</identifier> - <class>org.apache.nifi.kerberos.KerberosProvider</class> - <property name="Default Realm">NIFI.APACHE.ORG</property> - <property name="Kerberos Config File">/etc/krb5.conf</property> - <property name="Authentication Expiration">12 hours</property> - </provider> - To enable the kerberos-provider remove 2 lines. This is 2 of 2. --> -</loginIdentityProviders> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8913a902/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/nifi.properties ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/nifi.properties b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/nifi.properties deleted file mode 100644 index 24d2295..0000000 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/nifi.properties +++ /dev/null @@ -1,188 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Core Properties # -nifi.version=${nifi.version} -nifi.flow.configuration.file=${nifi.flow.configuration.file} -nifi.flow.configuration.archive.dir=${nifi.flow.configuration.archive.dir} -nifi.flowcontroller.autoResumeState=${nifi.flowcontroller.autoResumeState} -nifi.flowcontroller.graceful.shutdown.period=${nifi.flowcontroller.graceful.shutdown.period} -nifi.flowservice.writedelay.interval=${nifi.flowservice.writedelay.interval} -nifi.administrative.yield.duration=${nifi.administrative.yield.duration} -# If a component has no work to do (is "bored"), how long should we wait before checking again for work? -nifi.bored.yield.duration=${nifi.bored.yield.duration} - -nifi.authority.provider.configuration.file=${nifi.authority.provider.configuration.file} -nifi.login.identity.provider.configuration.file=${nifi.login.identity.provider.configuration.file} -nifi.templates.directory=${nifi.templates.directory} -nifi.ui.banner.text=${nifi.ui.banner.text} -nifi.ui.autorefresh.interval=${nifi.ui.autorefresh.interval} -nifi.nar.library.directory=${nifi.nar.library.directory} -nifi.nar.working.directory=${nifi.nar.working.directory} -nifi.documentation.working.directory=${nifi.documentation.working.directory} - -#################### -# State Management # -#################### -nifi.state.management.configuration.file=${nifi.state.management.configuration.file} -# The ID of the local state provider -nifi.state.management.provider.local=${nifi.state.management.provider.local} -# The ID of the cluster-wide state provider. This will be ignored if NiFi is not clustered but must be populated if running in a cluster. -nifi.state.management.provider.cluster=${nifi.state.management.provider.cluster} -# Specifies whether or not this instance of NiFi should run an embedded ZooKeeper server -nifi.state.management.embedded.zookeeper.start=${nifi.state.management.embedded.zookeeper.start} -# Properties file that provides the ZooKeeper properties to use if <nifi.state.management.embedded.zookeeper.start> is set to true -nifi.state.management.embedded.zookeeper.properties=${nifi.state.management.embedded.zookeeper.properties} - - -# H2 Settings -nifi.database.directory=${nifi.database.directory} -nifi.h2.url.append=${nifi.h2.url.append} - -# FlowFile Repository -nifi.flowfile.repository.implementation=${nifi.flowfile.repository.implementation} -nifi.flowfile.repository.directory=${nifi.flowfile.repository.directory} -nifi.flowfile.repository.partitions=${nifi.flowfile.repository.partitions} -nifi.flowfile.repository.checkpoint.interval=${nifi.flowfile.repository.checkpoint.interval} -nifi.flowfile.repository.always.sync=${nifi.flowfile.repository.always.sync} - -nifi.swap.manager.implementation=${nifi.swap.manager.implementation} -nifi.queue.swap.threshold=${nifi.queue.swap.threshold} -nifi.swap.in.period=${nifi.swap.in.period} -nifi.swap.in.threads=${nifi.swap.in.threads} -nifi.swap.out.period=${nifi.swap.out.period} -nifi.swap.out.threads=${nifi.swap.out.threads} - -# Content Repository -nifi.content.repository.implementation=${nifi.content.repository.implementation} -nifi.content.claim.max.appendable.size=${nifi.content.claim.max.appendable.size} -nifi.content.claim.max.flow.files=${nifi.content.claim.max.flow.files} -nifi.content.repository.directory.default=${nifi.content.repository.directory.default} -nifi.content.repository.archive.max.retention.period=${nifi.content.repository.archive.max.retention.period} -nifi.content.repository.archive.max.usage.percentage=${nifi.content.repository.archive.max.usage.percentage} -nifi.content.repository.archive.enabled=${nifi.content.repository.archive.enabled} -nifi.content.repository.always.sync=${nifi.content.repository.always.sync} -nifi.content.viewer.url=${nifi.content.viewer.url} - -# Provenance Repository Properties -nifi.provenance.repository.implementation=${nifi.provenance.repository.implementation} - -# Persistent Provenance Repository Properties -nifi.provenance.repository.directory.default=${nifi.provenance.repository.directory.default} -nifi.provenance.repository.max.storage.time=${nifi.provenance.repository.max.storage.time} -nifi.provenance.repository.max.storage.size=${nifi.provenance.repository.max.storage.size} -nifi.provenance.repository.rollover.time=${nifi.provenance.repository.rollover.time} -nifi.provenance.repository.rollover.size=${nifi.provenance.repository.rollover.size} -nifi.provenance.repository.query.threads=${nifi.provenance.repository.query.threads} -nifi.provenance.repository.index.threads=${nifi.provenance.repository.index.threads} -nifi.provenance.repository.compress.on.rollover=${nifi.provenance.repository.compress.on.rollover} -nifi.provenance.repository.always.sync=${nifi.provenance.repository.always.sync} -nifi.provenance.repository.journal.count=${nifi.provenance.repository.journal.count} -# Comma-separated list of fields. Fields that are not indexed will not be searchable. Valid fields are: -# EventType, FlowFileUUID, Filename, TransitURI, ProcessorID, AlternateIdentifierURI, Relationship, Details -nifi.provenance.repository.indexed.fields=${nifi.provenance.repository.indexed.fields} -# FlowFile Attributes that should be indexed and made searchable. Some examples to consider are filename, uuid, mime.type -nifi.provenance.repository.indexed.attributes=${nifi.provenance.repository.indexed.attributes} -# Large values for the shard size will result in more Java heap usage when searching the Provenance Repository -# but should provide better performance -nifi.provenance.repository.index.shard.size=${nifi.provenance.repository.index.shard.size} -# Indicates the maximum length that a FlowFile attribute can be when retrieving a Provenance Event from -# the repository. If the length of any attribute exceeds this value, it will be truncated when the event is retrieved. -nifi.provenance.repository.max.attribute.length=${nifi.provenance.repository.max.attribute.length} - -# Volatile Provenance Respository Properties -nifi.provenance.repository.buffer.size=${nifi.provenance.repository.buffer.size} - -# Component Status Repository -nifi.components.status.repository.implementation=${nifi.components.status.repository.implementation} -nifi.components.status.repository.buffer.size=${nifi.components.status.repository.buffer.size} -nifi.components.status.snapshot.frequency=${nifi.components.status.snapshot.frequency} - -# Site to Site properties -nifi.remote.input.socket.host= -nifi.remote.input.socket.port= -nifi.remote.input.secure=true - -# web properties # -nifi.web.war.directory=${nifi.web.war.directory} -nifi.web.http.host=${nifi.web.http.host} -nifi.web.http.port=${nifi.web.http.port} -nifi.web.https.host=${nifi.web.https.host} -nifi.web.https.port=${nifi.web.https.port} -nifi.web.jetty.working.directory=${nifi.jetty.work.dir} -nifi.web.jetty.threads=${nifi.web.jetty.threads} - -# security properties # -nifi.sensitive.props.key= -nifi.sensitive.props.algorithm=${nifi.sensitive.props.algorithm} -nifi.sensitive.props.provider=${nifi.sensitive.props.provider} - -nifi.security.keystore=${nifi.security.keystore} -nifi.security.keystoreType=${nifi.security.keystoreType} -nifi.security.keystorePasswd=${nifi.security.keystorePasswd} -nifi.security.keyPasswd=${nifi.security.keyPasswd} -nifi.security.truststore=${nifi.security.truststore} -nifi.security.truststoreType=${nifi.security.truststoreType} -nifi.security.truststorePasswd=${nifi.security.truststorePasswd} -nifi.security.needClientAuth=${nifi.security.needClientAuth} -nifi.security.user.credential.cache.duration=${nifi.security.user.credential.cache.duration} -nifi.security.user.authority.provider=${nifi.security.user.authority.provider} -nifi.security.user.login.identity.provider=${nifi.security.user.login.identity.provider} -nifi.security.support.new.account.requests=${nifi.security.support.new.account.requests} -# Valid Authorities include: ROLE_MONITOR,ROLE_DFM,ROLE_ADMIN,ROLE_PROVENANCE,ROLE_NIFI -nifi.security.anonymous.authorities=${nifi.security.anonymous.authorities} -nifi.security.ocsp.responder.url=${nifi.security.ocsp.responder.url} -nifi.security.ocsp.responder.certificate=${nifi.security.ocsp.responder.certificate} - -# cluster common properties (cluster manager and nodes must have same values) # -nifi.cluster.protocol.heartbeat.interval=${nifi.cluster.protocol.heartbeat.interval} -nifi.cluster.protocol.is.secure=${nifi.cluster.protocol.is.secure} -nifi.cluster.protocol.socket.timeout=${nifi.cluster.protocol.socket.timeout} -nifi.cluster.protocol.connection.handshake.timeout=${nifi.cluster.protocol.connection.handshake.timeout} -# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties must be configured # -nifi.cluster.protocol.use.multicast=${nifi.cluster.protocol.use.multicast} -nifi.cluster.protocol.multicast.address=${nifi.cluster.protocol.multicast.address} -nifi.cluster.protocol.multicast.port=${nifi.cluster.protocol.multicast.port} -nifi.cluster.protocol.multicast.service.broadcast.delay=${nifi.cluster.protocol.multicast.service.broadcast.delay} -nifi.cluster.protocol.multicast.service.locator.attempts=${nifi.cluster.protocol.multicast.service.locator.attempts} -nifi.cluster.protocol.multicast.service.locator.attempts.delay=${nifi.cluster.protocol.multicast.service.locator.attempts.delay} - -# cluster node properties (only configure for cluster nodes) # -nifi.cluster.is.node=${nifi.cluster.is.node} -nifi.cluster.node.address=${nifi.cluster.node.address} -nifi.cluster.node.protocol.port=${nifi.cluster.node.protocol.port} -nifi.cluster.node.protocol.threads=${nifi.cluster.node.protocol.threads} -# if multicast is not used, nifi.cluster.node.unicast.xxx must have same values as nifi.cluster.manager.xxx # -nifi.cluster.node.unicast.manager.address=${nifi.cluster.node.unicast.manager.address} -nifi.cluster.node.unicast.manager.protocol.port=${nifi.cluster.node.unicast.manager.protocol.port} - -# cluster manager properties (only configure for cluster manager) # -nifi.cluster.is.manager=${nifi.cluster.is.manager} -nifi.cluster.manager.address=${nifi.cluster.manager.address} -nifi.cluster.manager.protocol.port=${nifi.cluster.manager.protocol.port} -nifi.cluster.manager.node.firewall.file=${nifi.cluster.manager.node.firewall.file} -nifi.cluster.manager.node.event.history.size=${nifi.cluster.manager.node.event.history.size} -nifi.cluster.manager.node.api.connection.timeout=${nifi.cluster.manager.node.api.connection.timeout} -nifi.cluster.manager.node.api.read.timeout=${nifi.cluster.manager.node.api.read.timeout} -nifi.cluster.manager.node.api.request.threads=${nifi.cluster.manager.node.api.request.threads} -nifi.cluster.manager.flow.retrieval.delay=${nifi.cluster.manager.flow.retrieval.delay} -nifi.cluster.manager.protocol.threads=${nifi.cluster.manager.protocol.threads} -nifi.cluster.manager.safemode.duration=${nifi.cluster.manager.safemode.duration} - -# kerberos # -nifi.kerberos.krb5.file=${nifi.kerberos.krb5.file} -nifi.kerberos.service.principal=${nifi.kerberos.service.principal} -nifi.kerberos.keytab.location=${nifi.kerberos.keytab.location} -nifi.kerberos.authentication.expiration=${nifi.kerberos.authentication.expiration} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8913a902/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/zookeeper.properties ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/zookeeper.properties b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/zookeeper.properties deleted file mode 100644 index fa1d885..0000000 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/zookeeper.properties +++ /dev/null @@ -1,45 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -# - -clientPort=2181 -initLimit=10 -autopurge.purgeInterval=24 -syncLimit=5 -tickTime=2000 -dataDir=./state/zookeeper -autopurge.snapRetainCount=30 - -# -# Specifies the servers that are part of this zookeeper ensemble. For -# every NiFi instance running an embedded zookeeper, there needs to be -# a server entry below. For instance: -# -# server.1=nifi-node1-hostname:2888:3888 -# server.2=nifi-node2-hostname:2888:3888 -# server.3=nifi-node3-hostname:2888:3888 -# -# The index of the server corresponds to the myid file that gets created -# in the dataDir of each node running an embedded zookeeper. See the -# administration guide for more details. -# - -server.1= \ No newline at end of file