FASJSON: fix HTTPS links
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
parent
ba812732c2
commit
a2dded035a
4 changed files with 8 additions and 4 deletions
|
@ -33,8 +33,6 @@ RUN git clone https://github.com/fedora-infra/fasjson.git && \
|
|||
pushd fasjson && \
|
||||
git checkout {{ (env == 'production')|ternary('stable', 'staging') }} && \
|
||||
pip-3 install . && \
|
||||
mkdir -p /usr/share/fasjson && \
|
||||
cp ansible/roles/fasjson/files/fasjson.wsgi /usr/share/fasjson && \
|
||||
popd && \
|
||||
rm -rf fasjson
|
||||
RUN rm -f /etc/krb5.conf && ln -sf /etc/krb5/krb5.conf /etc/krb5.conf && \
|
||||
|
|
|
@ -17,6 +17,8 @@ items:
|
|||
{{ load_file('httpd.conf') | indent(6) }}
|
||||
fasjson.conf: |-
|
||||
{{ load_file('fasjson.conf') | indent(6) }}
|
||||
wsgi.py: |-
|
||||
{{ load_file('wsgi.py') | indent(6) }}
|
||||
- apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
|
|
|
@ -50,9 +50,9 @@ WSGISocketPrefix run/wsgi
|
|||
WSGIDaemonProcess fasjson processes=4 threads=1 maximum-requests=500 \
|
||||
display-name=%{GROUP} socket-timeout=2147483647 \
|
||||
lang=C.UTF-8 locale=C.UTF-8 home=/httpdir
|
||||
WSGIImportScript /usr/share/fasjson/fasjson.wsgi \
|
||||
WSGIImportScript /etc/fasjson/wsgi.py \
|
||||
process-group=fasjson application-group=fasjson
|
||||
WSGIScriptAlias / /usr/share/fasjson/fasjson.wsgi
|
||||
WSGIScriptAlias / /etc/fasjson/wsgi.py
|
||||
WSGIScriptReloading Off
|
||||
WSGIRestrictStdout Off
|
||||
WSGIRestrictSignal Off
|
||||
|
|
4
roles/openshift-apps/fasjson/templates/wsgi.py
Normal file
4
roles/openshift-apps/fasjson/templates/wsgi.py
Normal file
|
@ -0,0 +1,4 @@
|
|||
from werkzeug.middleware.proxy_fix import ProxyFix
|
||||
from fasjson.web.app import create_app
|
||||
application = create_app()
|
||||
application.wsgi_app = ProxyFix(application.wsgi_app, x_proto=1, x_host=1)
|
Loading…
Add table
Add a link
Reference in a new issue