Fix small bug in templates and tweak settings
This commit is contained in:
parent
43d6ec989b
commit
aa6c1cf33b
@ -5,7 +5,7 @@ from leaflet.admin import LeafletGeoAdmin
|
|||||||
from .models import CaseStudy
|
from .models import CaseStudy
|
||||||
|
|
||||||
|
|
||||||
class CaseStudyAdmin(ModerationAdmin, LeafletGeoAdmin):
|
class CaseStudyAdmin(LeafletGeoAdmin):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@ -32,8 +32,8 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
<span class="badge badge-pill bg-info">{{case_study.country.name}}</span>
|
<span class="badge badge-pill bg-info">{{case_study.country.name}}</span>
|
||||||
</br>
|
</br>
|
||||||
<small class="text-muted">Created {{case_study.date_created|naturaltime}} by <i>{{case_study.author.}}</i></small>
|
<small class="text-muted">Created {{case_study.date_created|naturaltime}} by <i>{{case_study.author}}</i></small>
|
||||||
</div>
|
</div>
|
||||||
<a class="btn btn-primary btn-lg float-right" href="#" role="button">Get Involved</a>
|
<a class="btn btn-primary btn-lg float-right" href="#" role="button">Get Involved</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -20,8 +20,8 @@ services:
|
|||||||
- /containers/map/static:/app/static
|
- /containers/map/static:/app/static
|
||||||
- /containers/map/gunicorn.sock:/app/gunicorn.sock
|
- /containers/map/gunicorn.sock:/app/gunicorn.sock
|
||||||
env_file:
|
env_file:
|
||||||
- ./local.env
|
- ./environment
|
||||||
command: /bin/sh -c "python3 manage.py migrate && DEBUG=1 python3 manage.py collectstatic --noinput && gunicorn --bind 0.0.0.0:8000 ojusomap.wsgi"
|
command: /bin/sh -c "DEBUG=1 python3 manage.py collectstatic --noinput && python3 manage.py compilemessages && python3 manage.py migrate && gunicorn --bind 0.0.0.0:8000 ojusomap.wsgi"
|
||||||
|
|
||||||
db:
|
db:
|
||||||
restart: always
|
restart: always
|
||||||
@ -78,17 +78,6 @@ services:
|
|||||||
- /containers/jenkins:/var/jenkins_home
|
- /containers/jenkins:/var/jenkins_home
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
|
|
||||||
static:
|
|
||||||
image: nginx:alpine
|
|
||||||
restart: always
|
|
||||||
labels:
|
|
||||||
- "traefik.backend=static"
|
|
||||||
- "traefik.frontend.rule=Host:map.ojuso.org;PathPrefixStrip:/static/"
|
|
||||||
- "traefik.frontend.priority=10"
|
|
||||||
networks:
|
|
||||||
- web
|
|
||||||
volumes:
|
|
||||||
- /containers/map/static:/usr/share/nginx/html:ro
|
|
||||||
|
|
||||||
weblate_static:
|
weblate_static:
|
||||||
image: nginx:alpine
|
image: nginx:alpine
|
||||||
|
@ -4,6 +4,7 @@ ALLOWED_HOSTS=map.ojuso.org
|
|||||||
DATABASE_HOST=db
|
DATABASE_HOST=db
|
||||||
DATABASE_NAME=postgres
|
DATABASE_NAME=postgres
|
||||||
DATABASE_PASSWORD=${DATABASE_PASSWORD}
|
DATABASE_PASSWORD=${DATABASE_PASSWORD}
|
||||||
|
DEFAULT_FROM_EMAIL=admin@ojuso.org
|
||||||
EMAIL_HOST=mail.gandi.net
|
EMAIL_HOST=mail.gandi.net
|
||||||
EMAIL_HOST_USER=admin@ojuso.org
|
EMAIL_HOST_USER=admin@ojuso.org
|
||||||
EMAIL_HOST_PASSWORD=${SMTP_PASSWORD}
|
EMAIL_HOST_PASSWORD=${SMTP_PASSWORD}
|
||||||
|
@ -8,9 +8,9 @@ https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
from raven.contrib.django.raven_compat.middleware.wsgi import Sentry
|
||||||
from django.core.wsgi import get_wsgi_application
|
from django.core.wsgi import get_wsgi_application
|
||||||
|
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ojusomap.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ojusomap.settings")
|
||||||
|
|
||||||
application = get_wsgi_application()
|
application = Sentry(get_wsgi_application())
|
||||||
|
Loading…
Reference in New Issue
Block a user