Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
genotoul-bioinfo
D-GENIES
Commits
b356c8c4
Commit
b356c8c4
authored
Feb 08, 2018
by
Floreal Cabanettes
Browse files
Fix install, and fix read of md for wsgi module
parent
f27bc043
Changes
3
Hide whitespace changes
Inline
Side-by-side
setup.py
View file @
b356c8c4
...
...
@@ -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'
],
)
src/dgenies/INSTALL.md
View file @
b356c8c4
...
...
@@ -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:
...
...
src/dgenies/views.py
View file @
b356c8c4
...
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment