rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

add ES config files to initial setup & fix ES upgrade script

Browse Source
This commit is contained in:
Sylvain 2018-12-03 16:06:08 +01:00
parent 6794b12555
commit fab1e4eb6b
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,7 +1,9 @@
# Changelog Fab Manager # Changelog Fab Manager
- Applied rubocop roles to ruby files - Applied Rubocop rules to some ruby files
- Prevent running elastic-upgrade script with wrong awk version - Prevent running elastic-upgrade script with wrong awk version
- Fix ElasticSearch upgrade script
- Setup ElasticSearch configuration files for new installations
# v2.7.3 2018 December 03 # v2.7.3 2018 December 03

1
docker/docker-compose.yml
View File

@ -35,6 +35,7 @@ services:
soft: -1 soft: -1
hard: -1 hard: -1
volumes: volumes:
- ${PWD}/elasticsearch/config:/usr/share/elasticsearch/config
- ${PWD}/elasticsearch:/usr/share/elasticsearch/data - ${PWD}/elasticsearch:/usr/share/elasticsearch/data
restart: always restart: always

5
docker/setup.sh
View File

@ -5,6 +5,7 @@ prepare_config()
FABMANAGER_PATH=${1:-/apps/fabmanager} FABMANAGER_PATH=${1:-/apps/fabmanager}
mkdir -p "$FABMANAGER_PATH/example" mkdir -p "$FABMANAGER_PATH/example"
mkdir -p "$FABMANAGER_PATH/elasticsearch/config"
# fab-manager environment variables # fab-manager environment variables
\curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/env.example > "$FABMANAGER_PATH/example/env.example" \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/env.example > "$FABMANAGER_PATH/example/env.example"
@ -16,6 +17,10 @@ prepare_config()
# let's encrypt configuration # let's encrypt configuration
\curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/webroot.ini.example > "$FABMANAGER_PATH/example/webroot.ini.example" \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/webroot.ini.example > "$FABMANAGER_PATH/example/webroot.ini.example"
# ElasticSearch configuration files
\curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/elasticsearch.yml > "$FABMANAGER_PATH/elasticsearch/config/elasticsearch.yml"
\curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/log4j2.properties > "$FABMANAGER_PATH/elasticsearch/config/log4j2.properties"
# docker-compose # docker-compose
\curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/docker-compose.yml > "$FABMANAGER_PATH/docker-compose.yml" \curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/docker-compose.yml > "$FABMANAGER_PATH/docker-compose.yml"
} }

2
scripts/elastic-upgrade.sh
View File

@ -321,7 +321,7 @@ upgrade_compose()
# set the configuration directory # set the configuration directory
dir=$(echo "${dir//[$'\t\r\n ']}/config") dir=$(echo "${dir//[$'\t\r\n ']}/config")
# insert configuration directory into docker-compose bindings # insert configuration directory into docker-compose bindings
awk "BEGIN { FS=\"\n\"; RS=\"\";} { print gensub(/(image: elasticsearch:2\.4(\n|.)+)volumes:\n/, \"\\1volumes:\n - ${dir}:/usr/share/elasticsearch/config\n\", \"g\") }" "$FM_PATH/docker-compose.yml" > "$FM_PATH/.awktmpfile" && mv "$FM_PATH/.awktmpfile" "$FM_PATH/docker-compose.yml" awk "BEGIN { FS=\"\n\"; RS=\"\";} { print gensub(/(image: elasticsearch:2\.4(\n|.)+)volumes:\n/, \"\\\\1volumes:\n - ${dir}:/usr/share/elasticsearch/config\n\", \"g\") }" "$FM_PATH/docker-compose.yml" > "$FM_PATH/.awktmpfile" && mv "$FM_PATH/.awktmpfile" "$FM_PATH/docker-compose.yml"
echo -e "\nCopying ElasticSearch 2.4 configuration files from $(pwd)/docker to $dir..." echo -e "\nCopying ElasticSearch 2.4 configuration files from $(pwd)/docker to $dir..."
mkdir -p "$dir" mkdir -p "$dir"
curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/elasticsearch.yml > "$dir/elasticsearch.yml" curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/elasticsearch.yml > "$dir/elasticsearch.yml"