UPY-#246 - Change app conf

UpyExplorer · Jan 9, 2022 · a136987 · a136987
1 parent 5c85b58
commit a136987
Show file tree

Hide file tree

Showing 9 changed files with 803 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -157,4 +157,7 @@ upy.pem
 !.elasticbeanstalk/*.global.yml
 
 .env-dev
-.env-prod
+.env-prod
+
+db_manager.cnf
+db_application.cnf
diff --git a/_db_application.cnf b/_db_application.cnf
@@ -0,0 +1,6 @@
+[client]
+database = DB_NAME
+host = 0.0.0.0
+user = DB_USER
+password = DB_PASSWORD
+default-character-set = utf8
diff --git a/app/conf/development/settings.py → app/conf/development.py b/app/conf/development/settings.py → app/conf/development.py
@@ -11,7 +11,7 @@
 
 # warnings.simplefilter('error', DeprecationWarning)
 
-BASE_DIR = dirname(dirname(dirname(dirname(os.path.abspath(__file__)))))
+BASE_DIR = dirname(dirname(dirname(os.path.abspath(__file__))))
 CONTENT_DIR = os.path.join(BASE_DIR, 'content')
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 

diff --git a/app/conf/development/__init__.py b/app/conf/development/__init__.py
diff --git a/app/conf/production/settings.py → app/conf/production.py b/app/conf/production/settings.py → app/conf/production.py
@@ -6,7 +6,7 @@
 from django.utils.translation import gettext_lazy as _
 from sentry_sdk.integrations.django import DjangoIntegration
 
-BASE_DIR = dirname(dirname(dirname(dirname(os.path.abspath(__file__)))))
+BASE_DIR = dirname(dirname(dirname(os.path.abspath(__file__))))
 CONTENT_DIR = os.path.join(BASE_DIR, 'content')
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 

diff --git a/app/conf/production/__init__.py b/app/conf/production/__init__.py
diff --git a/app/settings.py b/app/settings.py
@@ -17,6 +17,6 @@
 DJANGO_ENV = env("DJANGO_ENV")
 
 if DJANGO_ENV == 'production':
-    from .conf.production.settings import *
+    from .conf.production import *
 else:
-    from .conf.development.settings import *
+    from .conf.development import *