From 3a5e310a6d16f048fcb22d0d02292540096239c0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 21 May 2025 11:08:46 -0400
Subject: [PATCH] Remove `OTP_SECRET` env configuration from setup (#34757)

---
 .env.production.sample  | 1 -
 app.json                | 4 ----
 lib/tasks/mastodon.rake | 2 +-
 scalingo.json           | 4 ----
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.env.production.sample b/.env.production.sample
index 4afaf8d756..15004b9d0d 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -43,7 +43,6 @@ ES_PASS=password
 # Make sure to use `bundle exec rails secret` to generate secrets
 # -------
 SECRET_KEY_BASE=
-OTP_SECRET=
 
 # Encryption secrets
 # ------------------
diff --git a/app.json b/app.json
index 5e5a3dc1e7..fe8415be3c 100644
--- a/app.json
+++ b/app.json
@@ -17,10 +17,6 @@
       "description": "The secret key base",
       "generator": "secret"
     },
-    "OTP_SECRET": {
-      "description": "One-time password secret",
-      "generator": "secret"
-    },
     "SINGLE_USER_MODE": {
       "description": "Should the instance run in single user mode? (Disable registrations, redirect to front page)",
       "value": "false",
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 99f4b86b73..a679f7a976 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -32,7 +32,7 @@ namespace :mastodon do
       prompt.say('Single user mode disables registrations and redirects the landing page to your public profile.')
       env['SINGLE_USER_MODE'] = prompt.yes?('Do you want to enable single user mode?', default: false)
 
-      %w(SECRET_KEY_BASE OTP_SECRET).each do |key|
+      %w(SECRET_KEY_BASE).each do |key|
         env[key] = SecureRandom.hex(64)
       end
 
diff --git a/scalingo.json b/scalingo.json
index 58c943b63c..866ef61fa5 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -12,10 +12,6 @@
       "description": "The secret key base",
       "generator": "secret"
     },
-    "OTP_SECRET": {
-      "description": "One-time password secret",
-      "generator": "secret"
-    },
     "SINGLE_USER_MODE": {
       "description": "Should the instance run in single user mode? (Disable registrations, redirect to front page)",
       "value": "false",