Commit b356c8c4 authored by Floreal Cabanettes's avatar Floreal Cabanettes
Browse files

Fix install, and fix read of md for wsgi module

parent f27bc043
......@@ -15,6 +15,6 @@ setup(
zip_safe=False,
install_requires=reqs,
data_files=[('/etc/dgenies', ['application.properties']),
('/var/www', ['dgenies.wsgi'])],
('/var/www/dgenies', ['dgenies.wsgi'])],
scripts=['src/bin/dgenies'],
)
......@@ -94,7 +94,14 @@ Here is an example of configuration file for apache:
ServerName <url>
WSGIDaemonProcess dgenies user=<user> group=<group> threads=8
WSGIScriptAlias / /var/www/dgenies.wsgi
WSGIScriptAlias / /var/www/dgenies/dgenies.wsgi
<Directory /var/www/dgenies>
WSGIProcessGroup dgenies
WSGIApplicationGroup %{GLOBAL}
Order deny,allow
Allow from all
</Directory>
</VirtualHost>
With:
......
......@@ -205,7 +205,7 @@ def get_file(file, gzip=False): # pragma: no cover
@app.route("/install", methods=['GET'])
def install():
with open(os.path.join(app_folder, "INSTALL.md"), "r") as install_instr:
with open(os.path.join(app_folder, "INSTALL.md"), "r", encoding='utf-8') as install_instr:
content = install_instr.read()
md = Markdown(extensions=[TocExtension(baselevel=1)])
content = Markup(md.convert(content))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment