From c48538a1c607789faa975cb5f5e5fb3013499849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Sat, 18 Mar 2023 13:34:35 +0700 Subject: [PATCH] Add primary domain setting --- .env.example | 5 +++-- .env.test | 2 ++ app/models/setting.rb | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index de85a10..fef8c93 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ +PRIMARY_DOMAIN=kosmos.org AKKOUNTS_DOMAIN=accounts.example.com SMTP_SERVER=smtp.example.com @@ -9,13 +10,13 @@ SMTP_DOMAIN=example.com SMTP_AUTH_METHOD=plain SMTP_ENABLE_STARTTLS=auto -REDIS_URL='redis://localhost:6379/1' - LDAP_HOST=localhost LDAP_PORT=389 LDAP_ADMIN_PASSWORD=passthebutter LDAP_SUFFIX='dc=kosmos,dc=org' +REDIS_URL='redis://localhost:6379/1' + WEBHOOKS_ALLOWED_IPS='10.1.1.163' DISCOURSE_PUBLIC_URL='https://community.kosmos.org' diff --git a/.env.test b/.env.test index 31947dd..92892e3 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,5 @@ +PRIMARY_DOMAIN=kosmos.org + DISCOURSE_PUBLIC_URL='http://discourse.example.com' DISCOURSE_CONNECT_SECRET='discourse_connect_ftw' diff --git a/app/models/setting.rb b/app/models/setting.rb index d25da65..1fee361 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -2,6 +2,9 @@ class Setting < RailsSettings::Base cache_prefix { "v1" } + field :primary_domain, type: :string, + default: ENV["PRIMARY_DOMAIN"].presence + field :accounts_domain, type: :string, default: ENV["AKKOUNTS_DOMAIN"].presence