Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GeoInt_SIDT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mario Chirinos Colunga
GeoInt_SIDT
Commits
0004dd6d
Commit
0004dd6d
authored
Feb 12, 2019
by
Sergio Adrian Gongora Euan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab.geoint.mx/mario.chirinos/GeoInt_SIDT
into dev
parents
1ab33d8d
8aad889a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
18 deletions
+19
-18
settings.py
GeoInt_SIDT/settings.py
+14
-14
config.json
config/config.json
+4
-4
db.sqlite3
db.sqlite3
+0
-0
repsat_test_dev
reports/static/reports/tmpImages/repsat_test_dev
+1
-0
No files found.
GeoInt_SIDT/settings.py
View file @
0004dd6d
...
@@ -79,24 +79,24 @@ WSGI_APPLICATION = 'GeoInt_SIDT.wsgi.application'
...
@@ -79,24 +79,24 @@ WSGI_APPLICATION = 'GeoInt_SIDT.wsgi.application'
# Database
# Database
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
# 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
=
{
DATABASES
=
{
'default'
:
{
'default'
:
{
'ENGINE'
:
'django.db.backends.sqlite3'
,
'ENGINE'
:
'django.db.backends.postgresql_psycopg2'
,
'NAME'
:
os
.
path
.
join
(
BASE_DIR
,
'db.sqlite3'
),
'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'),
# }
# }
...
...
config/config.json
View file @
0004dd6d
{
{
"PATHS"
:
{
"PATHS"
:
{
"PATH_GEOSENTINEL"
:
"/home/
ulises/centroGEO/repsat/Geos
entinel"
,
"PATH_GEOSENTINEL"
:
"/home/
emmanuelhp/Documentos/GeoS
entinel"
,
"PATH_NAS"
:
"/home/
ulises
/NAS/"
,
"PATH_NAS"
:
"/home/
emmanuelhp
/NAS/"
,
"PATH_USERS"
:
"/home/
ulises
/NAS/repsat_test_dev/"
"PATH_USERS"
:
"/home/
emmanuelhp
/NAS/repsat_test_dev/"
},
},
"API_SENTINEL"
:
{
"API_SENTINEL"
:
{
"SENTINEL_USER"
:
"emmhp"
,
"SENTINEL_USER"
:
"emmhp"
,
...
...
db.sqlite3
deleted
100644 → 0
View file @
1ab33d8d
File deleted
reports/static/reports/tmpImages/repsat_test_dev
0 → 120000
View file @
0004dd6d
/home/emmanuelhp/NAS/repsat_test_dev
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment