diff --git a/docker-compose.yml b/docker-compose.yml index 0fbf578..5bbd3c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: ports: - ${KIMAI_HOST_IP_ADDRESS:-127.0.0.1}:${KIMAI_HOST_PORT:-8001}:8001 volumes: - - ./config/local.yaml:/opt/kimai/config/packages/local.yaml:ro + - ./kimai_config/local.yaml:/opt/kimai/config/packages/local.yaml:ro environment: ADMINMAIL: ${KIMAI_SUPERADMIN_MAIL:-admin@kimai.local} ADMINPASS: ${KIMAI_SUPERADMIN_PASSWORD:-password} diff --git a/setup b/setup index 3e48e5e..057abc5 100755 --- a/setup +++ b/setup @@ -92,31 +92,31 @@ cat "config" >> ".env" read -p "Should the config file 'config' be deleted after creating the container? (y/n)" DELETE_CONFIG -if [ -f "config/local.yaml" ]; then +if [ -f "kimai_config/local.yaml" ]; then KIMAI_CONFIG_EXISTS="true" - read -p "Kimai config file 'config/local.yaml' already exists! Would you like to use this? (y/n)" USE_EXISTING_KIMAI_CONFIG + read -p "Kimai config file 'kimai_config/local.yaml' already exists! Would you like to use this? (y/n)" USE_EXISTING_KIMAI_CONFIG fi if [ $KIMAI_CONFIG_EXISTS == "false" ] || [ $USE_EXISTING_KIMAI_CONFIG == "n" ]; then - echo "Create blank kimai config file 'config/local.yaml'!" + echo "Create blank kimai config file 'kimai_config/local.yaml'!" - rm -rf touch config/local.yaml - mkdir -p config - touch config/local.yaml + rm -rf kimai_config/local.yaml + mkdir -p kimai_config + touch kimai_config/local.yaml read -p "Would you like to disable user registration and password reset via mail? (y/n)" DISABLE_REGISTRATION read -p "Would you like to set the session lifetime to 24h? (y/n)" SESSION_LIFETIME_TO_24H if [ $DISABLE_REGISTRATION == "y" ]; then - cat "config_examples/disable_registration_and_password_reset.yaml" >> "config/local.yaml" + cat "kimai_config_examples/disable_registration_and_password_reset.yaml" >> "kimai_config/local.yaml" fi if [ $SESSION_LIFETIME_TO_24H == "y" ]; then - cat "config_examples/session_lifetime_24h.yaml" >> "config/local.yaml" + cat "kimai_config_examples/session_lifetime_24h.yaml" >> "kimai_config/local.yaml" fi else - echo "Use existing kimai config file 'config/local.yaml'!" + echo "Use existing kimai config file 'kimai_config/local.yaml'!" fi docker-compose up -d