Browse Source

fix: correct kimai config

master
Dennis Buchhorn 2 years ago
parent
commit
c53b8e5f99
2 changed files with 10 additions and 10 deletions
  1. +1
    -1
      docker-compose.yml
  2. +9
    -9
      setup

+ 1
- 1
docker-compose.yml View File

@ -7,7 +7,7 @@ services:
ports: ports:
- ${KIMAI_HOST_IP_ADDRESS:-127.0.0.1}:${KIMAI_HOST_PORT:-8001}:8001 - ${KIMAI_HOST_IP_ADDRESS:-127.0.0.1}:${KIMAI_HOST_PORT:-8001}:8001
volumes: volumes:
- ./config/local.yaml:/opt/kimai/config/packages/local.yaml:ro
- ./kimai_config/local.yaml:/opt/kimai/config/packages/local.yaml:ro
environment: environment:
ADMINMAIL: ${KIMAI_SUPERADMIN_MAIL:-admin@kimai.local} ADMINMAIL: ${KIMAI_SUPERADMIN_MAIL:-admin@kimai.local}
ADMINPASS: ${KIMAI_SUPERADMIN_PASSWORD:-password} ADMINPASS: ${KIMAI_SUPERADMIN_PASSWORD:-password}


+ 9
- 9
setup View File

@ -92,31 +92,31 @@ cat "config" >> ".env"
read -p "Should the config file 'config' be deleted after creating the container? (y/n)" DELETE_CONFIG 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" 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 fi
if [ $KIMAI_CONFIG_EXISTS == "false" ] || [ $USE_EXISTING_KIMAI_CONFIG == "n" ]; then 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 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 read -p "Would you like to set the session lifetime to 24h? (y/n)" SESSION_LIFETIME_TO_24H
if [ $DISABLE_REGISTRATION == "y" ]; then 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 fi
if [ $SESSION_LIFETIME_TO_24H == "y" ]; then 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 fi
else else
echo "Use existing kimai config file 'config/local.yaml'!"
echo "Use existing kimai config file 'kimai_config/local.yaml'!"
fi fi
docker-compose up -d docker-compose up -d


Loading…
Cancel
Save