fix quoting
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Robert Kaussow 2019-10-03 00:21:48 +02:00
parent 590cf91d59
commit a782f76217
2 changed files with 4 additions and 5 deletions

View File

@ -26,7 +26,6 @@ freshrss_healthcheck:
timeout: 5s timeout: 5s
retries: 5 retries: 5
freshrss_environment: "production"
freshrss_default_user: "admin" freshrss_default_user: "admin"
freshrss_default_password: "freshrss" freshrss_default_password: "freshrss"
# Salt is used to make crypto more unique. # Salt is used to make crypto more unique.

View File

@ -19,7 +19,7 @@ services:
{% endfor %} {% endfor %}
{% endif %} {% endif %}
environment: environment:
- FRESHRSS_ENVIRONMENT="production" - FRESHRSS_ENVIRONMENT=production
{% if freshrss_salt is defined and freshrss_salt %} {% if freshrss_salt is defined and freshrss_salt %}
- FRESHRSS_SALT={{ freshrss_salt }} - FRESHRSS_SALT={{ freshrss_salt }}
{% endif %} {% endif %}
@ -31,7 +31,7 @@ services:
{% endif %} {% endif %}
- FRESHRSS_DEFAULT_USER={{ freshrss_default_user }} - FRESHRSS_DEFAULT_USER={{ freshrss_default_user }}
- FRESHRSS_DEFAULT_PASSWORD={{ freshrss_default_password }} - FRESHRSS_DEFAULT_PASSWORD={{ freshrss_default_password }}
- FRESHRSS_ALLOW_ANONYMOUS="{{ freshrss_allow_anonymous }} - FRESHRSS_ALLOW_ANONYMOUS={{ freshrss_allow_anonymous }}
- FRESHRSS_ALLOW_ANONYMOUS_REFRESH={{ freshrss_allow_anonymous_refresh }} - FRESHRSS_ALLOW_ANONYMOUS_REFRESH={{ freshrss_allow_anonymous_refresh }}
- FRESHRSS_AUTH_TYPE={{ freshrss_auth_type }} - FRESHRSS_AUTH_TYPE={{ freshrss_auth_type }}
- FRESHRSS_API_ENABLED={{ freshrss_api_enabled }} - FRESHRSS_API_ENABLED={{ freshrss_api_enabled }}
@ -68,12 +68,12 @@ services:
{% if freshrss_curlopt_proxyuserpwd is defined and freshrss_curlopt_proxyuserpwd %} {% if freshrss_curlopt_proxyuserpwd is defined and freshrss_curlopt_proxyuserpwd %}
- FRESHRSS_CURLOPT_PROXYUSERPWD={{ freshrss_curlopt_proxyuserpwd }} - FRESHRSS_CURLOPT_PROXYUSERPWD={{ freshrss_curlopt_proxyuserpwd }}
{% endif %} {% endif %}
- FRESHRSS_DB_TYPE="pgsql" - FRESHRSS_DB_TYPE=pgsql
- FRESHRSS_DB_HOST={{ freshrss_postgres_server }}:{{ freshrss_postgres_port }};sslmode={{ freshrss_postgres_ssl_mode }};sslrootcert={{ freshrss_postgres_ssl_rootcert }} - FRESHRSS_DB_HOST={{ freshrss_postgres_server }}:{{ freshrss_postgres_port }};sslmode={{ freshrss_postgres_ssl_mode }};sslrootcert={{ freshrss_postgres_ssl_rootcert }}
- FRESHRSS_DB_USER={{ freshrss_postgres_user.name }} - FRESHRSS_DB_USER={{ freshrss_postgres_user.name }}
- FRESHRSS_DB_PASSWORD={{ freshrss_postgres_user.password }} - FRESHRSS_DB_PASSWORD={{ freshrss_postgres_user.password }}
- FRESHRSS_DB_BASE={{ freshrss_postgres_db.name }} - FRESHRSS_DB_BASE={{ freshrss_postgres_db.name }}
- FRESHRSS_DB_PREFIX="freshrss_" - FRESHRSS_DB_PREFIX=freshrss_
- FRESHRSS_EXTENSIONS_ENABLED={{ freshrss_extensions_enabled | join(',') }} - FRESHRSS_EXTENSIONS_ENABLED={{ freshrss_extensions_enabled | join(',') }}
{% if freshrss_memory_limit is defined %} {% if freshrss_memory_limit is defined %}
mem_limit: {{ freshrss_memory_limit }} mem_limit: {{ freshrss_memory_limit }}