From 4ae10c9b535087e0228c68b993421934b778d019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Wed, 28 Aug 2024 14:39:08 +0200
Subject: [PATCH 01/12] Refactor settings model

Move the various sections to their own concerns, so they're easier to
find and maintain
---
 .../concerns/settings/btcpay_settings.rb      |  24 ++
 .../concerns/settings/discourse_settings.rb   |  16 ++
 .../concerns/settings/drone_ci_settings.rb    |  13 +
 .../concerns/settings/ejabberd_settings.rb    |  19 ++
 .../concerns/settings/email_settings.rb       |  28 +++
 .../concerns/settings/general_settings.rb     |  34 +++
 .../concerns/settings/gitea_settings.rb       |  13 +
 .../settings/lightning_network_settings.rb    |  25 ++
 .../concerns/settings/mastodon_settings.rb    |  16 ++
 .../concerns/settings/media_wiki_settings.rb  |  13 +
 .../concerns/settings/nostr_settings.rb       |  22 ++
 .../settings/open_collective_settings.rb      |   9 +
 .../settings/remote_storage_settings.rb       |  16 ++
 app/models/concerns/settings/xmpp_settings.rb |  11 +
 app/models/setting.rb                         | 233 ++----------------
 15 files changed, 276 insertions(+), 216 deletions(-)
 create mode 100644 app/models/concerns/settings/btcpay_settings.rb
 create mode 100644 app/models/concerns/settings/discourse_settings.rb
 create mode 100644 app/models/concerns/settings/drone_ci_settings.rb
 create mode 100644 app/models/concerns/settings/ejabberd_settings.rb
 create mode 100644 app/models/concerns/settings/email_settings.rb
 create mode 100644 app/models/concerns/settings/general_settings.rb
 create mode 100644 app/models/concerns/settings/gitea_settings.rb
 create mode 100644 app/models/concerns/settings/lightning_network_settings.rb
 create mode 100644 app/models/concerns/settings/mastodon_settings.rb
 create mode 100644 app/models/concerns/settings/media_wiki_settings.rb
 create mode 100644 app/models/concerns/settings/nostr_settings.rb
 create mode 100644 app/models/concerns/settings/open_collective_settings.rb
 create mode 100644 app/models/concerns/settings/remote_storage_settings.rb
 create mode 100644 app/models/concerns/settings/xmpp_settings.rb

