This is an automated email from the ASF dual-hosted git repository.
kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
The following commit(s) were added to refs/heads/master by this push:
new cdb39d3 NIFIREG-226: Fix overriding db props in Docker via
environment variables
cdb39d3 is described below
commit cdb39d398fd463e9c6ebdb5fb872b0aa78b6de31
Author: Justin Gondron <[email protected]>
AuthorDate: Wed Dec 12 13:19:15 2018 -0500
NIFIREG-226: Fix overriding db props in Docker via environment variables
The mapping from env to registry properties for the database user, pass,
and max connections are referencing the incorrect property names.
This should fix the issue in the Docker update_database.sh script, and
correct other references in the documentation.
This closes #151.
Signed-off-by: Kevin Doran <[email protected]>
---
nifi-registry-core/nifi-registry-docker/dockerhub/README.md | 6 +++---
.../nifi-registry-docker/dockerhub/sh/update_database.sh | 8 ++++----
.../src/main/asciidoc/administration-guide.adoc | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/nifi-registry-core/nifi-registry-docker/dockerhub/README.md
b/nifi-registry-core/nifi-registry-docker/dockerhub/README.md
index 4374d02..790b175 100644
--- a/nifi-registry-core/nifi-registry-docker/dockerhub/README.md
+++ b/nifi-registry-core/nifi-registry-docker/dockerhub/README.md
@@ -131,9 +131,9 @@ volume to provide certificates on the host system to the
container instance.
| nifi.registry.db.url | NIFI_REGISTRY_DB_URL |
| nifi.registry.db.driver.class | NIFI_REGISTRY_DB_CLASS |
| nifi.registry.db.driver.directory | NIFI_REGISTRY_DB_DIR |
-| nifi.registry.db.driver.username | NIFI_REGISTRY_DB_USER |
-| nifi.registry.db.driver.password | NIFI_REGISTRY_DB_PASS |
-| nifi.registry.db.driver.maxConnections | NIFI_REGISTRY_DB_MAX_CONNS |
+| nifi.registry.db.username | NIFI_REGISTRY_DB_USER |
+| nifi.registry.db.password | NIFI_REGISTRY_DB_PASS |
+| nifi.registry.db.maxConnections | NIFI_REGISTRY_DB_MAX_CONNS |
| nifi.registry.db.sql.debug | NIFI_REGISTRY_DB_DEBUG_SQL |
#### The following, optional environment variables may be added to configure
flow persistence provider.
diff --git
a/nifi-registry-core/nifi-registry-docker/dockerhub/sh/update_database.sh
b/nifi-registry-core/nifi-registry-docker/dockerhub/sh/update_database.sh
index c1c3c6f..59d94d7 100644
--- a/nifi-registry-core/nifi-registry-docker/dockerhub/sh/update_database.sh
+++ b/nifi-registry-core/nifi-registry-docker/dockerhub/sh/update_database.sh
@@ -18,7 +18,7 @@
prop_replace 'nifi.registry.db.url'
"${NIFI_REGISTRY_DB_URL:-jdbc:h2:./database/nifi-registry-primary;AUTOCOMMIT=OFF;DB_CLOSE_ON_EXIT=FALSE;LOCK_MODE=3;LOCK_TIMEOUT=25000;WRITE_DELAY=0;AUTO_SERVER=FALSE}"
prop_replace 'nifi.registry.db.driver.class'
"${NIFI_REGISTRY_DB_CLASS:-org.h2.Driver}"
prop_replace 'nifi.registry.db.driver.directory'
"${NIFI_REGISTRY_DB_DIR:-}"
-prop_replace 'nifi.registry.db.driver.username'
"${NIFI_REGISTRY_DB_USER:-nifireg}"
-prop_replace 'nifi.registry.db.driver.password'
"${NIFI_REGISTRY_DB_PASS:-nifireg}"
-prop_replace 'nifi.registry.db.driver.maxConnections'
"${NIFI_REGISTRY_DB_MAX_CONNS:-5}"
-prop_replace 'nifi.registry.db.sql.debug'
"${NIFI_REGISTRY_DB_DEBUG_SQL:-false}"
\ No newline at end of file
+prop_replace 'nifi.registry.db.username'
"${NIFI_REGISTRY_DB_USER:-nifireg}"
+prop_replace 'nifi.registry.db.password'
"${NIFI_REGISTRY_DB_PASS:-nifireg}"
+prop_replace 'nifi.registry.db.maxConnections'
"${NIFI_REGISTRY_DB_MAX_CONNS:-5}"
+prop_replace 'nifi.registry.db.sql.debug'
"${NIFI_REGISTRY_DB_DEBUG_SQL:-false}"
diff --git
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
index 53e32cf..f56da94 100644
---
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
+++
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
@@ -936,9 +936,9 @@ is configured via the following properties:
|`nifi.registry.db.url`| The full JDBC connection string. The default value
will specify a new H2 database in the same location as the previous one. For
example, `jdbc:h2:./database/nifi-registry-primary;`.
|`nifi.registry.db.driver.class`| The class name of the JDBC driver. The
default value is `org.h2.Driver`.
|`nifi.registry.db.driver.directory`| An optional directory containing one or
more JARs to add to the classpath. If not specified, it is assumed that the
driver JAR is already on the classpath by copying it to the `lib` directory.
The H2 driver is bundled with Registry so it is not necessary to do anything
for the default case.
-|`nifi.registry.db.driver.username`| The username for the database. The
default value is `nifireg`.
-|`nifi.registry.db.driver.password`| The password for the database. The
default value is `nifireg`.
-|`nifi.registry.db.driver.maxConnections`| The max number of connections for
the connection pool. The default value is `5`.
+|`nifi.registry.db.username`| The username for the database. The default value
is `nifireg`.
+|`nifi.registry.db.password`| The password for the database. The default value
is `nifireg`.
+|`nifi.registry.db.maxConnections`| The max number of connections for the
connection pool. The default value is `5`.
|`nifi.registry.db.sql.debug`| Whether or not enable debug logging for SQL
statements. The default value is `false`.
|====
