From a892961046d9872476178cb63ab39334decce0aa Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <ad@susurrando.com>
Date: Sun, 9 Jul 2023 17:33:58 +0300
Subject: [PATCH] organize and update defaults

---
 defaults/main.yml | 74 ++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 4234463..10ecc38 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,28 +7,64 @@ mastodon_owner_email: myemail@example.org
 mastodon_environment: production
 
 redis_pass: "{{ vault_mastodon_redis_password }}"
+redis_host: redis
+redis_port: 6379
+redis_cache_host: redis-volatile
+redis_cache_port: 6379
+
 mastodon_secret_key_base: "{{ vault_mastodon_secret_key_base }}"
 mastodon_otp_secret: "{{ vault_mastodon_otp_secret }}"
 mastodon_paperclip_secret: "{{ vault_mastodon_paperclip_secret }}"
-vapid_public_key: "{{ vault_mastodon_vapid_public_key }}"
-vapid_private_key: "{{ vault_mastodon_vapid_private_key }}"
-smtp_from_address: mastodon-admin@example.com
-smtp_server: mail.example.com
+mastodon_db: mastodon
+mastodon_db_login_unix_socket: db
+mastodon_db_port: 5432
+mastodon_db_password: "{{ vault_mastodon_db_password }}"
 mastodon_host: mastodon.example.com
 mastodon_web_domain: example.com
 mastodon_alternate_domains: ''
 mastodon_authorized_fetch: 'false'
 mastodon_limited_federation: 'false'
-#Use HTTP only for Vagrant testing or for reverse proxy purposes.
-use_http: true
-ansible_python_interpreter: "/usr/bin/python2"
+mastodon_bare_installation: false
+mastodon_composer_folder: /opt/mastodon
 mastodon_docker_image: "moritzheiber/mastodon-docker"
 mastodon_docker_network: "mastodon_network"
+mastodon_version: "latest" 
+mastodon_allow_prerelease: "false"
+mastodon_user: "mastodon"
+mastodon_home: "/home/{{ mastodon_user }}"
+mastodon_db_user: "{{ mastodon_user }}"
+mastodon_path: "live"
+mastodon_nginx_symlink: "/var/www/html/mastodon"
+
+
+vapid_public_key: "{{ vault_mastodon_vapid_public_key }}"
+vapid_private_key: "{{ vault_mastodon_vapid_private_key }}"
+
+smtp_from_address: mastodon-admin@example.com
+smtp_server: mail.example.com
+smtp_port: 465
+smtp_password: "{{ vault_mastodon_admin_mail_password }}"
+
+
+#Use HTTP only for Vagrant testing or for reverse proxy purposes.
+use_http: true
+
+es_enabled: 'true'
+es_host: localhost
+es_port: 19200
+es_user: elastic
+es_pass: "{{ vault_mastodon_es_pass }}"
+es_version: 7.17.7
+
+ansible_python_interpreter: "/usr/bin/python2"
+
+single_user_mode: 'false'
 
 docker_command: docker
 docker_daemon_settings:
-  iptables: false
   log-driver: journald
+  storage-driver: zfs
+
 install_python_packages:
   - package: "docker"
 
@@ -55,36 +91,16 @@ node_major_version: "16"
 os_family: "{{ ansible_os_family|lower }}"
 #Please list a valid name of the tag from Mastodon's Github.
 #Accepted format is "vX.X.XrcX"
-mastodon_version: "latest" 
-mastodon_allow_prerelease: "false"
-mastodon_user: "mastodon"
-mastodon_home: "/home/{{ mastodon_user }}"
-mastodon_db_user: "{{ mastodon_user }}"
-mastodon_db_password: "{{ vault_mastodon_db_password }}"
-mastodon_path: "live"
-mastodon_db: "mastodon"
-mastodon_db_port: 5432
-mastodon_nginx_symlink: "/var/www/html/mastodon"
 disable_hsts: "false"
 disable_letsencrypt: "false"
 #Nginx will listen to every IP/Domain with this directive. Useful for reverse proxy or testing only.
 nginx_catch_all: "false"
-redis_host: 127.0.0.1
-redis_port: 6379
 self_signed_cert_location: /etc/ssl/certs
 self_signed_key_location: /etc/ssl/private
-mastodon_composer_folder: /opt/mastodon
 media_remove_schedule: 'Sat *-*-* 00:10:00'
 preview_cards_remove_schedule: 'Sat *-*-* 00:20:00'
 search_deploy_schedule: 'Sat *-*-* 03:00:00'
 
-es_enabled: 'false'
-es_host: localhost
-es_port: 9200
-es_user: elastic
-es_pass: "{{ vault_mastodon_es_pass }}"
-es_version: 7.17.7
-
 s3_enabled: 'false'
 s3_bucket: ''
 aws_access_key_id: ''
@@ -93,14 +109,12 @@ s3_alias_host: ''
 
 limited_federation_mode: 'false'
 disabllow_unauthenticated_api_access: 'false'
-single_user_mode: 'true'
 
 web_concurrency: 2
 max_threads: 5
 default_locale: en
 
 ubuntu_codename: "{{ ansible_distribution_release }}"
-mastodon_db_login_unix_socket: postgresql # "/var/run/postgresql"
 
 packages:
   - package: "autoconf"