diff --git a/app/models/concerns/settings/btcpay_settings.rb b/app/models/concerns/settings/btcpay_settings.rb
new file mode 100644
index 0000000..c3a3b23
--- /dev/null
+++ b/app/models/concerns/settings/btcpay_settings.rb
@@ -0,0 +1,24 @@
+module Settings
+  module BtcpaySettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :btcpay_api_url, type: :string,
+        default: ENV["BTCPAY_API_URL"].presence
+
+      field :btcpay_enabled, type: :boolean,
+        default: ENV["BTCPAY_API_URL"].present?
+
+      field :btcpay_public_url, type: :string,
+        default: ENV["BTCPAY_PUBLIC_URL"].presence
+
+      field :btcpay_store_id, type: :string,
+        default: ENV["BTCPAY_STORE_ID"].presence
+
+      field :btcpay_auth_token, type: :string,
+        default: ENV["BTCPAY_AUTH_TOKEN"].presence
+
+      field :btcpay_publish_wallet_balances, type: :boolean, default: true
+    end
+  end
+end
diff --git a/app/models/concerns/settings/discourse_settings.rb b/app/models/concerns/settings/discourse_settings.rb
new file mode 100644
index 0000000..e246281
--- /dev/null
+++ b/app/models/concerns/settings/discourse_settings.rb
@@ -0,0 +1,16 @@
+module Settings
+  module DiscourseSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :discourse_public_url, type: :string,
+        default: ENV["DISCOURSE_PUBLIC_URL"].presence
+
+      field :discourse_enabled, type: :boolean,
+        default: ENV["DISCOURSE_PUBLIC_URL"].present?
+
+      field :discourse_connect_secret, type: :string,
+        default: ENV["DISCOURSE_CONNECT_SECRET"].presence
+    end
+  end
+end
diff --git a/app/models/concerns/settings/drone_ci_settings.rb b/app/models/concerns/settings/drone_ci_settings.rb
new file mode 100644
index 0000000..5e9c770
--- /dev/null
+++ b/app/models/concerns/settings/drone_ci_settings.rb
@@ -0,0 +1,13 @@
+module Settings
+  module DroneCiSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :droneci_public_url, type: :string,
+        default: ENV["DRONECI_PUBLIC_URL"].presence
+
+      field :droneci_enabled, type: :boolean,
+        default: ENV["DRONECI_PUBLIC_URL"].present?
+    end
+  end
+end
diff --git a/app/models/concerns/settings/ejabberd_settings.rb b/app/models/concerns/settings/ejabberd_settings.rb
new file mode 100644
index 0000000..5aa76b1
--- /dev/null
+++ b/app/models/concerns/settings/ejabberd_settings.rb
@@ -0,0 +1,19 @@
+module Settings
+  module EjabberdSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :ejabberd_enabled, type: :boolean,
+        default: ENV["EJABBERD_API_URL"].present?
+
+      field :ejabberd_api_url, type: :string,
+        default: ENV["EJABBERD_API_URL"].presence
+
+      field :ejabberd_admin_url, type: :string,
+        default: ENV["EJABBERD_ADMIN_URL"].presence
+
+      field :ejabberd_buddy_roster, type: :string,
+        default: "Buddies"
+    end
+  end
+end
diff --git a/app/models/concerns/settings/email_settings.rb b/app/models/concerns/settings/email_settings.rb
new file mode 100644
index 0000000..9329b9a
--- /dev/null
+++ b/app/models/concerns/settings/email_settings.rb
@@ -0,0 +1,28 @@
+module Settings
+  module EmailSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :email_enabled, type: :boolean,
+        default: ENV["EMAIL_SMTP_HOST"].present?
+
+      # field :email_smtp_host, type: :string,
+      #   default: ENV["EMAIL_SMTP_HOST"].presence
+      #
+      # field :email_smtp_port, type: :string,
+      #   default: ENV["EMAIL_SMTP_PORT"].presence || 587
+      #
+      # field :email_smtp_enable_starttls, type: :string,
+      #   default: ENV["EMAIL_SMTP_PORT"].presence || true
+      #
+      # field :email_auth_method, type: :string,
+      #   default: ENV["EMAIL_AUTH_METHOD"].presence || "plain"
+      #
+      # field :email_imap_host, type: :string,
+      #   default: ENV["EMAIL_IMAP_HOST"].presence
+      #
+      # field :email_imap_port, type: :string,
+      #   default: ENV["EMAIL_IMAP_PORT"].presence || 993
+    end
+  end
+end
diff --git a/app/models/concerns/settings/general_settings.rb b/app/models/concerns/settings/general_settings.rb
new file mode 100644
index 0000000..8c87903
--- /dev/null
+++ b/app/models/concerns/settings/general_settings.rb
@@ -0,0 +1,34 @@
+module Settings
+  module GeneralSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :primary_domain, type: :string,
+        default: ENV["PRIMARY_DOMAIN"].presence
+
+      field :accounts_domain, type: :string,
+        default: ENV["AKKOUNTS_DOMAIN"].presence
+
+      #
+      # Internal services
+      #
+
+      field :redis_url, type: :string,
+        default: ENV["REDIS_URL"] || "redis://localhost:6379/0"
+
+      field :s3_enabled, type: :boolean,
+        default: ENV["S3_ENABLED"] && ENV["S3_ENABLED"].to_s != "false"
+
+      field :sentry_enabled, type: :boolean, readonly: true,
+        default: ENV["SENTRY_DSN"].present?
+
+      #
+      # Registrations
+      #
+
+      field :reserved_usernames, type: :array, default: %w[
+        account accounts donations mail webmaster support
+      ]
+    end
+  end
+end
diff --git a/app/models/concerns/settings/gitea_settings.rb b/app/models/concerns/settings/gitea_settings.rb
new file mode 100644
index 0000000..a63f08d
--- /dev/null
+++ b/app/models/concerns/settings/gitea_settings.rb
@@ -0,0 +1,13 @@
+module Settings
+  module GiteaSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :gitea_public_url, type: :string,
+        default: ENV["GITEA_PUBLIC_URL"].presence
+
+      field :gitea_enabled, type: :boolean,
+        default: ENV["GITEA_PUBLIC_URL"].present?
+    end
+  end
+end
diff --git a/app/models/concerns/settings/lightning_network_settings.rb b/app/models/concerns/settings/lightning_network_settings.rb
new file mode 100644
index 0000000..95a9579
--- /dev/null
+++ b/app/models/concerns/settings/lightning_network_settings.rb
@@ -0,0 +1,25 @@
+module Settings
+  module LightningNetworkSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :lndhub_api_url, type: :string,
+        default: ENV["LNDHUB_API_URL"].presence
+
+      field :lndhub_enabled, type: :boolean,
+        default: ENV["LNDHUB_API_URL"].present?
+
+      field :lndhub_admin_token, type: :string,
+        default: ENV["LNDHUB_ADMIN_TOKEN"].presence
+
+      field :lndhub_admin_enabled, type: :boolean,
+        default: ENV["LNDHUB_ADMIN_UI"] || false
+
+      field :lndhub_public_key, type: :string,
+        default: (ENV["LNDHUB_PUBLIC_KEY"] || "")
+
+      field :lndhub_keysend_enabled, type: :boolean,
+        default: -> { self.lndhub_public_key.present? }
+    end
+  end
+end
diff --git a/app/models/concerns/settings/mastodon_settings.rb b/app/models/concerns/settings/mastodon_settings.rb
new file mode 100644
index 0000000..7532c15
--- /dev/null
+++ b/app/models/concerns/settings/mastodon_settings.rb
@@ -0,0 +1,16 @@
+module Settings
+  module MastodonSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :mastodon_public_url, type: :string,
+        default: ENV["MASTODON_PUBLIC_URL"].presence
+
+      field :mastodon_enabled, type: :boolean,
+        default: ENV["MASTODON_PUBLIC_URL"].present?
+
+      field :mastodon_address_domain, type: :string,
+        default: ENV["MASTODON_ADDRESS_DOMAIN"].presence || self.primary_domain
+    end
+  end
+end
diff --git a/app/models/concerns/settings/media_wiki_settings.rb b/app/models/concerns/settings/media_wiki_settings.rb
new file mode 100644
index 0000000..adf3a85
--- /dev/null
+++ b/app/models/concerns/settings/media_wiki_settings.rb
@@ -0,0 +1,13 @@
+module Settings
+  module MediaWikiSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :mediawiki_public_url, type: :string,
+        default: ENV["MEDIAWIKI_PUBLIC_URL"].presence
+
+      field :mediawiki_enabled, type: :boolean,
+        default: ENV["MEDIAWIKI_PUBLIC_URL"].present?
+    end
+  end
+end
diff --git a/app/models/concerns/settings/nostr_settings.rb b/app/models/concerns/settings/nostr_settings.rb
new file mode 100644
index 0000000..194b3f0
--- /dev/null
+++ b/app/models/concerns/settings/nostr_settings.rb
@@ -0,0 +1,22 @@
+module Settings
+  module NostrSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :nostr_enabled, type: :boolean,
+        default: ENV["NOSTR_PRIVATE_KEY"].present?
+
+      field :nostr_private_key, type: :string,
+        default: ENV["NOSTR_PRIVATE_KEY"].presence
+
+      field :nostr_public_key, type: :string,
+        default: ENV["NOSTR_PUBLIC_KEY"].presence
+
+      field :nostr_relay_url, type: :string,
+        default: ENV["NOSTR_RELAY_URL"].presence
+
+      field :nostr_zaps_relay_limit, type: :integer,
+        default: 12
+    end
+  end
+end
diff --git a/app/models/concerns/settings/open_collective_settings.rb b/app/models/concerns/settings/open_collective_settings.rb
new file mode 100644
index 0000000..ae9a3df
--- /dev/null
+++ b/app/models/concerns/settings/open_collective_settings.rb
@@ -0,0 +1,9 @@
+module Settings
+  module OpenCollectiveSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :opencollective_enabled, type: :boolean, default: true
+    end
+  end
+end
diff --git a/app/models/concerns/settings/remote_storage_settings.rb b/app/models/concerns/settings/remote_storage_settings.rb
new file mode 100644
index 0000000..0290e25
--- /dev/null
+++ b/app/models/concerns/settings/remote_storage_settings.rb
@@ -0,0 +1,16 @@
+module Settings
+  module RemoteStorageSettings
+    extend ActiveSupport::Concern
+
+    included do
+      field :remotestorage_enabled, type: :boolean,
+        default: ENV["RS_STORAGE_URL"].present?
+
+      field :rs_storage_url, type: :string,
+        default: ENV["RS_STORAGE_URL"].presence
+
+      field :rs_redis_url, type: :string,
+        default: ENV["RS_REDIS_URL"] || "redis://localhost:6379/1"
+    end
+  end
+end
diff --git a/app/models/concerns/settings/xmpp_settings.rb b/app/models/concerns/settings/xmpp_settings.rb
new file mode 100644
index 0000000..eb9535c
--- /dev/null
+++ b/app/models/concerns/settings/xmpp_settings.rb
@@ -0,0 +1,11 @@
+module Settings
+  module XmppSettings
+    extend ActiveSupport::Concern
+
+    included do
+      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
+    end
+  end
+end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 4bdac21..c27bcf2 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -2,223 +2,24 @@
 class Setting < RailsSettings::Base
   cache_prefix { "v1" }
 
