Merge pull request #450 from hinashi/changed/setting/enviroment

Changed to separate settings for each environment by django-configrations

CHANGELOG.md

@@ -8,6 +8,8 @@
 * Set entry-id for each entry columns in the list entry page
 * Changed the logging method from airone profile to logging middleware
   Contributed by @hinashi
+* Changed to separate settings for each environment by django-configrations
+  Contributed by @hinashi
 
 ### Fixed
 * Fixed problems that changing values for group won't be shown correctly

airone/celery.py

@@ -1,10 +1,14 @@
 import os
+import configurations
 from celery import Celery
 from celery.signals import task_failure
 from django.core.mail import mail_admins
 
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'airone.settings')
+os.environ.setdefault('DJANGO_CONFIGURATION', 'Dev')
+
+configurations.setup()
 
 app = Celery('airone')
 

airone/settings.py

@@ -1,315 +1,9 @@
-import os
-import logging
-import subprocess
-import errno
-import importlib
-from typing import Any, Dict
+from airone.settings_common import Common
 
-from airone.lib.log import Logger
-from django_replicated import settings
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+class Dev(Common):
+    pass
 
 
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '(ch@ngeMe)'
-
-# Celery settings
-CELERY_BROKER_URL = 'amqp://guest:guest@localhost//'
-
-#: Only add pickle to this list if your broker is secured
-#: from unwanted access (see userguide/security.html)
-CELERY_ACCEPT_CONTENT = ['json']
-CELERY_RESULT_BACKEND = 'rpc://'
-CELERY_TASK_SERIALIZER = 'json'
-CELERY_BROKER_HEARTBEAT = 0
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-# INTERNAL_IPS = ['127.0.0.1']
-
-ALLOWED_HOSTS = ['*']
-
-
-# Application definition
-
-INSTALLED_APPS = [
-    'common',
-    'user',
-    'group',
-    'entity',
-    'acl',
-    'dashboard',
-    'entry',
-    'job',
-    'webhook',
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.humanize',
-    'import_export',
-    'rest_framework',
-    'rest_framework.authtoken',
-    'custom_view.background',
-    'custom_view',
-    'drf_spectacular',
-    'django_filters',
-    # "debug_toolbar",
-]
-
-MIDDLEWARE = [
-    'airone.lib.log.LoggingRequestMiddleware',
-    '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',
-    'whitenoise.middleware.WhiteNoiseMiddleware',
-    'airone.lib.db.AirOneReplicationMiddleware',
-    # "debug_toolbar.middleware.DebugToolbarMiddleware",
-]
-
-ROOT_URLCONF = 'airone.urls'
-
-PROJECT_PATH = os.path.realpath(os.path.dirname(__file__))
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-            PROJECT_PATH + '/../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 = 'airone.wsgi.application'
-
-# https://docs.djangoproject.com/en/3.2/ref/settings/#session-cookie-secure
-SESSION_COOKIE_SECURE = True
-
-# https://docs.djangoproject.com/en/3.2/ref/middleware/#http-strict-transport-security
-SECURE_HSTS_PRELOAD = True
-SECURE_HSTS_SECONDS = 1209600
-
-# Database
-# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'airone',
-        'USER': 'airone',
-        'PASSWORD': 'password',
-        'HOST': '127.0.0.1',
-        'OPTIONS': {
-            'charset': 'utf8mb4',
-        }
-    }
-}
-DATABASE_ROUTERS = ['django_replicated.router.ReplicationRouter']
-REPLICATED_DATABASE_SLAVES = ['default']
-REPLICATED_CACHE_BACKEND = settings.REPLICATED_CACHE_BACKEND
-REPLICATED_DATABASE_DOWNTIME = settings.REPLICATED_DATABASE_DOWNTIME
-REPLICATED_VIEWS_OVERRIDES = settings.REPLICATED_VIEWS_OVERRIDES
-REPLICATED_READ_ONLY_DOWNTIME = settings.REPLICATED_READ_ONLY_DOWNTIME
-REPLICATED_READ_ONLY_TRIES = settings.REPLICATED_READ_ONLY_TRIES
-REPLICATED_FORCE_MASTER_COOKIE_NAME = settings.REPLICATED_FORCE_MASTER_COOKIE_NAME
-REPLICATED_FORCE_MASTER_COOKIE_MAX_AGE = settings.REPLICATED_FORCE_MASTER_COOKIE_MAX_AGE
-REPLICATED_FORCE_STATE_HEADER = settings.REPLICATED_FORCE_STATE_HEADER
-REPLICATED_CHECK_STATE_ON_WRITE = settings.REPLICATED_CHECK_STATE_ON_WRITE
-REPLICATED_FORCE_MASTER_COOKIE_STATUS_CODES = settings.REPLICATED_FORCE_MASTER_COOKIE_STATUS_CODES
-REPLICATED_MANAGE_ATOMIC_REQUESTS = settings.REPLICATED_MANAGE_ATOMIC_REQUESTS
-
-# Password validation
-# https://docs.djangoproject.com/en/1.11/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',
-    },
-]
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/1.11/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'Asia/Tokyo'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# http://whitenoise.evans.io/en/stable/django.html
-
-STATIC_URL = '/static/'
-STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
-STATIC_ROOT = os.path.join(BASE_DIR, 'static_root')
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
-
-
-LOGIN_REDIRECT_URL = '/dashboard/'
-
-# global settins for AirOne
-AIRONE: Dict[str, Any] = {
-    'CONCURRENCY': 1,
-    'VERSION': 'unknown',
-    'FILE_STORE_PATH': '/tmp/airone_app',
-    'AUTO_COMPLEMENT_USER': 'auto_complementer',
-    'EXTENSIONS': [],
-    'TITLE': 'AirOne',
-    'SUBTITLE': 'SubTitle, Please change it',
-    'NOTE_DESC': 'Description, Please change it',
-    'NOTE_LINK': '',
-}
-
-# load extension settings individually
-for extension in AIRONE['EXTENSIONS']:
-    try:
-        importlib.import_module('%s.settings' % extension)
-    except ImportError:
-        Logger.warning('Failed to load settings %s' % extension)
-
-try:
-    proc = subprocess.Popen("cd %s && git describe --tags" % BASE_DIR, shell=True,
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    outs, errs = proc.communicate(timeout=1)
-    # if `git describe --tags` prints some string to stdout, use the result as version
-    # else use 'unknown' as version (e.g. untagged git repository)
-    if isinstance(outs, str):
-        AIRONE['VERSION'] = outs.strip()
-    elif isinstance(outs, bytes):
-        AIRONE['VERSION'] = outs.decode('utf-8').strip()
-    else:
-        logging.getLogger(__name__).warning('could not describe airone version from git')
-
-    # create a directory to store temporary file for applications
-    if not os.path.exists(AIRONE['FILE_STORE_PATH']):
-        os.makedirs(AIRONE['FILE_STORE_PATH'])
-
-except OSError as e:
-    # errno.ENOENT is the errno of FileNotFoundError
-    if e.errno == errno.ENOENT:
-        # do nothing and use 'unknown' as version when git does not exists
-        logging.getLogger(__name__).warning('git command not found.')
-
-
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': 'localhost:11211',
-        'TIMEOUT': None,
-    }
-}
-
-ES_CONFIG = {
-    'NODES': ['localhost:9200'],
-    'INDEX': 'airone',
-    'MAXIMUM_RESULTS_NUM': 500000,
-    'TIMEOUT': None
-}
-
-#
-# Note: Disable LDAP authentication by default in the mean time.
-#
-# AUTHENTICATION_BACKENDS = (
-#     'airone.auth.ldap.LDAPBackend',
-# )
-
-AUTH_CONFIG = {
-    'LDAP': {
-        'SERVER_ADDRESS': 'localhost',
-        'USER_FILTER': 'sn={username},ou=User,dc=example,dc=com'
-    }
-}
-
-LOGGING: Dict[str, Any] = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'all': {
-            'format': '\t'.join([
-                "[%(levelname)s]",
-                "asctime:%(asctime)s",
-                "module:%(module)s",
-                "message:%(message)s",
-                "process:%(process)d",
-                "thread:%(thread)d",
-            ])
-        }
-    },
-    'handlers': {
-        'file': {
-            'level': 'INFO',
-            'class': 'logging.FileHandler',
-            'filename': os.path.join(BASE_DIR, 'logs/django.log'),
-            'formatter': 'all'
-        },
-        'console': {
-            'level': 'INFO',
-            'class': 'logging.StreamHandler',
-            'formatter': 'all'
-        },
-    },
-    'loggers': {
-        'airone': {
-            'handlers': ['file', 'console'],
-            'level': 'INFO',
-            'propagate': False,
-        },
-        'django.server': {
-            'handlers': ['file', 'console'],
-            'level': 'INFO',
-            'propagate': False,
-        }
-    }
-}
-# If log dir is not exists create it.
-if not os.path.exists(os.path.dirname(LOGGING['handlers']['file']['filename'])):
-    os.makedirs(os.path.dirname(LOGGING['handlers']['file']['filename']))
-
-DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
-
-REST_FRAMEWORK = {
-    'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema',
-    'DEFAULT_AUTHENTICATION_CLASSES': [
-        "rest_framework.authentication.BasicAuthentication",
-        "rest_framework.authentication.SessionAuthentication",
-        "api_v1.auth.AironeTokenAuth",
-    ],
-    'DEFAULT_PERMISSION_CLASSES': [
-        "rest_framework.permissions.IsAuthenticated",
-    ],
-    'PAGE_SIZE': 30,
-}
+class Prd(Common):
+    pass