Merge branch 'master' into 'marietje-zuid'

untrack settings

See merge request oslomp/MarietjeDjango!2

marietje/marietje/settings.py

@@ -1,147 +0,0 @@
-"""
-Django settings for marietje project.
-"""
-
-import os
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-SECRET_KEY = 'sae2hahHao1soo0Ocoz5Ieh1Ushae6feJe4mooliooj0Ula8'
-DEBUG = True
-ALLOWED_HOSTS = ['*']
-
-INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'marietje',
-    'queues',
-    'songs',
-    'stats'
-]
-
-MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-]
-
-ROOT_URLCONF = 'marietje.urls'
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-                'marietje.context_processors.global_settings',
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = 'marietje.wsgi.application'
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'marietje',
-        'USER': 'marietje',
-        'PASSWORD': 'v8TzZwdAdSi7Tk5I',
-        'HOST': 'localhost',
-        'PORT': '3306',
-        'OPTIONS': { 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'" },
-    }
-}
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-PASSWORD_HASHERS = [
-    'django.contrib.auth.hashers.Argon2PasswordHasher',
-    'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-    'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
-    'django.contrib.auth.hashers.Argon2PasswordHasher',
-    'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
-    'django.contrib.auth.hashers.BCryptPasswordHasher',
-    'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
-]
-
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-        'LOCATION': '/var/tmp/MarietjeDjango_cache/default',
-        'OPTIONS': { 'MAX_ENTRIES': 1000 },
-    },
-    'song_search': {
-        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-        'LOCATION': '/var/tmp/MarietjeDjango_cache/song_search',
-        'OPTIONS': { 'MAX_ENTRIES': 1000 },
-    },
-}
-
-AUTH_USER_MODEL = 'marietje.User'
-LANGUAGE_CODE = 'en-us'
-TIME_ZONE = 'Europe/Amsterdam'
-USE_I18N = True
-USE_L10N = True
-USE_TZ = True
-
-
-# zc files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.10/howto/static-files/
-
-BASE_URL = 'https://marietje-zuid.science.ru.nl'
-
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-STATIC_URL = '/static/'
-LOGIN_URL = '/login/'
-LOGIN_REDIRECT_URL = '/'
-LOGOUT_REDIRECT_URL = '/'
-
-# App specific settings
-
-BERTHA_HOST = ('bach.science.ru.nl', 1234)
-MAIL_FROM = 'marietje@marietje.science.ru.nl'
-MAX_MINUTES_IN_A_ROW = 45
-
-# Time range (dependent on timezone specified) when MAX_MINUTES_IN_A_ROW is in effect.
-LIMIT_HOURS = (12, 13)
-LIMIT_MINUTES = (15, 45)
-LIMIT_ALWAYS = True
-
-CONTACT_EMAIL = 'marietje@science.ru.nl'
-
-STATS_TOP_COUNT = 50
-STATS_REQUEST_IGNORE_USER_IDS = []
-
-ISSUES_URL = 'https://gitlab.science.ru.nl/Marietje/MarietjeDjango/issues'
-MERGE_REQUESTS_URL = 'https://gitlab.science.ru.nl/Marietje/MarietjeDjango/merge_requests'
-TRUSTED_IP_RANGES = [
-    '131.174.0.0/16',   # RU wired
-    '145.116.136.0/22', # eduroam
-]