-  field :primary_domain, type: :string,
-    default: ENV["PRIMARY_DOMAIN"].presence
+  Dir[Rails.root.join('app', 'models', 'concerns', 'settings', '*.rb')].each do |file|
+    require file
+  end
 
-  field :accounts_domain, type: :string,
-    default: ENV["AKKOUNTS_DOMAIN"].presence
-
-  #
-  # Internal services
-  #
-
-  field :redis_url, type: :string,
-    default: ENV["REDIS_URL"] || "redis://localhost:6379/0"
-
-  field :s3_enabled, type: :boolean,
-    default: ENV["S3_ENABLED"] && ENV["S3_ENABLED"].to_s != "false"
-
-  #
-  # Registrations
-  #
-
-  field :reserved_usernames, type: :array, default: %w[
-    account accounts donations mail webmaster support
-  ]
-
-  #
-  # XMPP
-  #
-
-  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
-  #
-
-  field :sentry_enabled, type: :boolean, readonly: true,
-    default: ENV["SENTRY_DSN"].present?
-
-  #
-  # BTCPay Server
-  #
-
-  field :btcpay_api_url, type: :string,
-    default: ENV["BTCPAY_API_URL"].presence
-
-  field :btcpay_enabled, type: :boolean,
-    default: ENV["BTCPAY_API_URL"].present?
-
-  field :btcpay_public_url, type: :string,
-    default: ENV["BTCPAY_PUBLIC_URL"].presence
-
-  field :btcpay_store_id, type: :string,
-    default: ENV["BTCPAY_STORE_ID"].presence
-
-  field :btcpay_auth_token, type: :string,
-    default: ENV["BTCPAY_AUTH_TOKEN"].presence
-
-  field :btcpay_publish_wallet_balances, type: :boolean, default: true
-
-  #
-  # Discourse
-  #
-
-  field :discourse_public_url, type: :string,
-    default: ENV["DISCOURSE_PUBLIC_URL"].presence
-
-  field :discourse_enabled, type: :boolean,
-    default: ENV["DISCOURSE_PUBLIC_URL"].present?
-
-  field :discourse_connect_secret, type: :string,
-    default: ENV["DISCOURSE_CONNECT_SECRET"].presence
-
-  #
-  # Drone CI
-  #
-
-  field :droneci_public_url, type: :string,
-    default: ENV["DRONECI_PUBLIC_URL"].presence
-
-  field :droneci_enabled, type: :boolean,
-    default: ENV["DRONECI_PUBLIC_URL"].present?
-
-  #
-  # ejabberd
-  #
-
-  field :ejabberd_enabled, type: :boolean,
-    default: ENV["EJABBERD_API_URL"].present?
-
-  field :ejabberd_api_url, type: :string,
-    default: ENV["EJABBERD_API_URL"].presence
-
-  field :ejabberd_admin_url, type: :string,
-    default: ENV["EJABBERD_ADMIN_URL"].presence
-
-  field :ejabberd_buddy_roster, type: :string,
-    default: "Buddies"
-
-  #
-  # Gitea
-  #
-
-  field :gitea_public_url, type: :string,
-    default: ENV["GITEA_PUBLIC_URL"].presence
-
-  field :gitea_enabled, type: :boolean,
-    default: ENV["GITEA_PUBLIC_URL"].present?
-
-  #
-  # Lightning Network
-  #
-
-  field :lndhub_api_url, type: :string,
-    default: ENV["LNDHUB_API_URL"].presence
-
-  field :lndhub_enabled, type: :boolean,
-    default: ENV["LNDHUB_API_URL"].present?
-
-  field :lndhub_admin_token, type: :string,
-    default: ENV["LNDHUB_ADMIN_TOKEN"].presence
-
-  field :lndhub_admin_enabled, type: :boolean,
-    default: ENV["LNDHUB_ADMIN_UI"] || false
-
-  field :lndhub_public_key, type: :string,
-    default: (ENV["LNDHUB_PUBLIC_KEY"] || "")
-
-  field :lndhub_keysend_enabled, type: :boolean,
-    default: -> { self.lndhub_public_key.present? }
-
-  #
-  # Mastodon
-  #
-
-  field :mastodon_public_url, type: :string,
-    default: ENV["MASTODON_PUBLIC_URL"].presence
-
-  field :mastodon_enabled, type: :boolean,
-    default: ENV["MASTODON_PUBLIC_URL"].present?
-
-  field :mastodon_address_domain, type: :string,
-    default: ENV["MASTODON_ADDRESS_DOMAIN"].presence || self.primary_domain
-
-  #
-  # MediaWiki
-  #
-
-  field :mediawiki_public_url, type: :string,
-    default: ENV["MEDIAWIKI_PUBLIC_URL"].presence
-
-  field :mediawiki_enabled, type: :boolean,
-    default: ENV["MEDIAWIKI_PUBLIC_URL"].present?
-
-  #
-  # Nostr
-  #
-
-  field :nostr_enabled, type: :boolean,
-    default: ENV["NOSTR_PRIVATE_KEY"].present?
-
-  field :nostr_private_key, type: :string,
-    default: ENV["NOSTR_PRIVATE_KEY"].presence
-
-  field :nostr_public_key, type: :string,
-    default: ENV["NOSTR_PUBLIC_KEY"].presence
-
-  field :nostr_relay_url, type: :string,
-    default: ENV["NOSTR_RELAY_URL"].presence
-
-  field :nostr_zaps_relay_limit, type: :integer,
-    default: 12
-
-  #
-  # OpenCollective
-  #
-
-  field :opencollective_enabled, type: :boolean, default: true
-
-  #
-  # RemoteStorage
-  #
-
-  field :remotestorage_enabled, type: :boolean,
-    default: ENV["RS_STORAGE_URL"].present?
-
-  field :rs_storage_url, type: :string,
-    default: ENV["RS_STORAGE_URL"].presence
-
-  field :rs_redis_url, type: :string,
-    default: ENV["RS_REDIS_URL"] || "redis://localhost:6379/1"
-
-
-  #
-  # E-Mail Service
-  #
-
-  field :email_enabled, type: :boolean,
-    default: ENV["EMAIL_SMTP_HOST"].present?
-
-  # field :email_smtp_host, type: :string,
-  #   default: ENV["EMAIL_SMTP_HOST"].presence
-  #
-  # field :email_smtp_port, type: :string,
-  #   default: ENV["EMAIL_SMTP_PORT"].presence || 587
-  #
-  # field :email_smtp_enable_starttls, type: :string,
-  #   default: ENV["EMAIL_SMTP_PORT"].presence || true
-  #
-  # field :email_auth_method, type: :string,
-  #   default: ENV["EMAIL_AUTH_METHOD"].presence || "plain"
-  #
-  # field :email_imap_host, type: :string,
-  #   default: ENV["EMAIL_IMAP_HOST"].presence
-  #
-  # field :email_imap_port, type: :string,
-  #   default: ENV["EMAIL_IMAP_PORT"].presence || 993
+  include Settings::GeneralSettings
+  include Settings::BtcpaySettings
+  include Settings::DiscourseSettings
+  include Settings::DroneCiSettings
+  include Settings::EjabberdSettings
+  include Settings::EmailSettings
+  include Settings::GiteaSettings
+  include Settings::LightningNetworkSettings
+  include Settings::MastodonSettings
+  include Settings::MediaWikiSettings
+  include Settings::NostrSettings
+  include Settings::OpenCollectiveSettings
+  include Settings::RemoteStorageSettings
+  include Settings::XmppSettings
 
   def self.default_services
     # TODO Make configurable from respective service settings page

