From 5788050def9910f85c1d512c40d9ee9fddf6dd65 Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Sun, 28 Jan 2024 23:24:35 +0100 Subject: [PATCH] added mysql --- blog/__init__.py | 3 ++ myblog/__pycache__/settings.cpython-310.pyc | Bin 2381 -> 2991 bytes myblog/settings.py | 40 ++++++++++++++++++-- readme.md | 9 +++++ requirements.txt | 2 + setup.sh | 6 +++ 6 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 readme.md create mode 100644 setup.sh diff --git a/blog/__init__.py b/blog/__init__.py index e69de29..aa60bed 100644 --- a/blog/__init__.py +++ b/blog/__init__.py @@ -0,0 +1,3 @@ +import pymysql + +pymysql.install_as_MySQLdb() \ No newline at end of file diff --git a/myblog/__pycache__/settings.cpython-310.pyc b/myblog/__pycache__/settings.cpython-310.pyc index 5f35299d51bb112a2e529140c543494bdc0e356c..de887baa7c8e10062870470c399431b79a13db6f 100644 GIT binary patch delta 1061 zcmaKr&uB1gzOV;pauHm>N=+J^5!m=S|rFr8;H&2u8nhj5?)e7Hf-e-3;^&lx?B;vgTxthRDE zq&fV27ec_1eWsmH;3yv#4vyi8Udjor$NPFx>xsUe(t5J5r?sBy>%7*}eLW*)#e|p? zQ({`=#Z1H51Nj8=$JcOX-_g1GT+_!q&h}0-FS0n-r8vJ&L*R2d{YmXIjtf1W>TxlI z2ID93G+)3o{1oQ+q8_JliJ$oz<7}7mB`ol>$O2OM;h&F}V7CA&)kl#Al`dOJ##bzeMG_I5pLi$mf+Ht& zEIDnEH<&S)HJH=rytS9zzRO|OS%bUM++d-g+*%Fed$pQ!x9Z6sQMfM6RjWY^TS+?! zqt=gx(lU{319J|UGCl(+*4qtzXnhxonK~)Ex77K|y@j+eGpKf)A3AC0Jw&6D_6_W(^yn3yG=4N-X7;MlcZs zD~t60ftD8Air--CO$x~ja}I|Y&cJyqd^q*Uwhbcc=lwa5Z9=|RVzX2s8e%4&gKw`TPZu5Vq$ diff --git a/myblog/settings.py b/myblog/settings.py index 683cad2..9df7ea8 100644 --- a/myblog/settings.py +++ b/myblog/settings.py @@ -11,8 +11,21 @@ https://docs.djangoproject.com/en/4.2/ref/settings/ """ from pathlib import Path +from distutils.util import strtobool import os +# Get ENV vars + +def get_env_variable(variable_name, default=None): + for key, value in os.environ.items(): + if key.upper() == variable_name.upper(): + return value + return default + +variable_name = 'DEBUG' +debug_value = get_env_variable(variable_name, default='True') +debug = bool(strtobool(debug_value)) + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -25,9 +38,9 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) SECRET_KEY = 'django-insecure-u260h434jemg53tn^bd&%x^h9p09^kbkk!2%3t^8%kd0nt^xjf' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = debug -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['*'] # Application definition @@ -76,7 +89,28 @@ WSGI_APPLICATION = 'myblog.wsgi.application' # Database # https://docs.djangoproject.com/en/4.2/ref/settings/#databases -DATABASES = { + +ENGINE = get_env_variable('ENGINE', default='') +NAME = get_env_variable('NAME', default='') +USER = get_env_variable('USER', default='') +PASSWORD = get_env_variable('PASSWORD', default='') +HOST = get_env_variable('HOST', default='') +PORT = get_env_variable('PORT', default='') + + +if all([ENGINE, NAME, USER, PASSWORD, HOST, PORT]): + DATABASES = { + 'default': { + 'ENGINE': ENGINE, + 'NAME': NAME, + 'USER': USER, + 'PASSWORD': PASSWORD, + 'HOST': HOST, + 'PORT': PORT, + } + } +else: + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..2701ddf --- /dev/null +++ b/readme.md @@ -0,0 +1,9 @@ +# ENV +DEBUG - set django in DEBUG mode + + +# Build Container +docker build -t prudellic:1.0.0 . + +# Start venv +. /venv/bin/activate \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 2b45082..ac1bbd6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,5 @@ asgiref==3.7.2 Django==4.2.7 sqlparse==0.4.4 typing_extensions==4.9.0 +PyMySQL==1.1.0 +cryptography==42.0.1 \ No newline at end of file diff --git a/setup.sh b/setup.sh new file mode 100644 index 0000000..73364ac --- /dev/null +++ b/setup.sh @@ -0,0 +1,6 @@ +export ENGINE="django.db.backends.mysql" +export NAME="prudellic" +export USER="prudellic" +export PASSWORD="cilledurp321" +export HOST="192.168.30.1" +export PORT="3306"