mirror.MikroTik/eduardogsilva.routerfleet
1
1
Fork 0
mirror of https://github.com/eduardogsilva/routerfleet.git synced 2025-07-21 19:34:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue with non standard http/https ports

Browse source
This commit is contained in:
Eduardo Silva 2024-04-18 09:44:03 -03:00
parent 89ec66b4ad
commit c7f1dd2e9e
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docker-compose-dev.yml
View file

@ -26,7 +26,7 @@ services:
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
- TZ=${TIMEZONE} - TZ=${TIMEZONE}
- COMPOSE_VERSION=02c - COMPOSE_VERSION=02d
- COMPOSE_TYPE=with-postgres - COMPOSE_TYPE=with-postgres
volumes: volumes:

2
docker-compose-no-postgres.yml
View file

@ -13,7 +13,7 @@ services:
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
- TZ=${TIMEZONE} - TZ=${TIMEZONE}
- COMPOSE_VERSION=02c - COMPOSE_VERSION=02d
- COMPOSE_TYPE=no-postgres - COMPOSE_TYPE=no-postgres
volumes: volumes:
- sqlite_volume:/var/lib/routerfleet_sqlite/ - sqlite_volume:/var/lib/routerfleet_sqlite/

2
docker-compose.yml
View file

@ -25,7 +25,7 @@ services:
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
- TZ=${TIMEZONE} - TZ=${TIMEZONE}
- COMPOSE_VERSION=02c - COMPOSE_VERSION=02d
- COMPOSE_TYPE=with-postgres - COMPOSE_TYPE=with-postgres
volumes: volumes:
- sqlite_volume:/var/lib/routerfleet_sqlite/ - sqlite_volume:/var/lib/routerfleet_sqlite/

6
entrypoint.sh
View file

@ -3,7 +3,7 @@ PRODUCTION_SETTINGS_FILE="/app/routerfleet/production_settings.py"
set -e set -e
if [[ "$COMPOSE_VERSION" != "02c" ]]; then if [[ "$COMPOSE_VERSION" != "02d" ]]; then
echo "ERROR: Please upgrade your docker compose file. Exiting." echo "ERROR: Please upgrade your docker compose file. Exiting."
exit 1 exit 1
fi fi
@ -66,9 +66,11 @@ if [[ "${DEBUG_MODE,,}" == "true" ]]; then
DEBUG_VALUE="True" DEBUG_VALUE="True"
fi fi
SERVER_HOSTNAME=$(echo $SERVER_ADDRESS | cut -d ':' -f 1)
cat > $PRODUCTION_SETTINGS_FILE <<EOL cat > $PRODUCTION_SETTINGS_FILE <<EOL
DEBUG = $DEBUG_VALUE DEBUG = $DEBUG_VALUE
ALLOWED_HOSTS = ['routerfleet', '$SERVER_ADDRESS'] ALLOWED_HOSTS = ['routerfleet', '$SERVER_HOSTNAME']
CSRF_TRUSTED_ORIGINS = ['http://routerfleet', 'https://$SERVER_ADDRESS', 'http://$SERVER_ADDRESS'] CSRF_TRUSTED_ORIGINS = ['http://routerfleet', 'https://$SERVER_ADDRESS', 'http://$SERVER_ADDRESS']
SECRET_KEY = '$(openssl rand -base64 32)' SECRET_KEY = '$(openssl rand -base64 32)'
$DATABASES_CONFIG $DATABASES_CONFIG