From 15e2f9b9624fd97bc5c4940ef5eddf83ebfa5c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Wed, 28 Aug 2024 14:55:34 +0200
Subject: [PATCH 02/12] Remove "in development" note

---
 app/views/admin/settings/services/_remotestorage.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/admin/settings/services/_remotestorage.html.erb b/app/views/admin/settings/services/_remotestorage.html.erb
index 5b8f47b..eca46a9 100644
--- a/app/views/admin/settings/services/_remotestorage.html.erb
+++ b/app/views/admin/settings/services/_remotestorage.html.erb
@@ -1,5 +1,4 @@
 <h3>RemoteStorage</h3>
-<p class="text-red-600 mb-8">Feature currently in development.</p>
 <ul role="list">
   <%= render FormElements::FieldsetToggleComponent.new(
     form: f,

From 0e3180602c900e192ad29c36ad47dc729af9d3ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Wed, 4 Sep 2024 13:03:45 +0200
Subject: [PATCH 03/12] Rename "xmpp" user service back to "ejabberd"

If we ever add support for others, we can combine them as "xmpp" in
helper methods
---
 app/controllers/services/chat_controller.rb  |  2 +-
 app/jobs/xmpp_exchange_contacts_job.rb       |  4 ++--
 spec/jobs/create_ldap_user_job_spec.rb       |  4 ++--
 spec/jobs/xmpp_exchange_contacts_job_spec.rb |  2 +-
 spec/models/user_spec.rb                     | 16 ++++++++--------
 spec/requests/webfinger_spec.rb              |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/controllers/services/chat_controller.rb b/app/controllers/services/chat_controller.rb
index dda2be5..9fafaec 100644
--- a/app/controllers/services/chat_controller.rb
+++ b/app/controllers/services/chat_controller.rb
@@ -3,7 +3,7 @@ class Services::ChatController < Services::BaseController
   before_action :require_service_available
 
   def show
-    @service_enabled = current_user.service_enabled?(:xmpp)
+    @service_enabled = current_user.service_enabled?(:ejabberd)
   end
 
   private
diff --git a/app/jobs/xmpp_exchange_contacts_job.rb b/app/jobs/xmpp_exchange_contacts_job.rb
index 1a9d67a..0de829c 100644
--- a/app/jobs/xmpp_exchange_contacts_job.rb
+++ b/app/jobs/xmpp_exchange_contacts_job.rb
@@ -2,8 +2,8 @@ class XmppExchangeContactsJob < ApplicationJob
   queue_as :default
 
   def perform(inviter, invitee)
-    return unless inviter.service_enabled?(:xmpp) &&
-                  invitee.service_enabled?(:xmpp) &&
+    return unless inviter.service_enabled?(:ejabberd) &&
+                  invitee.service_enabled?(:ejabberd) &&
                   inviter.preferences[:xmpp_exchange_contacts_with_invitees]
 
     ejabberd = EjabberdApiClient.new
diff --git a/spec/jobs/create_ldap_user_job_spec.rb b/spec/jobs/create_ldap_user_job_spec.rb
index e8d0e61..87a9a44 100644
--- a/spec/jobs/create_ldap_user_job_spec.rb
+++ b/spec/jobs/create_ldap_user_job_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe CreateLdapUserJob, type: :job do
 
   it "adds default services for pre-confirmed accounts" do
     allow(ldap_client_mock).to receive(:add) # spy on mock
-    allow(Setting).to receive(:default_services).and_return(["xmpp", "discourse"])
+    Setting.default_services = ["ejabberd", "discourse"]
 
     perform_enqueued_jobs { job_for_preconfirmed_account }
 
@@ -56,7 +56,7 @@ RSpec.describe CreateLdapUserJob, type: :job do
         sn: "halfinney",
         uid: "halfinney",
         mail: "halfinney@example.com",
-        serviceEnabled: ["xmpp", "discourse"],
+        serviceEnabled: ["ejabberd", "discourse"],
         userPassword: "remember-remember-the-5th-of-november"
       }
     )
diff --git a/spec/jobs/xmpp_exchange_contacts_job_spec.rb b/spec/jobs/xmpp_exchange_contacts_job_spec.rb
index c711e87..013a80d 100644
--- a/spec/jobs/xmpp_exchange_contacts_job_spec.rb
+++ b/spec/jobs/xmpp_exchange_contacts_job_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe XmppExchangeContactsJob, type: :job do
   before do
     stub_request(:post, "http://xmpp.example.com/api/add_rosteritem")
       .to_return(status: 200, body: "", headers: {})
