From 5fa6700bb4f966b7069b34f705eaeb2e0883f15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sat, 30 Jul 2022 14:07:35 +0200 Subject: [PATCH] Revert "Move debug settings to Postgresql database which is needed for fulltext search" This reverts commit 0aadf4305f22c5d2152f9b2ca4f7026930189c52. --- .../shimatta_kenkyusho/settings.py | 16 +- .../shimatta_kenkyusho/settings_sqlite.py | 185 ------------------ 2 files changed, 2 insertions(+), 199 deletions(-) delete mode 100644 shimatta_kenkyusho/shimatta_kenkyusho/settings_sqlite.py diff --git a/shimatta_kenkyusho/shimatta_kenkyusho/settings.py b/shimatta_kenkyusho/shimatta_kenkyusho/settings.py index 8966031..9905e0e 100644 --- a/shimatta_kenkyusho/shimatta_kenkyusho/settings.py +++ b/shimatta_kenkyusho/shimatta_kenkyusho/settings.py @@ -95,23 +95,11 @@ WSGI_APPLICATION = 'shimatta_kenkyusho.wsgi.application' # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases -def get_env_value(env_variable, default=None): - try: - return os.environ[env_variable] - except KeyError: - if default is not None: - return default - error_msg = 'Set the {} environment variable'.format(env_variable) - raise Exception(error_msg) - DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'shimatta_kenkyusho', - 'USER': get_env_value('DJANGO_POSTGRESQL_USER'), - 'PASSWORD': '', - 'HOST': get_env_value('DJANGO_POSTGRESQL_SOCKET'), + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', } } diff --git a/shimatta_kenkyusho/shimatta_kenkyusho/settings_sqlite.py b/shimatta_kenkyusho/shimatta_kenkyusho/settings_sqlite.py deleted file mode 100644 index 9905e0e..0000000 --- a/shimatta_kenkyusho/shimatta_kenkyusho/settings_sqlite.py +++ /dev/null @@ -1,185 +0,0 @@ -""" -Django settings for shimatta_kenkyusho project. - -Generated by 'django-admin startproject' using Django 3.2.5. - -For more information on this file, see -https://docs.djangoproject.com/en/3.2/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.2/ref/settings/ -""" - -from pathlib import Path -import os - -# Build paths inside the project like this: BASE_DIR / 'subdir'. -BASE_DIR = Path(__file__).resolve().parent.parent - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-vq_@ue3ul@&4bz7wkcpf3pjrwf8o$7g!z-rw$ftr-$)7l3*m=^' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = ['localhost'] - - -# Application definition - -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'parts.apps.PartsConfig', - 'api.apps.ApiConfig', - 'rest_framework.authtoken', - 'django_filters', - 'qr_code', - 'rest_framework', - 'crispy_forms', - 'crispy_bootstrap5', - 'django.forms', -] - -FORM_RENDERER = 'django.forms.renderers.TemplatesSetting' - -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 = 'shimatta_kenkyusho.urls' - -CACHES = { - 'default': { - 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', - }, - 'qr-code': { - 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', - 'LOCATION': 'qr-code-cache', - 'TIMEOUT': 3600 - } -} - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'templates'),], - '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', - ], - }, - }, -] - -WSGI_APPLICATION = 'shimatta_kenkyusho.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/3.2/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } -} - - -# Password validation -# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators - -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', - }, -] - -REST_FRAMEWORK = { - 'DEFAULT_AUTHENTICATION_CLASSES': [ - 'rest_framework.authentication.BasicAuthentication', - 'rest_framework.authentication.SessionAuthentication', - 'api.ExpiringAuthToken.ExpiringTokenAuthentication', - ], - 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', - 'PAGE_SIZE': 10, - 'DEFAULT_THROTTLE_CLASSES': [ - 'rest_framework.throttling.AnonRateThrottle', - 'rest_framework.throttling.UserRateThrottle' - ], - 'DEFAULT_THROTTLE_RATES': { - 'anon': '100/hour', - 'user': '2000/hour' - } - -} - -REST_FRAMEWORK_TOKEN_EXPIRE_HOURS = 4 - - -# Internationalization -# https://docs.djangoproject.com/en/3.2/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.2/howto/static-files/ - -STATIC_URL = '/static/' - -STATICFILES_DIRS = [ - os.path.join(BASE_DIR, "static"), -] - -# Default primary key field type -# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field - -DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -MEDIA_URL = '/media/' -MEDIA_ROOT = os.path.join(BASE_DIR, "media") - -LOGIN_URL = '/login' -LOGIN_REDIRECT_URL = '/' - - -SHIMATTA_KENKYUSHO_TITLE = 'しまった・研究所' - -CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" - -CRISPY_TEMPLATE_PACK = "bootstrap5" \ No newline at end of file