summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamantaz Fox <coding@samantaz.fr>2023-07-01 21:53:56 +0200
committerSamantaz Fox <coding@samantaz.fr>2023-07-01 21:53:56 +0200
commitd7568ac45a77323e724d0664d8959d9c1e8fa04c (patch)
treea2d2c4fc1c30c7431ff04705dfea1ad104395485 /src
parenta0cc807821daf138b741ced492cddb42642988cf (diff)
downloadinvidious-d7568ac45a77323e724d0664d8959d9c1e8fa04c.tar.gz
invidious-d7568ac45a77323e724d0664d8959d9c1e8fa04c.tar.bz2
invidious-d7568ac45a77323e724d0664d8959d9c1e8fa04c.zip
Remove old warning code about unconfigured 'hmac_key'
Diffstat (limited to 'src')
-rw-r--r--src/invidious.cr9
-rw-r--r--src/invidious/views/template.ecr8
2 files changed, 2 insertions, 15 deletions
diff --git a/src/invidious.cr b/src/invidious.cr
index 636e28a6..84e1895d 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -57,9 +57,8 @@ end
# Simple alias to make code easier to read
alias IV = Invidious
-CONFIG = Config.load
-HMAC_KEY_CONFIGURED = CONFIG.hmac_key != nil
-HMAC_KEY = CONFIG.hmac_key || Random::Secure.hex(32)
+CONFIG = Config.load
+HMAC_KEY = CONFIG.hmac_key
PG_DB = DB.open CONFIG.database_url
ARCHIVE_URL = URI.parse("https://archive.org")
@@ -230,10 +229,6 @@ Kemal.config.host_binding = Kemal.config.host_binding != "0.0.0.0" ? Kemal.confi
Kemal.config.port = Kemal.config.port != 3000 ? Kemal.config.port : CONFIG.port
Kemal.config.app_name = "Invidious"
-if !HMAC_KEY_CONFIGURED
- LOGGER.warn("Please configure hmac_key by July 1st, see more here: https://github.com/iv-org/invidious/issues/3854")
-end
-
# Use in kemal's production mode.
# Users can also set the KEMAL_ENV environmental variable for this to be set automatically.
{% if flag?(:release) || flag?(:production) %}
diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr
index aa0fc15f..77265679 100644
--- a/src/invidious/views/template.ecr
+++ b/src/invidious/views/template.ecr
@@ -111,14 +111,6 @@
</div>
<% end %>
- <% if env.get? "user" %>
- <% if !HMAC_KEY_CONFIGURED && CONFIG.admins.includes? env.get("user").as(Invidious::User).email %>
- <div class="h-box">
- <h3><p>Message for admin: please configure hmac_key, <a href="https://github.com/iv-org/invidious/issues/3854">see more here</a>.</p></h3>
- </div>
- <% end %>
- <% end %>
-
<%= content %>
<footer>