Add more variables to configuration file
This commit is contained in:
parent
c79c0f47af
commit
2272ba4b93
2 changed files with 11 additions and 8 deletions
|
@ -4,6 +4,8 @@ mastodon_initial_setup: false
|
|||
mastodon_owner: MyUser
|
||||
mastodon_owner_email: myemail@example.org
|
||||
|
||||
mastodon_environment: production
|
||||
|
||||
redis_pass: "{{ vault_mastodon_redis_password }}"
|
||||
mastodon_secret_key_base: "{{ vault_mastodon_secret_key_base }}"
|
||||
mastodon_otp_secret: "{{ vault_mastodon_otp_secret }}"
|
||||
|
@ -60,7 +62,7 @@ mastodon_home: "/home/{{ mastodon_user }}"
|
|||
mastodon_db_user: "{{ mastodon_user }}"
|
||||
mastodon_db_password: "{{ vault_mastodon_db_password }}"
|
||||
mastodon_path: "live"
|
||||
mastodon_db: "{{ mastodon_user }}_instance"
|
||||
mastodon_db: "mastodon"
|
||||
mastodon_db_port: 5432
|
||||
mastodon_nginx_symlink: "/var/www/html/mastodon"
|
||||
disable_hsts: "false"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# environment
|
||||
RAILS_ENV=production
|
||||
NODE_ENV=production
|
||||
RAILS_ENV={{ mastodon_environment }}
|
||||
NODE_ENV={{ mastodon_environment }}
|
||||
|
||||
# domain
|
||||
LOCAL_DOMAIN={{ mastodon_host }}
|
||||
|
@ -47,17 +47,14 @@ VAPID_PUBLIC_KEY=
|
|||
|
||||
# postgresql configuration
|
||||
POSTGRES_USER={{ mastodon_db_user }}
|
||||
POSTGRES_DB={{ mastodon_db }}
|
||||
POSTGRES_DB={{ mastodon_db }}_{{ mastodon_environment }}
|
||||
POSTGRES_PASSWORD={{ mastodon_db_password }}
|
||||
|
||||
# pgbouncer configuration
|
||||
#POOL_MODE=transaction
|
||||
#ADMIN_USERS=postgres,mastodon
|
||||
#DATABASE_URL="postgres://mastodon:O6lOD6nF2LbhhJs1e7QL@postgresql:5432/mastodon_production"
|
||||
#DATABASE_URL="postgres://{{ mastodon_db_user }}:{{ mastodon_db_password }}@postgresql:5432/{{ mastodon_db }}_{{ mastodon_environment }}"
|
||||
|
||||
# elasticsearch
|
||||
ES_JAVA_OPTS=-Xms512m -Xmx512m
|
||||
ELASTIC_PASSWORD={{ es_pass }}
|
||||
|
||||
# mastodon database configuration
|
||||
#DB_HOST=pgbouncer
|
||||
|
@ -73,6 +70,10 @@ REDIS_PORT={{ redis_port }}
|
|||
CACHE_REDIS_HOST=redis-volatile
|
||||
CACHE_REDIS_PORT=6379
|
||||
|
||||
# elasticsearch
|
||||
ES_JAVA_OPTS=-Xms512m -Xmx512m
|
||||
ELASTIC_PASSWORD={{ es_pass }}
|
||||
|
||||
ES_ENABLED={{ es_enabled }}
|
||||
ES_HOST={{ es_host }}
|
||||
ES_PORT={{ es_port }}
|
||||
|
|
Loading…
Reference in a new issue