Skip to content

Commit

Permalink
Check default config in manticore.conf
Browse files Browse the repository at this point in the history
  • Loading branch information
djklim87 committed Nov 23, 2023
1 parent c9af504 commit f07590b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 0 additions & 7 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,6 @@ _main() {
fi
fi

confHash=$(md5sum /etc/manticoresearch/manticore.conf | awk '{print $1}')
expectedConfHash=$(cat /manticore.conf.md5)

if [[ "$confHash" == "$expectedConfHash" ]]; then
export searchd_listen='9306:mysql41|/var/run/mysqld/mysqld.sock:mysql41|9308:http|$ip:9312|$ip:9315-9325:replication'
fi

if ! _searchd_want_help "@"; then
docker_setup_env "$@"
fi
Expand Down
6 changes: 6 additions & 0 deletions manticore.conf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ else
conf=$(bash /etc/manticoresearch/manticore.conf)
fi

confHash=$(md5sum /etc/manticoresearch/manticore.conf | awk '{print $1}')
expectedConfHash=$(cat /manticore.conf.md5)

if [[ "$confHash" == "$expectedConfHash" ]]; then
export searchd_listen='9306:mysql41|/var/run/mysqld/mysqld.sock:mysql41|9308:http|$ip:9312|$ip:9315-9325:replication'
fi

while IFS='=' read -r envVariable value; do
if [[ "${envVariable}" == searchd_* ]]; then
Expand Down

0 comments on commit f07590b

Please sign in to comment.