From 4d6d34cdbf8fb897476bcf4441cd2140d523b595 Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Sat, 5 May 2018 00:10:55 +0000 Subject: [PATCH] Update staging to Bodhi 3.7.0b1. Additionally, pin the container to use Fedora 27 since Bodhi 3.7 is in the f27-infra repo. Signed-off-by: Randy Barlow --- playbooks/openshift-apps/bodhi.yml | 2 +- roles/bodhi2/base/templates/production.ini.j2 | 12 ++++++++++++ roles/openshift-apps/bodhi/templates/buildconfig.yml | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index 4ba6eaf9fc..e92558c436 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -51,7 +51,7 @@ app: bodhi template: buildconfig.yml objectname: buildconfig.yml - bodhi_version: 3.7.0-0.0.beta.fc27 + bodhi_version: 3.7.0-0.1.beta.fc27 when: env == "staging" - role: openshift/object app: bodhi diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index b51eed08e0..3ed3a074fb 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -46,6 +46,18 @@ filter-with = proxy-prefix # fedmsg_enabled = False fedmsg_enabled = True +## +### Legal +### +# +## If you set this, Bodhi will display a link in the footer called "Legal" that points to the +## supplied link. +legal_link = https://fedoraproject.org/wiki/Legal:Main +## If you set this, Bodhi will display a link in the footer called "Privacy policy" that points to +## the supplied link. It will also link the privacy policy under the comment box. +privacy_link = https://fedoraproject.org/wiki/Legal:PrivacyPolicy + + # Captcha - if 'captcha.secret' is set, then it will be used for comments. Comment it to turn it # off. captcha.secret must be 32 url-safe base64-encoded bytes. # You can generate one with >>> cryptography.fernet.Fernet.generate_key() diff --git a/roles/openshift-apps/bodhi/templates/buildconfig.yml b/roles/openshift-apps/bodhi/templates/buildconfig.yml index 882580effe..256cd403fb 100644 --- a/roles/openshift-apps/bodhi/templates/buildconfig.yml +++ b/roles/openshift-apps/bodhi/templates/buildconfig.yml @@ -10,7 +10,7 @@ items: runPolicy: Serial source: dockerfile: |- - FROM fedora:latest + FROM fedora:27 LABEL \ name="bodhi-web" \ vendor="Fedora Infrastructure" \