diff options
| author | EuAndreh <eu@euandre.org> | 2019-05-27 22:37:11 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2019-05-27 22:37:11 -0300 |
| commit | d70212ec571b4d16e8eb98cf83daa94e4cb0c6f4 (patch) | |
| tree | da225b8ec8d9485c4ac12e8bb7aa92978b2238da | |
| parent | Fix formatting of default.nix (linter offense) (diff) | |
| download | server-d70212ec571b4d16e8eb98cf83daa94e4cb0c6f4.tar.gz server-d70212ec571b4d16e8eb98cf83daa94e4cb0c6f4.tar.xz | |
Use Bash variables for domain names and container ports
| -rw-r--r-- | docker-compose.yaml | 18 | ||||
| -rw-r--r-- | secrets/envrc.sh | bin | 445 -> 562 bytes |
2 files changed, 9 insertions, 9 deletions
diff --git a/docker-compose.yaml b/docker-compose.yaml index c268cf1..f2036ae 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -33,11 +33,11 @@ services: volumes: - "${VOLUME_HOME}/static:/usr/share/nginx/html" ports: - - "5001:80" + - "${STATIC_PORT}:80" environment: - - VIRTUAL_HOST=${TLD} - - VIRTUAL_PORT=5001 - - LETSENCRYPT_HOST=${TLD} + - VIRTUAL_HOST=${STATIC_TLD} + - VIRTUAL_PORT=${STATIC_PORT} + - LETSENCRYPT_HOST=${STATIC_TLD} - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL} wallabag: @@ -48,12 +48,12 @@ services: - "${VOLUME_HOME}/applications/wallabag/data:/var/www/wallabag/data" - "${VOLUME_HOME}/applications/wallabag/images:/var/www/wallabag/web/assets/images" ports: - - "5000:80" + - "${WALLABAG_PORT}:80" environment: - SYMFONY__ENV__FOSUSER_REGISTRATION=false - SYMFONY__ENV__FOSUSER_CONFIRMATION=false - - SYMFONY__ENV__DOMAIN_NAME=https://wallabag.${TLD} - - VIRTUAL_HOST=wallabag.${TLD} - - VIRTUAL_PORT=5000 - - LETSENCRYPT_HOST=wallabag.${TLD} + - SYMFONY__ENV__DOMAIN_NAME=https://${WALLABAG_TLD} + - VIRTUAL_HOST=${WALLABAG_TLD} + - VIRTUAL_PORT=${WALLABAG_PORT} + - LETSENCRYPT_HOST=${WALLABAG_TLD} - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL} diff --git a/secrets/envrc.sh b/secrets/envrc.sh Binary files differindex a00bf29..82700f0 100644 --- a/secrets/envrc.sh +++ b/secrets/envrc.sh |