summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelle van der Waa <jelle@archlinux.org>2020-08-03 21:37:00 +0200
committerJelle van der Waa <jelle@archlinux.org>2020-08-03 21:38:12 +0200
commit259eea2d6cb2af7a1baa750d4881abe42b4aa60b (patch)
tree16da95c236df7a0dba513378cb87cfeee04c9a60
parent58d8b79b0b4c40c68abb5b6c6ea2aca67cf2ce87 (diff)
downloadarchweb-259eea2d6cb2af7a1baa750d4881abe42b4aa60b.tar.gz
archweb-259eea2d6cb2af7a1baa750d4881abe42b4aa60b.zip
Fix NETBOOT_SECURITY_BANNER settingsrelease_2020-08-03
Move the settings before the local_settings.py import to make it configurable in local_settings.py and remove the setting from local_settings.py.example as it's not required to be there.
-rw-r--r--local_settings.py.example3
-rw-r--r--settings.py6
2 files changed, 3 insertions, 6 deletions
diff --git a/local_settings.py.example b/local_settings.py.example
index 63c5d845..f5b167f5 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -54,7 +54,4 @@ MEDIA_URL = '/media/img/'
## Make this unique, and don't share it with anybody.
SECRET_KEY = '00000000000000000000000000000000000000000000000'
-## Display a warning if serving netboot images on downgraded ciphers
-NETBOOT_SECURITY_BANNER=True
-
# vim: set ts=4 sw=4 et:
diff --git a/settings.py b/settings.py
index 14d174ef..bffb7572 100644
--- a/settings.py
+++ b/settings.py
@@ -167,6 +167,9 @@ SVN_BASE_URL = 'svn://svn.archlinux.org/'
# How long to keep mirrorlog's in days
MIRRORLOG_RETENTION_PERIOD = 365
+# Display a warning if serving netboot images on downgraded ciphers
+NETBOOT_SECURITY_BANNER = False
+
# Shorten some names just a bit
COUNTRIES_OVERRIDE = {
'GB': 'United Kingdom',
@@ -225,7 +228,4 @@ if DEBUG_TOOLBAR:
INSTALLED_APPS = list(INSTALLED_APPS) + ['debug_toolbar']
-## Display a warning if serving netboot images on downgraded ciphers
-NETBOOT_SECURITY_BANNER=True
-
# vim: set ts=4 sw=4 et: