diff --git a/requirements.txt b/requirements.txt index 5f404e1..9d5f652 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Flask==0.10.1 Flask-Login==0.2.11 -Flask_Micropub==0.1.1 +Flask_Micropub==0.1.2 Flask-SQLAlchemy==2.0 Jinja2==2.7.3 MarkupSafe==0.23 @@ -12,7 +12,7 @@ celery==3.1.17 feedparser==5.1.3 html5lib==0.999 itsdangerous==0.24 -mf2py==0.2.1 +-e git+git@github.com:kylewm/mf2py.git#egg=mf2py mf2util==0.1.4 redis==2.10.3 requests==2.5.1 diff --git a/uwsgi.ini b/uwsgi.ini index e733b69..8f47645 100644 --- a/uwsgi.ini +++ b/uwsgi.ini @@ -2,7 +2,7 @@ master=true processes=4 threads=2 -socket=/tmp/uwsgi.sock +socket=/tmp/woodwind.sock chmod-socket=666 -module=woodwind:wsgi +module=woodwind.wsgi pidfile=/tmp/woodwind.pid diff --git a/woodwind/templates/feed.jinja2 b/woodwind/templates/feed.jinja2 index 5be6ce1..bd15c92 100644 --- a/woodwind/templates/feed.jinja2 +++ b/woodwind/templates/feed.jinja2 @@ -1,9 +1,11 @@ {% extends "base.jinja2" %} {% block header %} -
+ {% if current_user.is_authenticated() %} + + {% endif %} {% endblock header %} {% block body %} @@ -30,27 +32,29 @@ - - + {% endfor %} - Older + {% if entries %} + Older + {% endif %} {% endblock body %} diff --git a/woodwind/views.py b/woodwind/views.py index 017ab8c..776562d 100644 --- a/woodwind/views.py +++ b/woodwind/views.py @@ -30,15 +30,7 @@ def index(): @ui.route('/install') def install(): - db.drop_all() db.create_all() - - user = User(domain='kylewm.com',) - db.session.add(user) - db.session.commit() - - flask_login.login_user(user) - return 'Success!' diff --git a/woodwind/wsgi.py b/woodwind/wsgi.py new file mode 100644 index 0000000..a316945 --- /dev/null +++ b/woodwind/wsgi.py @@ -0,0 +1,3 @@ +from . import create_app + +application = create_app()