diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/base_urls.py | 13 | ||||
-rw-r--r-- | config/django.ini | 12 |
2 files changed, 7 insertions, 18 deletions
diff --git a/config/base_urls.py b/config/base_urls.py index ad79987..ce0b577 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -67,7 +67,7 @@ urlpatterns = [ path(r'walks/', include('locations.walk_urls')), path(r'locations/', include('locations.urls')), path(r'newsletter/', include('lttr.urls')), - #path(r'photos/', include('media.urls')), + path(r'photos/', include('media.urls')), path(r'photos/', include('posts.urls.photo_essay_urls', namespace='photo-essay-list')), re_path(r'^essay/$', RedirectView.as_view(url='/essays/')), path(r'essay/', include('posts.urls.essay_urls')), @@ -85,14 +85,3 @@ urlpatterns = [ path(r'<slug>.txt', PageDetailTXTView.as_view()), path(r'<slug>', include('pages.urls', namespace='pages')), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) - - -if settings.DEBUG: - import debug_toolbar - urlpatterns = [ - path('__debug__/', include(debug_toolbar.urls)), - - # For django versions before 2.0: - # url(r'^__debug__/', include(debug_toolbar.urls)), - - ] + urlpatterns diff --git a/config/django.ini b/config/django.ini index 4cf9697..d1b157a 100644 --- a/config/django.ini +++ b/config/django.ini @@ -1,18 +1,18 @@ # django.ini file [uwsgi] -plugins = python +#plugins = python # maximum number of processes processes = 4 max-requests = 5000 enable-threads = true # the socket (use the full path to be safe) -socket = /run/uwsgi/%n.sock +socket = /var/run/uwsgi/%n.sock -uid = http -gid = http +uid = www +gid = www chmod-socket = 664 -chown-socket = http:http +chown-socket = www:www # the base directory chdir = /home/lxf/sites/luxagraf @@ -29,5 +29,5 @@ limit-post = 0 # clear environment on exit vacuum = true logto = /var/log/uwsgi/luxagraf.log -logfile-chown = http:http +logfile-chown = www:www logfile-chmod = 664 |