Skip to content

Commit

Permalink
#39 Configure nexus log verbosity
Browse files Browse the repository at this point in the history
  • Loading branch information
ppxl committed Mar 31, 2020
1 parent 4d2de37 commit 9b54061
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# registry.cloudogu.com/official/nexus
FROM registry.cloudogu.com/official/java:8u222-1
FROM registry.cloudogu.com/official/java:8u242-1
LABEL maintainer="robert.auer@cloudogu.com" \
NAME="official/nexus" \
VERSION="3.19.1-1"
Expand Down
21 changes: 18 additions & 3 deletions dogu.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,32 @@
"Configuration": [
{
"Name": "nexus.repository.sandbox.enable",
"Description": "Enable repository sandboxing",
"Description": "Enable repository sandboxing. This key is going to be deprecated. Please use 'enable_repository_sandbox' as direct replacement.",
"Optional": true
},
{
"Name": "installDefaultDockerRegistry",
"Description": "If set to false, the default docker registry is not installed",
"Description": "If set to false, the default docker registry is not installed. This key is going to be deprecated. Please use 'install_default_docker_registry' as direct replacement.",
"Optional": true
},
{
"Name": "disableOutreachManagement",
"Description": "Disable the outreach management capability",
"Description": "Disable the outreach management capability. This key is going to be deprecated. Please use 'disable_outreach_management' as direct replacement.",
"Optional": true
},
{
"Name": "enable_repository_sandbox",
"Description": "Enable repository sandboxing.",
"Optional": true
},
{
"Name": "install_default_docker_registry",
"Description": "If set to false, the default docker registry is not installed.",
"Optional": true
},
{
"Name": "disable_outreach_management",
"Description": "Disable the outreach management capability.",
"Optional": true
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"newAdminPassword": "{{ .Env.Get "NEWADMINPASSWORD" }}",
"lastAdminGroup": "{{ .Config.GetOrDefault "admin_group_last" "" }}",
"adminGroup": "{{ .GlobalConfig.Get "admin_group" }}",
"disableOutreachManagement": "{{ .Config.GetOrDefault "disableOutreachManagement" "false" }}",
"disableOutreachManagement": "{{ .Config.GetOrDefault "disable_outreach_management" "false" }}",
{{ if .Config.Exists "proxyConfiguration/http/host" }}
"proxyConfigurationHttpHost": "{{ .Config.Get "proxyConfiguration/http/host" }}"{{ end }}{{ if .Config.Exists "proxyConfiguration/http/port" }},
"proxyConfigurationHttpPort": {{ .Config.Get "proxyConfiguration/http/port" }}{{ end }}{{ if .Config.Exists "proxyConfiguration/http/authentication/username" }},
Expand Down
6 changes: 3 additions & 3 deletions resources/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ function setNexusProperties() {
EOF

echo "Checking if repository sandboxing should be enabled..."
if doguctl config nexus.repository.sandbox.enable >/dev/null; then
sandboxEnable=$(doguctl config nexus.repository.sandbox.enable)
if doguctl config enable_repository_sandbox >/dev/null; then
sandboxEnable=$(doguctl config enable_repository_sandbox)
echo "Setting repository sandboxing to ${sandboxEnable}"
echo "nexus.repository.sandbox.enable=${sandboxEnable}" >>${NEXUS_DATA_DIR}/etc/nexus.properties
else
Expand Down Expand Up @@ -217,7 +217,7 @@ if [ "$(doguctl config successfulInitialConfiguration)" != "true" ]; then
exportNexusPasswordFromEtcd

# Install default docker registry if not prohibited by etcd key
if "$(doguctl config --default true installDefaultDockerRegistry)" != "false"; then
if "$(doguctl config --default true install_default_docker_registry)" != "false"; then
installDefaultDockerRegistry
fi

Expand Down

0 comments on commit 9b54061

Please sign in to comment.