-    allow_any_instance_of(User).to receive(:services_enabled).and_return(["xmpp"])
+    allow_any_instance_of(User).to receive(:services_enabled).and_return(["ejabberd"])
   end
 
   it "posts add_rosteritem commands to the ejabberd API" do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 9271b7b..396fcf5 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -78,9 +78,9 @@ RSpec.describe User, type: :model do
     it "returns the entries from the LDAP service attribute" do
       expect(user).to receive(:ldap_entry).and_return({
         uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
-        services_enabled: ["discourse", "email", "gitea", "wiki", "xmpp"]
+        services_enabled: ["discourse", "ejabberd", "email", "gitea", "wiki"]
       })
-      expect(user.services_enabled).to eq(["discourse", "email", "gitea", "wiki", "xmpp"])
+      expect(user.services_enabled).to eq(["discourse", "ejabberd", "email", "gitea", "wiki"])
     end
   end
 
@@ -88,7 +88,7 @@ RSpec.describe User, type: :model do
     before do
       allow(user).to receive(:ldap_entry).and_return({
         uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
-        services_enabled: ["gitea", "xmpp"]
+        services_enabled: ["ejabberd", "gitea"]
       })
     end
 
@@ -121,9 +121,9 @@ RSpec.describe User, type: :model do
 
     it "adds multiple service to the LDAP entry" do
       expect_any_instance_of(LdapService).to receive(:replace_attribute)
-        .with(dn, :serviceEnabled, ["discourse", "gitea", "wiki", "xmpp"]).and_return(true)
+        .with(dn, :serviceEnabled, ["discourse", "ejabberd", "gitea", "wiki"]).and_return(true)
 
-      user.enable_service([:wiki, :xmpp])
+      user.enable_service([:ejabberd, :wiki])
     end
   end
 
@@ -131,7 +131,7 @@ RSpec.describe User, type: :model do
     before do
       allow(user).to receive(:ldap_entry).and_return({
         uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
-        services_enabled: ["discourse", "gitea", "xmpp"]
+        services_enabled: ["discourse", "ejabberd", "gitea"]
       })
       allow(user).to receive(:dn).and_return(dn)
     end
@@ -140,14 +140,14 @@ RSpec.describe User, type: :model do
       expect_any_instance_of(LdapService).to receive(:replace_attribute)
         .with(dn, :serviceEnabled, ["discourse", "gitea"]).and_return(true)
 
-      user.disable_service(:xmpp)
+      user.disable_service(:ejabberd)
     end
 
     it "removes multiple services from the LDAP entry" do
       expect_any_instance_of(LdapService).to receive(:replace_attribute)
         .with(dn, :serviceEnabled, ["discourse"]).and_return(true)
 
-      user.disable_service([:xmpp, "gitea"])
+      user.disable_service([:ejabberd, "gitea"])
     end
   end
 
diff --git a/spec/requests/webfinger_spec.rb b/spec/requests/webfinger_spec.rb
index 8bb0d93..839ffc1 100644
--- a/spec/requests/webfinger_spec.rb
+++ b/spec/requests/webfinger_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe "WebFinger", type: :request do
         before do
           allow_any_instance_of(User).to receive(:ldap_entry).and_return({
             uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
-            services_enabled: ["xmpp"]
+            services_enabled: ["ejabberd"]
           })
         end
 
@@ -100,7 +100,7 @@ RSpec.describe "WebFinger", type: :request do
         before do
           allow_any_instance_of(User).to receive(:ldap_entry).and_return({
             uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
-            services_enabled: ["xmpp"]
+            services_enabled: ["ejabberd"]
           })
         end
 

From ef2a37e2bfe661b8db5f5d20b3f74c0525720962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Wed, 4 Sep 2024 13:05:17 +0200
Subject: [PATCH 04/12] Sort user services in LDAP entry

Makes it predictable for programmatic comparisons (e.g. tests)
---
 app/models/user.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index f387817..248a865 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -180,14 +180,14 @@ class User < ApplicationRecord
   def enable_service(service)
     current_services = services_enabled
     new_services = Array(service).map(&:to_s)
-    services = (current_services + new_services).uniq
+    services = (current_services + new_services).uniq.sort
     ldap.replace_attribute(dn, :serviceEnabled, services)
   end
 
   def disable_service(service)
     current_services = services_enabled
     disabled_services = Array(service).map(&:to_s)
-    services = (current_services - disabled_services).uniq
+    services = (current_services - disabled_services).uniq.sort
     ldap.replace_attribute(dn, :serviceEnabled, services)
   end
 

From 5474bf66e7a43a456843a5a69963715ff4d1bd44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Wed, 4 Sep 2024 13:06:32 +0200
Subject: [PATCH 05/12] Turn default services into a configurable setting

With the default value being all enabled services
---
 app/models/setting.rb       | 12 +++++++++---
 spec/models/setting_spec.rb | 23 +++++++++++++++++++++++
 spec/models/user_spec.rb    |  2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 spec/models/setting_spec.rb

diff --git a/app/models/setting.rb b/app/models/setting.rb
index c27bcf2..a5937a9 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -21,8 +21,14 @@ class Setting < RailsSettings::Base
   include Settings::RemoteStorageSettings
   include Settings::XmppSettings
 
-  def self.default_services
-    # TODO Make configurable from respective service settings page
-    %w[ discourse gitea mastodon mediawiki remotestorage xmpp ]
+  def self.available_services
+    known_services = %w[
+      discourse ejabberd email gitea mastodon mediawiki remotestorage
+    ]
+
+    known_services.select {|s| Setting.send "#{s}_enabled?" }
   end
+
+  field :default_services, type: :array,
+    default: self.available_services
 end
diff --git a/spec/models/setting_spec.rb b/spec/models/setting_spec.rb
new file mode 100644
index 0000000..db345d8
--- /dev/null
+++ b/spec/models/setting_spec.rb
@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+RSpec.describe Setting, type: :model do
+
+  describe ".available_services" do
+    before do
+      Setting.discourse_enabled = true
+      Setting.ejabberd_enabled = true
+      Setting.email_enabled = false
+      Setting.gitea_enabled = false
+      Setting.mastodon_enabled = true
+      Setting.mediawiki_enabled = false
+      Setting.remotestorage_enabled = true
+    end
+
+    it "contains all enabled services" do
+      expect(Setting.available_services).to eq(%w[
+        discourse ejabberd mastodon remotestorage
+      ])
+    end
+  end
+
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 396fcf5..5f6c7c1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -178,7 +178,7 @@ RSpec.describe User, type: :model do
     after { clear_enqueued_jobs }
 
     it "enables default services" do
-      expect(user).to receive(:enable_service).with(%w[ discourse gitea mastodon mediawiki remotestorage xmpp ])
+      expect(user).to receive(:enable_service).with(Setting.default_services)
       user.send :devise_after_confirmation
     end
 

