-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor of environment variable usage
- Removed prefixes from each image confd settings. - Allows the use/overriding of settings defined by parent images. - Shared database/jwt configuration. - Conslidated common behavoir for importing/overriding variables. - Conslidated common behavoir for database creation - Updates to documentation - Removed references to GEMINI
- Loading branch information
1 parent
18a6631
commit 4995819
Showing
187 changed files
with
1,651 additions
and
1,244 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,4 +4,4 @@ dest = "/opt/activemq/conf/users.properties" | |
uid = 100 | ||
gid = 1000 | ||
mode = "0640" | ||
keys = [ "/user" ] | ||
keys = [ "/" ] |
This file was deleted.
Oops, something went wrong.
4 changes: 2 additions & 2 deletions
4
activemq/rootfs/etc/confd/templates/credentials.properties.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# Defines credentials that will be used by components (like web console) to access the broker | ||
activemq.username={{ getv "/user" (getenv "ACTIVEMQ_USER") }} | ||
activemq.password={{ getv "/password" (getenv "ACTIVEMQ_PASSWORD") }} | ||
activemq.username={{ getenv "ACTIVEMQ_USER" }} | ||
activemq.password={{ getenv "ACTIVEMQ_PASSWORD" }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# Defines groups and the users that belong to them. | ||
# group=user[,user ...] | ||
{{ range $dir := lsdir "/group" }}{{ getv (printf "/group/%s/name" $dir) }}={{ getv (printf "/group/%s/members" $dir) }} | ||
{{ range $dir := lsdir "/activemq/group" }}{{ getv (printf "/activemq/group/%s/name" $dir) }}={{ getv (printf "/activemq/group/%s/members" $dir) }} | ||
{{ end }} |
4 changes: 2 additions & 2 deletions
4
activemq/rootfs/etc/confd/templates/jetty-realm.properties.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Defines users that can access the web (console, demo, etc.) | ||
# username: password [,rolename ...] | ||
{{ getv "/web/admin/name" (getenv "ACTIVEMQ_WEB_ADMIN_NAME") }}: {{ getv "/web/admin/password" (getenv "ACTIVEMQ_WEB_ADMIN_PASSWORD") }}, {{ getv "/web/admin/roles" (getenv "ACTIVEMQ_WEB_ADMIN_ROLES") }} | ||
{{ range $dir := lsdir "/web/user" }}{{ getv (printf "/web/user/%s/name" $dir) }}: {{ getv (printf "/web/user/%s/password" $dir) }}, {{ getv (printf "/web/user/%s/roles" $dir) }} | ||
{{ getenv "ACTIVEMQ_WEB_ADMIN_NAME" }}: {{ getenv "ACTIVEMQ_WEB_ADMIN_PASSWORD" }}, {{ getenv "ACTIVEMQ_WEB_ADMIN_ROLES" }} | ||
{{ range $dir := lsdir "/activemq/web/user" }}{{ getv (printf "/activemq/web/user/%s/name" $dir) }}: {{ getv (printf "/activemq/web/user/%s/password" $dir) }}, {{ getv (printf "/activemq/web/user/%s/roles" $dir) }} | ||
{{ end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
{{ range $dir := lsdir "/user" }}{{ getv (printf "/user/%s/name" $dir) }}={{ getv (printf "/user/%s/password" $dir) }} | ||
{{ range $dir := lsdir "/activemq/user" }}{{ getv (printf "/activemq/user/%s/name" $dir) }}={{ getv (printf "/activemq/user/%s/password" $dir) }} | ||
{{ end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
alpaca/rootfs/etc/confd/templates/ca.islandora.alpaca.http.client.cfg.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
token.value={{ getv "/http/token" (getenv "ALPACA_HTTP_TOKEN") }} | ||
token.value={{ getenv "ALPACA_HTTP_TOKEN" }} |
16 changes: 8 additions & 8 deletions
16
alpaca/rootfs/etc/confd/templates/ca.islandora.alpaca.indexing.fcrepo.cfg.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
error.maxRedeliveries={{ getv "/indexing/redeliveries" (getenv "ALPACA_INDEXING_REDELIVERIES") }} | ||
file.external.stream={{ getv "/indexing/stream/file/external" (getenv "ALPACA_INDEXING_STREAM_FILE_EXTERNAL") }} | ||
file.delete.stream={{ getv "/indexing/stream/file/delete" (getenv "ALPACA_INDEXING_STREAM_FILE_DELETE") }} | ||
file.stream={{ getv "/indexing/stream/file/index" (getenv "ALPACA_INDEXING_STREAM_FILE_INDEX") }} | ||
media.stream={{ getv "/indexing/stream/media/index" (getenv "ALPACA_INDEXING_STREAM_MEDIA_INDEX") }} | ||
milliner.baseUrl={{ getv "/indexing/milliner/url" (getenv "ALPACA_INDEXING_MILLINER_URL") }} | ||
node.delete.stream={{ getv "/indexing/stream/node/delete" (getenv "ALPACA_INDEXING_STREAM_NODE_DELETE") }} | ||
node.stream={{ getv "/indexing/stream/node/index" (getenv "ALPACA_INDEXING_STREAM_NODE_INDEX") }} | ||
error.maxRedeliveries={{ getenv "ALPACA_INDEXING_REDELIVERIES" }} | ||
file.external.stream={{ getenv "ALPACA_INDEXING_STREAM_FILE_EXTERNAL" }} | ||
file.delete.stream={{ getenv "ALPACA_INDEXING_STREAM_FILE_DELETE" }} | ||
file.stream={{ getenv "ALPACA_INDEXING_STREAM_FILE_INDEX" }} | ||
media.stream={{ getenv "ALPACA_INDEXING_STREAM_MEDIA_INDEX" }} | ||
milliner.baseUrl={{ getenv "ALPACA_INDEXING_MILLINER_URL" }} | ||
node.delete.stream={{ getenv "ALPACA_INDEXING_STREAM_NODE_DELETE" }} | ||
node.stream={{ getenv "ALPACA_INDEXING_STREAM_NODE_INDEX" }} |
8 changes: 4 additions & 4 deletions
8
alpaca/rootfs/etc/confd/templates/ca.islandora.alpaca.indexing.triplestore.cfg.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
index.stream={{ getv "/indexing/stream/triplestore/index" (getenv "ALPACA_INDEXING_STREAM_TRIPLESTORE_INDEX") }} | ||
delete.stream={{ getv "/indexing/stream/triplestore/delete" (getenv "ALPACA_INDEXING_STREAM_TRIPLESTORE_DELETE") }} | ||
triplestore.baseUrl={{ getv "/indexing/url" (getenv "ALPACA_INDEXING_URL") }} | ||
error.maxRedeliveries={{ getv "/indexing/redeliveries" (getenv "ALPACA_INDEXING_REDELIVERIES") }} | ||
index.stream={{ getenv "ALPACA_INDEXING_STREAM_TRIPLESTORE_INDEX" }} | ||
delete.stream={{ getenv "ALPACA_INDEXING_STREAM_TRIPLESTORE_DELETE" }} | ||
triplestore.baseUrl={{ getenv "ALPACA_INDEXING_URL" }} | ||
error.maxRedeliveries={{ getenv "ALPACA_INDEXING_REDELIVERIES" }} |
6 changes: 3 additions & 3 deletions
6
alpaca/rootfs/etc/confd/templates/org.fcrepo.camel.indexing.triplestore.cfg.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
input.stream={{ getv "/indexing/stream/input" (getenv "ALPACA_INDEXING_STREAM_INPUT") }} | ||
triplestore.baseUrl={{ getv "/indexing/url" (getenv "ALPACA_INDEXING_URL") }} | ||
triplestore.reindex.stream={{ getv "/indexing/stream/triplestore/reindex" (getenv "ALPACA_INDEXING_STREAM_TRIPLESTORE_REINDEX") }} | ||
input.stream={{ getenv "ALPACA_INDEXING_STREAM_INPUT" }} | ||
triplestore.baseUrl={{ getenv "ALPACA_INDEXING_URL" }} | ||
triplestore.reindex.stream={{ getenv "ALPACA_INDEXING_STREAM_TRIPLESTORE_REINDEX" }} |
Oops, something went wrong.