Changeset ae16fa9 in observatorio

Timestamp:

Sep 9, 2014, 10:58:01 AM (10 years ago)

Author:

root <root@…>

Branches:

master

Children:

0f21966

Parents:

46e3466

Message:

modificaciones para el buen funcionamiento en el servidor

Location:

procesos

Files:

• settings.py (modified) (6 diffs)
• urls.py (modified) (3 diffs)

procesos/settings.py

@@ -30 +30 @@
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
         'NAME': 'procesos',
-        'USER': 'admin',
-        'PASSWORD': '123456',
+        'USER': 'administrador',
+        'PASSWORD': 'clave',
         'HOST': 'localhost',
         'PORT': '5432',
@@ -37 +37 @@
     'sigesic': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'sigesic01112012',
-        'USER': 'admin',
-        'PASSWORD': '123456',
+        'NAME': 'sigesic_03162014',
+        'USER': 'administrador',
+        'PASSWORD': 'clave',
         'HOST': 'localhost',
         'PORT': '5432',
@@ -46 +46 @@
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
         'NAME': 'geocadena',
-        'USER': 'admin',
-        'PASSWORD': '123456',
+        'USER': 'administrador',
+        'PASSWORD': 'clave',
         'HOST': 'localhost',
         'PORT': '5432',
@@ -85 +85 @@
 USE_I18N = True
 
-BASE_URL = ""
+BASE_URL = "/prueba"
 LOGIN_URL = BASE_URL + "/signin/"
 LOGOUT_URL = BASE_URL + "/"
@@ -153 +153 @@
     # Don't forget to use absolute paths, not relative paths.
     os.path.join(PATH, "templates"),
-    'django/contrib/databrowse/templates',
+    #'django/contrib/databrowse/templates',
 )
 
@@ -182 +182 @@
 )
 
-if django_version() <= '1.4.5':
-    INSTALLED_APPS += ('django.contrib.databrowse', )
-else:
-    INSTALLED_APPS += ('django_databrowse', )
-
-
-STATIC_ROOT = ''
-STATIC_URL = '/media/'
+#if django_version() <= '1.4.5':
+#    INSTALLED_APPS += ('django.contrib.databrowse', )
+#else:
+#    INSTALLED_APPS += ('django_databrowse', )
+
+
+STATIC_ROOT = '/var/www/procesos/media'
+STATIC_URL =  '/prueba/media/'
 
 
 STATICFILES_DIRS = (
-    os.path.join(PATH, 'media/'),
+#    os.path.join(PATH, 'media/'),
+    os.path.join(PATH, 'static/'),
 )
 

procesos/urls.py

@@ -3 +3 @@
 from django.contrib.auth.decorators import login_required
 import os
-
+from django.conf.urls.static import static
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 # Uncomment the next two lines to enable the admin:
@@ -39 +40 @@
                        (r'^databrowse/(.*)', login_required(databrowse.site.root)),
                        #(r'^graphviz/', include('graphviz.urls')),
-)
+) 
 
 if settings.DEBUG:
@@ -45 +46 @@
                             (r'^media/(?P<path>.*)$', 'django.views.static.serve',
                              {'document_root': os.path.join(os.path.dirname(__file__), "media")}),
+                            (r'^static/(?P<path>.*)$', 'django.views.static.serve',
+                             {'document_root': os.path.join(os.path.dirname(__file__), "static")}),
                             (r'^tmp/(?P<path>.*)$', 'django.views.static.serve',
                              {'document_root': os.path.join(os.path.dirname(__file__), "tmp")}),
                             (r'^media/images/(?P<path>.*)$', 'django.views.static.serve',
-                             {'document_root': os.path.join(os.path.dirname(__file__), "media/images")}),
+                             {'document_root': os.path.join(os.path.dirname(__file__), "media/images"),'show_indexes':True}),
     )
+
+if settings.DEBUG:
+    urlpatterns += patterns('django.contrib.staticfiles.views',
+        url(r'^static/(?P<path>.*)$', 'serve'),
+    )
+
+urlpatterns += staticfiles_urlpatterns()