From 215d178e6901658e6bb976ef84980f3f70362ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Thu, 5 Sep 2024 11:10:10 +0200
Subject: [PATCH 06/12] Remove empty spec files

---
 app/helpers/dashboard_helper.rb   | 2 --
 app/helpers/donations_helper.rb   | 2 --
 app/helpers/invitations_helper.rb | 2 --
 app/helpers/lnurlpay_helper.rb    | 2 --
 app/helpers/settings_helper.rb    | 2 --
 app/helpers/signup_helper.rb      | 2 --
 app/helpers/users_helper.rb       | 2 --
 app/helpers/wallet_helper.rb      | 2 --
 app/helpers/welcome_helper.rb     | 2 --
 9 files changed, 18 deletions(-)
 delete mode 100644 app/helpers/dashboard_helper.rb
 delete mode 100644 app/helpers/donations_helper.rb
 delete mode 100644 app/helpers/invitations_helper.rb
 delete mode 100644 app/helpers/lnurlpay_helper.rb
 delete mode 100644 app/helpers/settings_helper.rb
 delete mode 100644 app/helpers/signup_helper.rb
 delete mode 100644 app/helpers/users_helper.rb
 delete mode 100644 app/helpers/wallet_helper.rb
 delete mode 100644 app/helpers/welcome_helper.rb

diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
deleted file mode 100644
index a94ddfc..0000000
--- a/app/helpers/dashboard_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module DashboardHelper
-end
diff --git a/app/helpers/donations_helper.rb b/app/helpers/donations_helper.rb
deleted file mode 100644
index d04dc2d..0000000
--- a/app/helpers/donations_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module DonationsHelper
-end
diff --git a/app/helpers/invitations_helper.rb b/app/helpers/invitations_helper.rb
deleted file mode 100644
index 1483b9e..0000000
--- a/app/helpers/invitations_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module InvitationsHelper
-end
diff --git a/app/helpers/lnurlpay_helper.rb b/app/helpers/lnurlpay_helper.rb
deleted file mode 100644
index 45170fd..0000000
--- a/app/helpers/lnurlpay_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module LnurlpayHelper
-end
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
deleted file mode 100644
index ffbedba..0000000
--- a/app/helpers/settings_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module SettingsHelper
-end
diff --git a/app/helpers/signup_helper.rb b/app/helpers/signup_helper.rb
deleted file mode 100644
index f954dda..0000000
--- a/app/helpers/signup_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module SignupHelper
-end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
deleted file mode 100644
index 2310a24..0000000
--- a/app/helpers/users_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module UsersHelper
-end
diff --git a/app/helpers/wallet_helper.rb b/app/helpers/wallet_helper.rb
deleted file mode 100644
index 9bd2230..0000000
--- a/app/helpers/wallet_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module WalletHelper
-end
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
deleted file mode 100644
index eeead45..0000000
--- a/app/helpers/welcome_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module WelcomeHelper
-end

From 5addd25186c0cf6723f8ddb8131e102809717576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Thu, 5 Sep 2024 11:10:54 +0200
Subject: [PATCH 07/12] Add service details config, use for known services

---
 app/helpers/services_helper.rb         | 12 +++++++++++
 app/models/setting.rb                  |  5 +----
 config/initializers/service_details.rb |  2 ++
 config/services.yml                    | 30 ++++++++++++++++++++++++++
 spec/helpers/services_helper_spec.rb   | 25 +++++++++++++++++++++
 5 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 app/helpers/services_helper.rb
 create mode 100644 config/initializers/service_details.rb
 create mode 100644 config/services.yml
 create mode 100644 spec/helpers/services_helper_spec.rb

diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb
new file mode 100644
index 0000000..2b8472b
--- /dev/null
+++ b/app/helpers/services_helper.rb
@@ -0,0 +1,12 @@
+module ServicesHelper
+
+  def service_human_name(key, category = :external)
+    SERVICES[category][key][:name] || key.to_s
+  end
+
+  def service_display_name(key, category = :external)
+    SERVICES[category][key][:display_name] ||
+    service_human_name(key, category)
+  end
+
+end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index a5937a9..aa8072d 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -22,10 +22,7 @@ class Setting < RailsSettings::Base
   include Settings::XmppSettings
 
   def self.available_services
-    known_services = %w[
-      discourse ejabberd email gitea mastodon mediawiki remotestorage
-    ]
-
+    known_services = SERVICES[:external].keys
     known_services.select {|s| Setting.send "#{s}_enabled?" }
   end
 
diff --git a/config/initializers/service_details.rb b/config/initializers/service_details.rb
new file mode 100644
index 0000000..aaf5d79
--- /dev/null
+++ b/config/initializers/service_details.rb
@@ -0,0 +1,2 @@
+config_path = Rails.root.join('config', 'services.yml')
+SERVICES = YAML.load_file(config_path).deep_symbolize_keys.with_indifferent_access
diff --git a/config/services.yml b/config/services.yml
new file mode 100644
index 0000000..80147a8
--- /dev/null
+++ b/config/services.yml
@@ -0,0 +1,30 @@
+internal:
+  btcpay:
+    name: BTCPay Server
+  postgres:
+    name: PostgreSQL
+  sentry:
+    name: Sentry
+external:
+  discourse:
+    name: Discourse
+  droneci:
+    name: Drone CI
+  ejabberd:
+    display_name: Chat
+  email:
+    name: E-Mail
+  gitea:
+    name: Gitea
+  lndhub:
+    name: LNDHub
+    display_name: Lightning Network
+  mastodon:
+    name: Mastodon
+  mediawiki:
+    name: MediaWiki
+  nostr:
+    name: Nostr
+  remotestorage:
+    name: remoteStorage
+    display_name: Storage
diff --git a/spec/helpers/services_helper_spec.rb b/spec/helpers/services_helper_spec.rb
new file mode 100644
index 0000000..b0f19de
--- /dev/null
+++ b/spec/helpers/services_helper_spec.rb
@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+describe ServicesHelper do
+
+  describe "#service_human_name" do
+    it "returns the human name when it's configured" do
+      expect(service_human_name("mastodon")).to eq("Mastodon")
+    end
+
+    it "returns the key when there is no human name" do
+      expect(service_human_name("ejabberd")).to eq("ejabberd")
+    end
+  end
+
+  describe "#service_display_name" do
+    it "returns the display name when it's configured" do
+      expect(service_display_name("lndhub")).to eq("Lightning Network")
+    end
+
+    it "returns the human name when there is no display name" do
+      expect(service_display_name("mastodon")).to eq("Mastodon")
+    end
+  end
+
+end

