Merge branch 'master' of github.com:ZeusWPI/Foodbot

Conflicts:
	app/app.py
	app/james.py
This commit is contained in:
Feliciaan De Palmenaer 2015-04-02 12:42:39 +02:00
commit aa7f916979
5 changed files with 15 additions and 28 deletions

2
.gitignore vendored
View file

@ -60,3 +60,5 @@ app/config.py
# Do not add db file # Do not add db file
*.db *.db
tmp/

View file

@ -10,4 +10,4 @@ from utils import *
from views import * from views import *
if __name__ == '__main__': if __name__ == '__main__':
app.run(host='0.0.0.0') app.run()

12
app/passenger_wsgi.py Normal file
View file

@ -0,0 +1,12 @@
#!/usr/bin/env python
import sys
import os
INTERP = os.path.expanduser("~/env/bin/python")
if sys.executable != INTERP:
os.execl(INTERP, INTERP, *sys.argv)
sys.path.append(os.getcwd())
from james import app as application

View file

@ -1,4 +0,0 @@
from app import app
if __name__ == "__main__":
app.run()

View file

@ -1,23 +0,0 @@
# mysite_uwsgi.ini file
[uwsgi]
# Django-related settings
# the base directory (full path)
chdir = /home/james/production
# Callables
module = app
callable = app
# the virtualenv (full path)
virtualenv = /home/james/production/env
# process-related settings
# master
master = true
# maximum number of worker processes
processes = 1
# the socket (use the full path to be safe
socket = /tmp/james.sock
# ... with appropriate permissions - may be needed
chmod-socket = 664
# clear environment on exit
vacuum = true