Skip to content

Commit

Permalink
2016.7 release prep
Browse files Browse the repository at this point in the history
  • Loading branch information
berggren committed Jul 21, 2016
1 parent 99e2bd2 commit ce2a1f1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

setup(
name=u'timesketch',
version=u'2015.12',
description=u'Collaborative forensic timeline analysis',
version=u'2016.7',
description=u'Digital forensic timeline analysis',
long_description=timesketch_description,
license=u'Apache License, Version 2.0',
url=u'http://www.timesketch.org/',
Expand Down
6 changes: 5 additions & 1 deletion timesketch.conf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ SECRET_KEY = u''
# For more options, see the official documentation:
# https://pythonhosted.org/Flask-SQLAlchemy/config.html
# By default sqlite is used.
SQLALCHEMY_DATABASE_URI = u'sqlite:////tmp/database.db'
#
# NOTE: SQLite should only be used in development. Use PostgreSQL or MySQL in
# production instead.
#SQLALCHEMY_DATABASE_URI = u'sqlite:////tmp/database.db'
SQLALCHEMY_DATABASE_URI = 'postgresql://<USERNAME>:<PASSWORD>/timesketch'

# Configure where your Elasticsearch server is located.
#
Expand Down

0 comments on commit ce2a1f1

Please sign in to comment.