From fc2bec624634c49e2bf59d8d737007cb6fe79d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Thu, 5 Sep 2024 11:11:32 +0200
Subject: [PATCH 08/12] Make default user services configurable by admin

---
 .../settings/registrations_controller.rb      |  8 ++++
 app/controllers/admin/settings_controller.rb  | 18 ++++++--
 .../settings/registrations/show.html.erb      | 41 +++++++++++++------
 spec/models/setting_spec.rb                   |  4 +-
 4 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/app/controllers/admin/settings/registrations_controller.rb b/app/controllers/admin/settings/registrations_controller.rb
index 4c6cb83..3887de8 100644
--- a/app/controllers/admin/settings/registrations_controller.rb
+++ b/app/controllers/admin/settings/registrations_controller.rb
@@ -9,4 +9,12 @@ class Admin::Settings::RegistrationsController < Admin::SettingsController
       success: "Settings saved"
     }
   end
+
+  private
+
+    def setting_params
+      params.require(:setting).permit([
+        :reserved_usernames, default_services: []
+      ])
+    end
 end
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 0ac029b..496fb9a 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -9,11 +9,12 @@ class Admin::SettingsController < Admin::BaseController
     changed_keys = []
 
     setting_params.keys.each do |key|
-      next if setting_params[key].nil? ||
-              (Setting.send(key).to_s == setting_params[key].strip)
+      next if clean_param(key).nil? ||
+        (Setting.send(key).to_s == clean_param(key))
+
       changed_keys.push(key)
       setting = Setting.new(var: key)
-      setting.value = setting_params[key].strip
+      setting.value = clean_param(key)
       unless setting.valid?
         @errors.merge!(setting.errors)
       end
@@ -24,7 +25,8 @@ class Admin::SettingsController < Admin::BaseController
     end
 
     changed_keys.each do |key|
-      Setting.send("#{key}=", setting_params[key].strip)
+
+      Setting.send("#{key}=", clean_param(key))
     end
   end
 
@@ -37,4 +39,12 @@ class Admin::SettingsController < Admin::BaseController
     def setting_params
       params.require(:setting).permit(Setting.editable_keys.map(&:to_sym))
     end
+
+    def clean_param(key)
+      if Setting.get_field(key)[:type] == :string
+        setting_params[key].strip!
+      else
+        setting_params[key]
+      end
+    end
 end
diff --git a/app/views/admin/settings/registrations/show.html.erb b/app/views/admin/settings/registrations/show.html.erb
index 0028c15..b54b1b2 100644
--- a/app/views/admin/settings/registrations/show.html.erb
+++ b/app/views/admin/settings/registrations/show.html.erb
@@ -9,18 +9,35 @@
         <%= render partial: "admin/settings/errors", locals: { errors: @errors } %>
       <% end %>
 
-      <label class="block">
-        <p class="font-bold mb-1">Reserved usernames</p>
-        <p class="text-gray-500">
-          These usernames cannot be registered as accounts:
-        </p>
-        <%= f.text_area :reserved_usernames,
-          value: Setting.reserved_usernames.join("\n"),
-          class: "h-44 mb-2" %>
-        <p class="text-sm text-gray-500">
-          One username per line
-        </p>
-      </label>
+      <ul role="list">
+        <%= render FormElements::FieldsetComponent.new(
+              title: "Reserved usernames",
+              description: "These usernames cannot be registered as accounts."
+            ) do %>
+          <%= f.text_area :reserved_usernames,
+            value: Setting.reserved_usernames.join("\n"),
+            class: "h-44 w-60" %>
+          <p class="text-sm text-gray-500">
+            One username per line
+          </p>
+        <% end %>
+        <li>
+          <p class="font-bold mb-1">Default services</p>
+          <p class="text-gray-500">
+            These services are enabled for new users by default after signup.
+          </p>
+          <div class="flex flex-wrap gap-x-6 gap-y-2">
+            <% Setting.available_services.each do |option| %>
+              <div class="md:inline-block">
+                <%= f.check_box :default_services,
+                  { multiple: true, checked: Setting.default_services.include?(option) },
+                  option, nil %>
+                <%= f.label "default_services_#{option.parameterize}", service_human_name(option) %>
+              </div>
+            <% end %>
+          </div>
+        </li>
+      </ul>
     </section>
 
     <section>
diff --git a/spec/models/setting_spec.rb b/spec/models/setting_spec.rb
index db345d8..2ee5038 100644
--- a/spec/models/setting_spec.rb
+++ b/spec/models/setting_spec.rb
@@ -8,14 +8,16 @@ RSpec.describe Setting, type: :model do
       Setting.ejabberd_enabled = true
       Setting.email_enabled = false
       Setting.gitea_enabled = false
+      Setting.lndhub_enabled = true
       Setting.mastodon_enabled = true
       Setting.mediawiki_enabled = false
+      Setting.nostr_enabled = false
       Setting.remotestorage_enabled = true
     end
 
     it "contains all enabled services" do
       expect(Setting.available_services).to eq(%w[
-        discourse ejabberd mastodon remotestorage
+        discourse ejabberd lndhub mastodon remotestorage
       ])
     end
   end

From 2d32320c7d135bc68c6ddeb6ad03dd5f71d91b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Thu, 5 Sep 2024 11:24:38 +0200
Subject: [PATCH 09/12] Style check boxes

---
 app/views/admin/settings/registrations/show.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/settings/registrations/show.html.erb b/app/views/admin/settings/registrations/show.html.erb
index b54b1b2..e330d69 100644
--- a/app/views/admin/settings/registrations/show.html.erb
+++ b/app/views/admin/settings/registrations/show.html.erb
@@ -30,7 +30,8 @@
             <% Setting.available_services.each do |option| %>
               <div class="md:inline-block">
                 <%= f.check_box :default_services,
-                  { multiple: true, checked: Setting.default_services.include?(option) },
+                  { multiple: true, checked: Setting.default_services.include?(option),
+                    class: "h-4 w-4 rounded border-gray-300 text-blue-600 focus:ring-blue-600 mr-0.5" },
                   option, nil %>
                 <%= f.label "default_services_#{option.parameterize}", service_human_name(option) %>
               </div>

From 4909dac5c2ac8701a9f3daa5c2efe7e8bbbf521d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Wed, 11 Sep 2024 16:26:48 +0200
Subject: [PATCH 10/12] Fix typo

The return value of `strip!` is `nil`
---
 app/controllers/admin/settings_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 496fb9a..ad57046 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -25,7 +25,6 @@ class Admin::SettingsController < Admin::BaseController
     end
 
     changed_keys.each do |key|
