techhub/mastodon
2
0
Fork 0
Code Activity

Remove OTP_SECRET env configuration from setup (#34757)

Browse Source
This commit is contained in:
Matt Jankowski
2025-05-21 11:08:46 -04:00
committed by GitHub
parent 8c51a8ba94
commit 3a5e310a6d
4 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.production.sample
View File

@@ -43,7 +43,6 @@ ES_PASS=password
# Make sure to use `bundle exec rails secret` to generate secrets # Make sure to use `bundle exec rails secret` to generate secrets
# ------- # -------
SECRET_KEY_BASE= SECRET_KEY_BASE=
OTP_SECRET=
# Encryption secrets # Encryption secrets
# ------------------ # ------------------

4
app.json
View File

@@ -17,10 +17,6 @@
"description": "The secret key base", "description": "The secret key base",
"generator": "secret" "generator": "secret"
}, },
"OTP_SECRET": {
"description": "One-time password secret",
"generator": "secret"
},
"SINGLE_USER_MODE": { "SINGLE_USER_MODE": {
"description": "Should the instance run in single user mode? (Disable registrations, redirect to front page)", "description": "Should the instance run in single user mode? (Disable registrations, redirect to front page)",
"value": "false", "value": "false",

2
lib/tasks/mastodon.rake
View File

@@ -32,7 +32,7 @@ namespace :mastodon do
prompt.say('Single user mode disables registrations and redirects the landing page to your public profile.') 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) 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) env[key] = SecureRandom.hex(64)
end end

4
scalingo.json
View File

@@ -12,10 +12,6 @@
"description": "The secret key base", "description": "The secret key base",
"generator": "secret" "generator": "secret"
}, },
"OTP_SECRET": {
"description": "One-time password secret",
"generator": "secret"
},
"SINGLE_USER_MODE": { "SINGLE_USER_MODE": {
"description": "Should the instance run in single user mode? (Disable registrations, redirect to front page)", "description": "Should the instance run in single user mode? (Disable registrations, redirect to front page)",
"value": "false", "value": "false",