diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d4ababb5..ea7458b20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab-manager +## v6.0.3 2023 April 12 + +- Fix a bug: unable to install Fab-manager by setup.sh + ## v6.0.2 2023 April 05 - Italian language support (credits to https://crowdin.com/profile/olazzari) diff --git a/setup/setup.sh b/setup/setup.sh index 1b68c62c8..fa2d52f30 100755 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -210,6 +210,9 @@ prepare_files() # Fab-manager environment variables \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/env.example > "$FABMANAGER_PATH/config/env" + # Fab-manager auth provider configuration file + touch "$FABMANAGER_PATH/config/auth_provider.yml" + # nginx configuration if [ "$NGINX" != "n" ]; then mkdir -p "$FABMANAGER_PATH/config/nginx" @@ -272,7 +275,7 @@ prepare_nginx() if [ "$network" = "" ]; then network="web"; fi echo "Adding a network configuration to the docker-compose.yml file..." - yq -i eval ".networks.$network.external = \"true\"" docker-compose.yml + yq -i eval ".networks.$network.external = true" docker-compose.yml yq -i eval '.networks.db = "" | .networks.db tag="!!null"' docker-compose.yml yq -i eval '.services.fabmanager.networks += ["web"]' docker-compose.yml yq -i eval '.services.fabmanager.networks += ["db"]' docker-compose.yml @@ -368,6 +371,10 @@ configure_env_file() sed -i.bak "s/DEFAULT_HOST=.*/DEFAULT_HOST=${MAIN_DOMAIN[0]}/g" "$FABMANAGER_PATH/config/env" fi + # we automatically generate the SECRET_KEY_BASE + secret=$(docker-compose -f "$FABMANAGER_PATH/docker-compose.yml" run --rm "$SERVICE" bundle exec rake secret) + sed -i.bak "s/SECRET_KEY_BASE=/SECRET_KEY_BASE=$secret/g" "$FABMANAGER_PATH/config/env" + printf "\n\nWe will now configure the environment variables.\n" echo "This allows you to customize Fab-manager's appearance and behavior." read -rp "Proceed? (Y/n) " confirm /dev/null; then @@ -437,7 +441,10 @@ setup_assets_and_databases() read -rp "Continue? (Y/n) " confirm