diff --git a/docker-compose.yml b/docker-compose.yml index 3d3f338..aacad94 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,8 @@ services: - ./hbnet/web_service/data:/opt/hbnet_web/data:rw # NGINX logs - ./hbnet/log/web_service:/var/log/nginx:rw + # Non SSL config + - ./hbnet/web_service/hbnet.conf:/etc/nginx/sites-enabled/hbnet.conf # Path to custom NGINX config for SSL #- ./hbnet/web_service/hbnet_ssl.conf:/etc/nginx/sites-enabled/hbnet.conf # Path to SSL certificates diff --git a/web/app.py b/web/app.py index b288d16..892707c 100644 --- a/web/app.py +++ b/web/app.py @@ -813,7 +813,7 @@ By using this service, you agree not to do anything malicious. You agree to use content = '' # try: l_news = News.query.order_by(News.time.desc()).first() - return render_template('index.html', news = Markup(content), content_block = Markup(home_text.data), text = l_news.text, subject = l_news.subject, date = l_news.date, news_id = l_news.id) + return render_template('index.html', news = Markup(content), content_block = Markup(home_text.data), text = l_news.text[:300] + '...', subject = l_news.subject, date = l_news.date, news_id = l_news.id) # except: # content = '' # return render_template('index.html', content_block = Markup(home_text.data))