Skip to content

Commit

Permalink
Small tweaks found when deploying
Browse files Browse the repository at this point in the history
  • Loading branch information
dlareau committed Mar 22, 2020
1 parent 573c199 commit 4bb9e98
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
5 changes: 3 additions & 2 deletions docker/apacheShibForeground
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ echo "Finished starting shibd"
if [ "$(ls -A /etc/letsencrypt/live)" ]; then
echo "Found existing certificate, not running certbot and assuming ssl is already enabled."
else
certbot --apache -n --agree-tos --staging --email $CONTACT_EMAIL --domains $DOMAIN
# certbot --apache -n --agree-tos --staging --email $CONTACT_EMAIL --domains $DOMAIN
certbot --apache -n --agree-tos --email $CONTACT_EMAIL --domains $DOMAIN
fi
a2enmod ssl
service apache2 stop

exec /usr/sbin/apache2ctl -D FOREGROUND
exec /usr/sbin/apache2ctl -D FOREGROUND
3 changes: 0 additions & 3 deletions huntserver/templatetags/bootstrap_tags.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
from django import template
import logging
register = template.Library()
logger = logging.getLogger(__name__)


@register.simple_tag
Expand All @@ -10,7 +8,6 @@ def active_page(request, view_name):
if not request:
return ""
try:
logger.info(str(resolve(request.path_info)))
r = resolve(request.path_info)
url_name_bool = r.url_name == view_name
if("url" in r.kwargs):
Expand Down
8 changes: 7 additions & 1 deletion puzzlehunt_server/settings/base_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,13 @@
'level': 'INFO',
'class': 'logging.FileHandler',
'filename': '/var/log/external/django.log',
'formatter': 'verbose',
},
},
'loggers': {
'django': {
'handlers': ['file'],
'level': 'INFO',
'level': 'WARNING',
'propagate': True,
},
'huntserver': {
Expand All @@ -149,6 +150,11 @@
'propagate': True,
},
},
'formatters': {
'verbose': {
'format': '%(levelname)s %(asctime)s %(module)s %(message)s'
},
},
}

# Email settings
Expand Down

0 comments on commit 4bb9e98

Please sign in to comment.