Merge branch 'dev' of http://gitlab.geoint.mx/mario.chirinos/GeoInt_SIDT into dev

GeoInt_SIDT/settings.py

@@ -79,24 +79,24 @@ WSGI_APPLICATION = 'GeoInt_SIDT.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases
 
-# DATABASES = {
-#     'default': {
-#         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-#         'NAME': 'repsatdb',
-#         'USER': 'root',
-#         'PASSWORD': 'root',
-#         'HOST': 'localhost',
-#         'PORT': '',
-#     }
-# }
-
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'repsat_dev',
+        'USER': 'repsat_dev',
+        'PASSWORD': 'r3pS4t0l40d3v3lop7',
+        'HOST': '192.168.1.60',
+        'PORT': '5432',
     }
 }
 
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+#     }
+# }
+
 
 
 
@@ -122,7 +122,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
 
-LANGUAGE_CODE = 'en-us' 
+LANGUAGE_CODE = 'en-us'
 
 TIME_ZONE = 'UTC'
 

config/config.json

 {
   "PATHS": {
-    "PATH_GEOSENTINEL": "/home/ulises/centroGEO/repsat/Geosentinel",
-    "PATH_NAS": "/home/ulises/NAS/",
-    "PATH_USERS" : "/home/ulises/NAS/repsat_test_dev/"
+    "PATH_GEOSENTINEL": "/home/emmanuelhp/Documentos/GeoSentinel",
+    "PATH_NAS": "/home/emmanuelhp/NAS/",
+    "PATH_USERS" : "/home/emmanuelhp/NAS/repsat_test_dev/"
   },
   "API_SENTINEL": {
     "SENTINEL_USER" : "emmhp",
     "SENTINEL_PASS" : "geoemm29"
   }
-} 
+}

reports/static/reports/tmpImages/repsat_test_dev

+/home/emmanuelhp/NAS/repsat_test_dev
\ No newline at end of file