Dev/ansible-role-outline-wiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: AWS variable, fake S3 condition.

Browse Source
This commit is contained in:
Laur Ivan 2022-12-08 18:33:59 +01:00
parent b89c369824
commit 8b84af081f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/docker-compose.yml.j2
View File

@ -41,7 +41,7 @@ services:
# External database at "{{ outline_db_schema }}:{{ outline_db_host }}: {{ outline_db_port }}" # External database at "{{ outline_db_schema }}:{{ outline_db_host }}: {{ outline_db_port }}"
{% endif %} {% endif %}
{% if outline_fake_s3 %} {% if outline_fake_s3 and (outline_fake_s3 != "") %}
s3: s3:
image: lphoward/fake-s3 image: lphoward/fake-s3
env_file: env_file:
@ -61,15 +61,19 @@ services:
command: sh -c "yarn start" command: sh -c "yarn start"
# command: sh -c "yarn sequelize:migrate --env production-ssl-disabled && yarn start" # command: sh -c "yarn sequelize:migrate --env production-ssl-disabled && yarn start"
env_file: env_file:
- ./env.outline.conf - "{{ outline_setup_path }}/env.outline.conf"
- ./env.oidc.conf - "{{ outline_setup_path }}/env.oidc.conf"
#restart: never restart: always
ports: ports:
- {{ outline_port }}:3000 - {{ outline_port }}:3000
depends_on: depends_on:
{% if outline_db_schema == 'postgres' and outline_db_host == 'postgres' %}
- postgres - postgres
{% endif %}
- redis - redis
{% if outline_fake_s3 and (outline_fake_s3 != "") %}
- s3 - s3
{% endif %}
networks: networks:
- outline - outline

2
templates/env.outline.conf.j2
View File

@ -59,7 +59,7 @@ SENTRY_DSN=
AWS_ACCESS_KEY_ID={{ outline_aws_access_key_id }} AWS_ACCESS_KEY_ID={{ outline_aws_access_key_id }}
AWS_SECRET_ACCESS_KEY={{ outline_aws_secret_access_key }} AWS_SECRET_ACCESS_KEY={{ outline_aws_secret_access_key }}
AWS_REGION={{ outline_aws_region }} AWS_REGION={{ outline_aws_region }}
AWS_S3_UPLOAD_BUCKET_URL={ outline_aws_s3_upload_bucket_url} AWS_S3_UPLOAD_BUCKET_URL={{ outline_aws_s3_upload_bucket_url }}
AWS_S3_UPLOAD_BUCKET_NAME={{ outline_aws_s3_upload_bucket_name }} AWS_S3_UPLOAD_BUCKET_NAME={{ outline_aws_s3_upload_bucket_name }}
AWS_S3_UPLOAD_MAX_SIZE={{ outline_aws_s3_upload_max_size }} AWS_S3_UPLOAD_MAX_SIZE={{ outline_aws_s3_upload_max_size }}
AWS_S3_FORCE_PATH_STYLE={{ outline_aws_s3_force_path_style }} AWS_S3_FORCE_PATH_STYLE={{ outline_aws_s3_force_path_style }}