Skip to content

Commit

Permalink
Use jaeger init script
Browse files Browse the repository at this point in the history
Signed-off-by: Pavol Loffay <[email protected]>
  • Loading branch information
pavolloffay committed Feb 11, 2019
1 parent b6cd5d8 commit ef3af20
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
29 changes: 29 additions & 0 deletions elasticsearch/init/0001-jaeger
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/bash
#
# Copyright 2018 Red Hat, Inc. and/or its affiliates
# and other contributors as indicated by the @author tags.
#
# Licensed 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.

script=$(basename $0)

source "logging"
info "Starting init script: ${script}"

if [ -n "${NAMESPACE:-}" ] ; then
sed -i -e 's/namespace:.*/namespace: '"$NAMESPACE"'/' ${HOME}/sgconfig/sg_config.yml
else
error "NAMESPACE variable is not set. Failed to substitute it in Jaeger SearchGuard config"
fi

info "Completed init script: ${script}"
2 changes: 0 additions & 2 deletions elasticsearch/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ else
exit 1
fi

sed -i -e 's/namespace:.*/namespace: '"$NAMESPACE"'/' sgconfig/sg_config.yml

build_jks_truststores
./init.sh &

Expand Down

0 comments on commit ef3af20

Please sign in to comment.