Conjunto de cambios 7b731b3 en seguimiento_proyectos para sepai/sepai/settings.py

Fecha y hora:

31/05/2017 08:47:36 (hace 7 años)

Autor:

lhernandez <lhernandez@…>

Branches:

master, desarrollo

Children:

7607b2f

Parents:

f6237c2 (diferencia), a8d2162 (diferencia)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Mensaje:

Realizando mezcla a la rama master

Fichero:

• sepai/sepai/settings.py (modificado) (2 diferencias)

sepai/sepai/settings.py

@@ -89 +89 @@
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sepai.sqlite'),
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'sepai',
+        'USER': 'postgres',
+        'PASSWORD': 'postgres',
+        'HOST': 'localhost',
+        'PORT': '5432',
+        'ATOMIC_REQUESTS': True, # Crea transacciones en cada peticion de la vista
     }
 }
@@ -110 +115 @@
 BASE_URL = ""
 
-MEDIA_ROOT = os.path.join(TEMPLATES_SEPAI, 'sources')
-MEDIA_URL = BASE_URL + '/recursos/'
+
+MEDIA_ROOT = os.path.join(BASE_DIR, 'sources/')
+MEDIA_URL = '/sources/'
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
-STATIC_URL = TEMPLATES_SEPAI + '/static/'
-SOURCES_URL = TEMPLATES_SEPAI + '/sources/'
+SOURCES_URL = BASE_DIR + 'sources/'
+STATIC_ROOT = BASE_DIR + 'static/'
+STATIC_URL = '/static/'
 
 STATICFILES_DIRS = (
-    os.path.join(STATIC_URL),
-    os.path.join(SOURCES_URL),
+    os.path.join(BASE_DIR, 'static/'),
+    os.path.join(BASE_DIR, 'sources/'),
 )