-
       Setting.send("#{key}=", clean_param(key))
     end
   end
@@ -42,7 +41,7 @@ class Admin::SettingsController < Admin::BaseController
 
     def clean_param(key)
       if Setting.get_field(key)[:type] == :string
-        setting_params[key].strip!
+        setting_params[key].strip
       else
         setting_params[key]
       end

From e544c281051deacca85d36ea7c19eabe447bf313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Wed, 11 Sep 2024 16:28:12 +0200
Subject: [PATCH 11/12] Config for separate primary domain Nostr pubkey

Allow to configure a separate key for the NIP-05 address of the primary
domain vs the accounts domain.
---
 app/controllers/well_known_controller.rb      | 10 ++++--
 .../concerns/settings/nostr_settings.rb       |  3 ++
 .../admin/settings/services/_nostr.html.erb   |  5 +++
 spec/requests/well_known_spec.rb              | 34 ++++++++++++++++---
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/app/controllers/well_known_controller.rb b/app/controllers/well_known_controller.rb
index fd3c31d..cb0c018 100644
--- a/app/controllers/well_known_controller.rb
+++ b/app/controllers/well_known_controller.rb
@@ -10,8 +10,14 @@ class WellKnownController < ApplicationController
     relay_url = Setting.nostr_relay_url.presence
 
     if params[:name] == "_"
-      # pubkey for the primary domain without a username (e.g. kosmos.org)
-      res = { names: { "_": Setting.nostr_public_key } }
+      if domain == Setting.primary_domain
+        # pubkey for the primary domain without a username (e.g. kosmos.org)
+        res = { names: { "_": Setting.nostr_public_key_primary_domain || Setting.nostr_public_key } }
+      else
+        # pubkey for the akkounts domain without a username (e.g. accounts.kosmos.org)
+        res = { names: { "_": Setting.nostr_public_key } }
+      end
+
       res[:relays] = { "_" => [ relay_url ] } if relay_url
     else
       @user = User.where(cn: params[:name], ou: domain).first
diff --git a/app/models/concerns/settings/nostr_settings.rb b/app/models/concerns/settings/nostr_settings.rb
index 194b3f0..dbe49b5 100644
--- a/app/models/concerns/settings/nostr_settings.rb
+++ b/app/models/concerns/settings/nostr_settings.rb
@@ -12,6 +12,9 @@ module Settings
       field :nostr_public_key, type: :string,
         default: ENV["NOSTR_PUBLIC_KEY"].presence
 
+      field :nostr_public_key_primary_domain, type: :string,
+        default: nil
+
       field :nostr_relay_url, type: :string,
         default: ENV["NOSTR_RELAY_URL"].presence
 
diff --git a/app/views/admin/settings/services/_nostr.html.erb b/app/views/admin/settings/services/_nostr.html.erb
index c5db5e3..f714af6 100644
--- a/app/views/admin/settings/services/_nostr.html.erb
+++ b/app/views/admin/settings/services/_nostr.html.erb
@@ -19,6 +19,11 @@
         title: "Public key",
         description: "The corresponding public key of the accounts service"
       ) %>
+  <%= render FormElements::FieldsetResettableSettingComponent.new(
+        key: :nostr_public_key_primary_domain,
+        title: "Public key for primary domain (NIP-05)",
+        description: "(optional) A different pubkey to announce for the _@#{Setting.primary_domain} Nostr address"
+      ) %>
   <%= render FormElements::FieldsetResettableSettingComponent.new(
         key: :nostr_relay_url,
         title: "Relay URL",
diff --git a/spec/requests/well_known_spec.rb b/spec/requests/well_known_spec.rb
index a27f14c..0701c2f 100644
--- a/spec/requests/well_known_spec.rb
+++ b/spec/requests/well_known_spec.rb
@@ -79,10 +79,36 @@ RSpec.describe "Well-known URLs", type: :request do
     end
 
     describe "placeholder username for domain's own pubkey" do
-      it "returns the configured nostr pubkey" do
-        get "/.well-known/nostr.json?name=_"
-        res = JSON.parse(response.body)
-        expect(res["names"]["_"]).to eq(Setting.nostr_public_key)
+      describe "for primary domain" do
+        context "no different pubkey configured for primary domain" do
+          it "returns the akkounts nostr pubkey" do
+            get "/.well-known/nostr.json?name=_"
+            res = JSON.parse(response.body)
+            expect(res["names"]["_"]).to eq("bdd76ce2934b2f591f9fad2ebe9da18f20d2921de527494ba00eeaa0a0efadcf")
+          end
+        end
+
+        context "different pubkey configured for primary domain" do
+          before do
+            Setting.nostr_public_key_primary_domain = "b3e8f62fbe41217ffc0aa1e178d297339932d8ba4f46d9c7df3b61575e78fecc"
+          end
+
+          it "returns the primary domain's nostr pubkey" do
+            get "/.well-known/nostr.json?name=_"
+            res = JSON.parse(response.body)
+            expect(res["names"]["_"]).to eq("b3e8f62fbe41217ffc0aa1e178d297339932d8ba4f46d9c7df3b61575e78fecc")
+          end
+        end
+      end
+
+      describe "for akkounts domain" do
+        it "returns the configured nostr pubkey" do
+          headers = { "X-Forwarded-Host" => "accounts.kosmos.org" }
+          get "/.well-known/nostr.json?name=_"
+
+          res = JSON.parse(response.body)
+          expect(res["names"]["_"]).to eq("bdd76ce2934b2f591f9fad2ebe9da18f20d2921de527494ba00eeaa0a0efadcf")
+        end
       end
 
       context "with relay configured" do

From ac77e5b7c15b1d0dcf146b751f78226a6bb0ee59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Wed, 11 Sep 2024 16:31:04 +0200
Subject: [PATCH 12/12] Allow ENV var for new setting

---
 app/models/concerns/settings/nostr_settings.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/settings/nostr_settings.rb b/app/models/concerns/settings/nostr_settings.rb
index dbe49b5..84dba49 100644
--- a/app/models/concerns/settings/nostr_settings.rb
+++ b/app/models/concerns/settings/nostr_settings.rb
@@ -13,7 +13,7 @@ module Settings
         default: ENV["NOSTR_PUBLIC_KEY"].presence
 
       field :nostr_public_key_primary_domain, type: :string,
-        default: nil
+        default: ENV["NOSTR_PUBLIC_KEY_PRIMARY_DOMAIN"].presence
 
       field :nostr_relay_url, type: :string,
         default: ENV["NOSTR_RELAY_URL"].presence