diff --git a/.gitignore b/.gitignore index 4ce3771..784fd7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ db/data +.idea +.venv +gawa/gawa/__pycache__ +gawa/start/__pycache__ diff --git a/gawa/db.sqlite3 b/gawa/db.sqlite3 index e69de29..176a60b 100644 Binary files a/gawa/db.sqlite3 and b/gawa/db.sqlite3 differ diff --git a/gawa/gawa/settings.py b/gawa/gawa/settings.py index b509767..5ff725a 100644 --- a/gawa/gawa/settings.py +++ b/gawa/gawa/settings.py @@ -10,6 +10,10 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/3.2/ref/settings/ """ +# for getting envvars +import os + +# default django from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. @@ -20,7 +24,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent # 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-3sq$g-@p=-a=+0q&k#d#jec6vn5xib)==kf%)h$lkk%x+6m00=' +SECRET_KEY = 'django-insecure-z_t5-iawtas&1np9)01*4_z_&hy*7wgy1!o$3bnnniux3f1ds-' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -74,13 +78,18 @@ WSGI_APPLICATION = 'gawa.wsgi.application' # https://docs.djangoproject.com/en/3.2/ref/settings/#databases DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + "default": { + "ENGINE": "django.db.backends.mysql", + 'NAME': os.environ.get('MARIADB_NAME'), + 'USER': os.environ.get('MARIADB_USER'), + 'PASSWORD': os.environ.get('MARIADB_PASSWORD'), + 'HOST': 'db', + 'PORT': '', } } + # Password validation # https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators @@ -103,9 +112,9 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization # https://docs.djangoproject.com/en/3.2/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = 'de-De' -TIME_ZONE = 'UTC' +TIME_ZONE = 'CET' USE_I18N = True diff --git a/gawa/settings.py b/gawa/settings.py deleted file mode 100644 index c679e36..0000000 --- a/gawa/settings.py +++ /dev/null @@ -1,134 +0,0 @@ -""" -Django settings for gawa project. - -Generated by 'django-admin startproject' using Django 3.2.19. - -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/ -""" - -# for getting envvars -import os - -# default django -from pathlib import Path - -# 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-z_t5-iawtas&1np9)01*4_z_&hy*7wgy1!o$3bnnniux3f1ds-' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - - -# Application definition - -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', -] - -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 = 'gawa.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', - ], - }, - }, -] - -WSGI_APPLICATION = 'gawa.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/3.2/ref/settings/#databases - -DATABASES = { - "default": { - "ENGINE": "django.db.backends.mysql", - 'NAME': os.environ.get('MARIADB_NAME'), - 'USER': os.environ.get('MARIADB_USER'), - 'PASSWORD': os.environ.get('MARIADB_PASSWORD'), - 'HOST': 'db', - 'PORT': 3306, # default port for mariadb - } -} - - - -# 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', - }, -] - - -# 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/' - -# Default primary key field type -# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field - -DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..b0e22f7 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +Django>=3.0,<4.0 +psycopg2>=2.8 +mysqlclient>=1.4.3