Merge branch 'master' into feature/rs-oauth

This commit is contained in:
Râu Cao
2023-07-04 16:43:32 +02:00
23 changed files with 296 additions and 158 deletions

View File

@@ -29,6 +29,7 @@ class Setting < RailsSettings::Base
field :xmpp_default_rooms, type: :array, default: []
field :xmpp_autojoin_default_rooms, type: :boolean, default: false
field :xmpp_notifications_from_address, type: :string, default: primary_domain
#
# Sentry
@@ -41,13 +42,13 @@ class Setting < RailsSettings::Base
# Discourse
#
field :discourse_public_url, type: :string, readonly: true,
field :discourse_public_url, type: :string,
default: ENV["DISCOURSE_PUBLIC_URL"].presence
field :discourse_enabled, type: :boolean,
default: (ENV["DISCOURSE_PUBLIC_URL"].present?.to_s || false)
field :discourse_connect_secret, type: :string, readonly: true,
field :discourse_connect_secret, type: :string,
default: ENV["DISCOURSE_CONNECT_SECRET"].presence
#
@@ -57,10 +58,10 @@ class Setting < RailsSettings::Base
field :ejabberd_enabled, type: :boolean,
default: (ENV["EJABBERD_API_URL"].present?.to_s || false)
field :ejabberd_api_url, type: :string, readonly: true,
field :ejabberd_api_url, type: :string,
default: ENV["EJABBERD_API_URL"].presence
field :ejabberd_admin_url, type: :string, readonly: true,
field :ejabberd_admin_url, type: :string,
default: ENV["EJABBERD_ADMIN_URL"].presence
field :ejabberd_buddy_roster, type: :string,
@@ -70,7 +71,7 @@ class Setting < RailsSettings::Base
# Gitea
#
field :gitea_public_url, type: :string, readonly: true,
field :gitea_public_url, type: :string,
default: ENV["GITEA_PUBLIC_URL"].presence
field :gitea_enabled, type: :boolean,
@@ -80,7 +81,7 @@ class Setting < RailsSettings::Base
# Lightning Network
#
field :lndhub_api_url, type: :string, readonly: true,
field :lndhub_api_url, type: :string,
default: ENV["LNDHUB_API_URL"].presence
field :lndhub_enabled, type: :boolean,
@@ -89,7 +90,7 @@ class Setting < RailsSettings::Base
field :lndhub_admin_enabled, type: :boolean,
default: (ENV["LNDHUB_ADMIN_UI"] || false)
field :lndhub_public_key, type: :string, readonly: true,
field :lndhub_public_key, type: :string,
default: (ENV["LNDHUB_PUBLIC_KEY"] || "")
field :lndhub_keysend_enabled, type: :boolean,
@@ -99,7 +100,7 @@ class Setting < RailsSettings::Base
# Mastodon
#
field :mastodon_public_url, type: :string, readonly: true,
field :mastodon_public_url, type: :string,
default: ENV["MASTODON_PUBLIC_URL"].presence
field :mastodon_enabled, type: :boolean,
@@ -109,7 +110,7 @@ class Setting < RailsSettings::Base
# MediaWiki
#
field :mediawiki_public_url, type: :string, readonly: true,
field :mediawiki_public_url, type: :string,
default: ENV["MEDIAWIKI_PUBLIC_URL"].presence
field :mediawiki_enabled, type: :boolean,