mirror of
https://github.com/mastodon/mastodon.git
synced 2025-07-15 08:48:15 +00:00
Remove OTP_SECRET
env configuration from setup (#34757)
This commit is contained in:
parent
8c51a8ba94
commit
3a5e310a6d
|
@ -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
4
app.json
|
@ -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",
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user