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

bodhi: remove the manual patch that is now included in 5.2

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2020-03-23 09:38:19 +01:00 • committed by Pierre-Yves Chibon
parent 3b92a8e3c7
commit 90e076b170
2 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
files/bodhi/errors.html
View file

@ -1,14 +0,0 @@
<%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>

3
roles/openshift-apps/bodhi/templates/buildconfig.yml
View file

@ -18,8 +18,7 @@ items:
RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo
# While dnf has a --nodocs, it doesen't have a --docs... # While dnf has a --nodocs, it doesen't have a --docs...
RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf
RUN dnf install -y bodhi-server-{{bodhi_version}} bodhi-docs-{{bodhi_version}} python3-pyramid_sawing && \ RUN dnf install -y bodhi-server-{{bodhi_version}} bodhi-docs-{{bodhi_version}} python3-pyramid_sawing
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
# Set up krb5 # Set up krb5
RUN rm -f /etc/krb5.conf && \ RUN rm -f /etc/krb5.conf && \
ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \ ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \