Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

bodhi: patch error templates while waiting for a release

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2020-03-02 17:08:52 +01:00 • committed by Pierre-Yves Chibon
parent 18c7325cca
commit db3c0785cb
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
files/bodhi/errors.html Normal file
View file

@ -0,0 +1,14 @@
<%inherit file="master.html"/>
<div class="container">
<div class="row">
<div class="offset-3 col-md-6">
<div class="panel error-page-panel">
<h1>${status} <small>${summary}</small></h1>
% for error in errors:
<p class="lead">${error['description'] | h}</p>
% endfor
</div>
</div>
</div>
</div>

5
roles/openshift-apps/bodhi/templates/dockerfile-base
View file

@ -51,10 +51,11 @@ RUN git clone -b staging https://github.com/fedora-infra/bodhi.git /srv/bodhi &&
cd /srv/bodhi && \
python3 -m pip install . --no-use-pep517 && \
mkdir -p /usr/share/bodhi && \
cp /srv/bodhi/apache/bodhi.wsgi /usr/share/bodhi/bodhi.wsgi
cp /srv/bodhi/apache/bodhi.wsgi /usr/share/bodhi/bodhi.wsgi &&\
curl -o /usr/lib/python3.7/site-packages/bodhi/server/templates/errors.html https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/bodhi/errors.html
RUN rm -f /etc/krb5.conf && \
ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \
ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi.fedoraproject.org.keytab
ENV USER=openshift
ENV USER=openshift