Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
added package + further name changes
  • Loading branch information
proost committed Oct 27, 2017
1 parent 8dc7886 commit 066bddc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
File renamed without changes.
3 changes: 2 additions & 1 deletion docs/acknowledgements.md
@@ -1,4 +1,4 @@
# PlaNet 2.0 Acknowledgements # CoNekT Acknowledgements


* [Flask](http://flask.pocoo.org/) and various packages * [Flask](http://flask.pocoo.org/) and various packages
* [Python 3.4.3](https://www.python.org/) * [Python 3.4.3](https://www.python.org/)
Expand All @@ -16,6 +16,7 @@
* [table2CSV.js](http://www.kunalbabre.com/projects/table2CSV.php) * [table2CSV.js](http://www.kunalbabre.com/projects/table2CSV.php)
* [D3.js](https://d3js.org/) * [D3.js](https://d3js.org/)
* [d3.phylogram.js](https://gist.github.com/kueda/1036776) * [d3.phylogram.js](https://gist.github.com/kueda/1036776)
* [PhyD3.js](https://phyd3.bits.vib.be/)
* [typeahead.js](https://twitter.github.io/typeahead.js/) * [typeahead.js](https://twitter.github.io/typeahead.js/)
* [jscolors](http://jscolor.com/) * [jscolors](http://jscolor.com/)
* [jQuery File Uploader](https://github.com/danielm/uploader) * [jQuery File Uploader](https://github.com/danielm/uploader)
Expand Down
12 changes: 6 additions & 6 deletions docs/apache_wsgi.md
Expand Up @@ -4,25 +4,25 @@ Install apache and mod_wsgi for python 3


sudo apt-get install apache2 libapache2-mod-wsgi-py3 sudo apt-get install apache2 libapache2-mod-wsgi-py3


Copy `planet.template.wsgi` to planet.wsgi and add the correct paths. Copy `conekt.template.wsgi` to conekt.wsgi and add the correct paths.


WSGI_PATH = 'location of your app' WSGI_PATH = 'location of your app'
WSGI_ENV = 'location of activate_this.py, in the bin folder of the virtual environment' WSGI_ENV = 'location of activate_this.py, in the bin folder of the virtual environment'


Configure apache, example below can be added to the default VirtualHost. A valid user (non-admin) is required for this: Configure apache, example below can be added to the default VirtualHost. A valid user (non-admin), usually www-data, is required for this:


# This part is optional, but will improve speed # This part is optional, but will improve speed
Alias /planet/static /path/to/planet/planet/static Alias /planet/static /path/to/conekt/conekt/static


<Directory /path/to/planet/planet/static> <Directory /path/to/conekt/conekt/static>
Require all granted Require all granted
</Directory> </Directory>


# Set up WSGI # Set up WSGI
WSGIDaemonProcess application user=user group=user threads=5 WSGIDaemonProcess application user=user group=user threads=5
WSGIScriptAlias /planet /path/to/planet.wsgi WSGIScriptAlias /planet /path/to/conekt.wsgi


<Location /planet> <Location /conekt>
WSGIProcessGroup application WSGIProcessGroup application
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
Require all granted Require all granted
Expand Down

0 comments on commit 066bddc

Please sign in to comment.