commit dcaf61e17fcb99b44e508f3ecf332121f5460ec0 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Mon Oct 10 13:06:25 2016 +0200 Update bodhi role roles/bodhi2/backend/files/create-filelist | 36 +++++++++++ roles/bodhi2/backend/files/fedora-epel-push | 6 +- roles/bodhi2/backend/tasks/main.yml | 60 ++++++++++-------- roles/bodhi2/backend/templates/atomic-config.py.j2 | 64 ++++++++++++++++++-- .../templates/bodhi-masher-jobrunner.cfg.j2 | 13 ++-- roles/bodhi2/backend/templates/bodhi-masher.cfg.j2 | 12 ++-- roles/bodhi2/backend/templates/bodhi-prod.cfg.erb | 12 ++++- .../bodhi2/base/files/bowlofeggs-bodhi-epel-7.repo | 8 +++ roles/bodhi2/base/tasks/main.yml | 52 ++++++---------- roles/bodhi2/base/templates/bodhi-app.conf | 2 +- roles/bodhi2/base/templates/production.ini.j2 | 32 +++++----- roles/bodhi2/base/templates/staging.ini.j2 | 12 ++-- 12 files changed, 208 insertions(+), 101 deletions(-) --- diff --git a/roles/bodhi2/backend/files/create-filelist b/roles/bodhi2/backend/files/create-filelist new file mode 100644 index 0000000..d95000e --- /dev/null +++ b/roles/bodhi2/backend/files/create-filelist @@ -0,0 +1,36 @@ +#!/usr/bin/python + +# A simple script to generate a file list in a format easily consumable by a +# shell script. + +# Originally written by Jason Tibbitts <tibbs(a)math.uh.edu&gt; in 2016. +# Donated to the public domain. If you require a statement of license, please +# consider this work to be licensed as "CC0 Universal", any version you choose. + + +from scandir import scandir + + +def get_ftype(entry): + """Return a simple indicator of the file type.""" + if entry.is_symlink(): + return 'l' + if entry.is_dir(): + return 'd' + return 'f' + + +def recursedir(path): + """Just like scandir, but recursively.""" + for entry in scandir(path): + if entry.is_dir(follow_symlinks=False): + for rentry in recursedir(entry.path): + yield rentry + yield entry + + +for entry in recursedir('.'): + info = entry.stat(follow_symlinks=False) + modtime = max(info.st_mtime, info.st_ctime) + ftype = get_ftype(entry) + print('{} {} {}'.format(modtime, ftype, entry.path[2:])) diff --git a/roles/bodhi2/backend/files/fedora-epel-push b/roles/bodhi2/backend/files/fedora-epel-push old mode 100755 new mode 100644 index 6eac7d7..ba3cc46 --- a/roles/bodhi2/backend/files/fedora-epel-push +++ b/roles/bodhi2/backend/files/fedora-epel-push @@ -1,7 +1,7 @@ #!/bin/sh SOURCE=/mnt/koji/mash/updates -DEST=/pub/epel/ +DEST=/pub/epel OPTIONS="-rlptDvHh --stats --delay-updates $RSYNC_OPTS" @@ -97,8 +97,8 @@ for rel in 5 6 7; do # Does our symbolic link exist? if [ -L ${TARGET} ]; then # check to see if the link matches the candidate - TEST=$( readlink ${TARGET} ) - if [ ${TEST} != ${CANDIDATE} ]; then + TEST=$( readlink -e ${TARGET} ) + if [ "${TEST}" != "${CANDIDATE}" ]; then ln -sf $(echo ${CANDIDATE}|sed -e "s|$DEST|./|g" -e 's|//|/|g') ${TARGET} fi else diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index a142b5e..56893ae 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -13,7 +13,7 @@ - bodhi - name: install needed packages - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - mock - mash @@ -23,6 +23,7 @@ - python-mock - sigul - python-alembic + - python-scandir tags: - packages - bodhi @@ -59,31 +60,21 @@ copy: > src="{{ private }}/files/bodhi_key_and_cert.pem" dest="/etc/pki/bodhi/bodhi.pem" - owner=bodhi - group=bodhi - mode=0400 - when: inventory_hostname.startswith('bodhi01') - tags: - - config - - bodhi - -- name: change owner and group attributes of bodhi.pem file - file: > - path="/etc/pki/bodhi/bodhi.pem" owner=apache group=apache - when: inventory_hostname.startswith('bodhi01') + mode=0400 + when: inventory_hostname.startswith('bodhi-backend') tags: - - bodhi - config + - bodhi - name: change owner and group attributes of /var/log/bodhi directory file: path=/var/log/bodhi owner=apache group=apache - when: inventory_hostname.startswith('bodhi01') + when: inventory_hostname.startswith('bodhi-backend') tags: - bodhi - config - + - name: setup /etc/bodhi/mash.conf file... template: > src=mash.conf @@ -117,7 +108,7 @@ # tasks for setting up epelmasher - name: install needed packages - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - repoview tags: @@ -272,18 +263,36 @@ cron: name="bodhi-expire-overrides" hour="*" minute=0 user="apache" job="/usr/bin/bodhi-expire-overrides /etc/bodhi/production.ini 2> /dev/null" cron_file=bodhi-expire-overrides-job - when: inventory_hostname.startswith('bodhi01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend02') and env == "production" tags: - config - bodhi - cron -- name: have the apache own the bodhi config - file: > - path="/etc/bodhi/production.ini" +- name: setup basic /etc/bodhi/ contents (staging) + template: > + src="{{roles}}/bodhi2/base/templates/staging.ini.j2" + dest="/etc/bodhi/production.ini" owner=apache group=apache - when: inventory_hostname.startswith('bodhi') + mode=0600 + when: inventory_hostname.startswith('bodhi-backend') and env == 'staging' + notify: + - reload bodhi httpd + tags: + - config + - bodhi + +- name: setup basic /etc/bodhi/ contents (production) + template: > + src="{{roles}}/bodhi2/base/templates/production.ini.j2" + dest="/etc/bodhi/production.ini" + owner=apache + group=apache + mode=0600 + when: inventory_hostname.startswith('bodhi-backend') and env == 'production' + notify: + - reload bodhi httpd tags: - config - bodhi @@ -319,7 +328,7 @@ path="/var/cache/mash" owner=apache group=apache - when: inventory_hostname.startswith('bodhi01') + when: inventory_hostname.startswith('bodhi-backend') tags: - config - bodhi @@ -329,7 +338,7 @@ path="/var/cache/bodhi" owner=apache group=apache - when: inventory_hostname.startswith('bodhi01') + when: inventory_hostname.startswith('bodhi-backend') tags: - config - bodhi @@ -340,7 +349,7 @@ owner=apache group=apache state=directory - when: inventory_hostname.startswith('bodhi01') + when: inventory_hostname.startswith('bodhi-backend') tags: - config - bodhi @@ -352,7 +361,6 @@ owner=apache group=nrpe state=directory - recurse=yes ignore_errors: true notify: - restart fedmsg-hub diff --git a/roles/bodhi2/backend/templates/atomic-config.py.j2 b/roles/bodhi2/backend/templates/atomic-config.py.j2 index 12f2ff8..e49c6e6 100644 --- a/roles/bodhi2/backend/templates/atomic-config.py.j2 +++ b/roles/bodhi2/backend/templates/atomic-config.py.j2 @@ -6,6 +6,61 @@ rhel6 = dist[0] == 'redhat' and int(float(dist[1])) == 6 config = dict( releases={ + 'f24-updates': { + 'name': 'f24-updates', + 'repo': 'updates', + 'version': '24', + 'arch': 'x86_64', + + # OSTree treefile configuration + # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md + 'tree': 'docker-host', + 'treefile': { + 'include': 'fedora-atomic-docker-host.json', + 'ref': 'fedora-atomic/24/x86_64/docker-host', + 'repos': ['fedora-24', 'fedora-24-updates'], + 'packages': [], + }, + + # The name of the mock container to build and maintain + 'mock': 'fedora-24-updates-x86_64', + + # The git branch to use in the `git_repo` for the parent + # treefile & repo configurations + 'git_branch': 'f24', + + # Add or overwrite yum repository name:urls. This lets you + # compose trees against your own repositories. + 'repos': {}, + }, + 'f24-updates-testing': { + 'name': 'f24-updates-testing', + 'repo': 'updates-testing', + 'version': '24', + 'arch': 'x86_64', + + # OSTree treefile configuration + # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md + 'tree': 'docker-host', + 'treefile': { + 'include': 'fedora-atomic-docker-host.json', + 'ref': 'fedora-atomic/24/x86_64/testing/docker-host', + 'repos': ['fedora-24', 'fedora-24-updates', 'updates-testing'], + 'packages': [], + }, + + # The name of the mock container to build and maintain + 'mock': 'fedora-24-updates-testing-x86_64', + + # The git branch to use in the `git_repo` for the parent + # treefile & repo configurations + 'git_branch': 'f24', + + # Add or overwrite yum repository name:urls. This lets you + # compose trees against your own repositories. + 'repos': {}, + }, + 'f23-updates': { 'name': 'f23-updates', 'repo': 'updates', @@ -100,7 +155,7 @@ config = dict( 'treefile': { 'include': 'fedora-atomic-docker-host.json', 'ref': 'fedora-atomic/f22/x86_64/testing/docker-host', - 'repos': ['fedora-22', 'updates', 'updates-testing', 'f22-temprepo'], + 'repos': ['fedora-22', 'updates', 'updates-testing'], 'packages': [], }, @@ -167,7 +222,6 @@ config = dict( 'fedora-{version}-updates': 'file:///pub/fedora/linux/updates/{version}/{arch}/', 'updates': 'file:///pub/fedora/linux/updates/{version}/{arch}/', 'updates-testing': 'file:///pub/fedora/linux/updates/testing/{version}/{arch}/', - 'f22-temprepo': 'file:///mnt/koji/mash/updates/f22-temprepo/', {% else %} 'fedora-{version}': 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/{version}/Everything/{arch}/os', 'updates': 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/{version}/{arch}/', @@ -193,15 +247,15 @@ config = dict( {% endif %} # The git repo containing our parent treefiles and yum repos - git_repo='https://git.fedorahosted.org/git/fedora-atomic.git';, + git_repo='https://pagure.io/fedora-atomic.git', git_cache='{work_dir}/fedora-atomic.git', # Some branches contain custom .repo files that we don't want to use delete_repo_files=True, # Mock command - #mock_cmd='/usr/bin/mock%s-r {mock}' % (rhel6 and ' ' or ' --new-chroot '), - mock_cmd='/usr/bin/mock -r {mock}', + mock_cmd='/usr/bin/mock%s-r {mock}' % (rhel6 and ' ' or ' --new-chroot '), + #mock_cmd='/usr/bin/mock -r {mock}', mock_clean=True, # OSTree commands diff --git a/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2 b/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2 index 972f506..4e1fa33 100644 --- a/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2 +++ b/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2 @@ -66,7 +66,7 @@ bodhi_email = &#39;updates(a)rpmfusion.org&#39; # TurboMail 3.0 settings mail.on = True mail.transport = 'smtp' -mail.smtp.server = 'bastion' +mail.smtp.server = 'localhost' # The 'utf-8-qp' encoding causes problems with TurboMail 3.x # https://fedorahosted.org/bodhi/ticket/648 mail.message.encoding = 'utf-8' @@ -87,10 +87,9 @@ mash_conf = '/etc/bodhi/mash.conf' comps_dir = '/var/tmp/bodhi/comps' base_address = 'https://admin.rpmfusion.org' -#bz_server = 'https://bzprx.vip.phx.redhat.com/xmlrpc.cgi' bz_server = 'https://bugzilla.rpmfusion.org/xmlrpc.cgi' bz_cookie = '/var/tmp/bodhi-bz.cookie' -bz_products = 'Fedora,Fedora EPEL,oVirt' +bz_products = 'Fedora,Fedora EPEL' acl_system = 'pkgdb' pkgdb_url = 'https://admin.rpmfusion.org/pkgdb' @@ -102,9 +101,11 @@ serverca_cert = '/etc/pki/bodhi/fedora-server-ca.cert' masher_lock_id = 'FEDORA' -master_repomd = 'http://download01.phx2.rpmfusion.org/pub/fedora/linux/updates/%d/%s/repodata/repomd.xml' -fedora_master_repomd = 'http://download01.phx2.rpmfusion.org/pub/fedora/linux/updates/%d/%s/repodata/repomd.xml' -fedora_epel_master_repomd = 'http://download01.phx2.rpmfusion.org/pub/epel/%d/%s/repodata/repomd.xml' +master_repomd = 'http://download1.rpmfusion.org/free/fedora/updates/%d/%s/repodata/repomd.xml' +fedora_free_master_repomd = 'http://download1.rpmfusion.org/free/fedora/linux/updates/%d/%s/repodata/repomd.xml' +fedora_nonfree_master_repomd = 'http://download1.rpmfusion.org/nonfree/fedora/linux/updates/%d/%s/repodata/repomd.xml' +fedora_free_epel_master_repomd = 'http://download1.rpmfusion.org/free/epel/%d/%s/repodata/repomd.xml' +fedora_nonfree_epel_master_repomd = 'http://download1.rpmfusion.org/nonfree/epel/%d/%s/repodata/repomd.xml' arches = 'i386 x86_64' diff --git a/roles/bodhi2/backend/templates/bodhi-masher.cfg.j2 b/roles/bodhi2/backend/templates/bodhi-masher.cfg.j2 index 513259f..7b18ac2 100644 --- a/roles/bodhi2/backend/templates/bodhi-masher.cfg.j2 +++ b/roles/bodhi2/backend/templates/bodhi-masher.cfg.j2 @@ -53,7 +53,7 @@ bodhi_password='<%= bodhiBugzillaPassword %>' bodhi_email = &#39;updates(a)rpmfusion.org&#39; mail.on = True -mail.server = 'bastion' +mail.server = 'localhost' notice_sender = &#39;updates(a)rpmfusion.org&#39; security_team = &#39;security_respons-members(a)rpmfusion.org&#39; release_team_address = &#39;bodhiadmin-members(a)rpmfusion.org&#39; @@ -72,7 +72,7 @@ comps_dir = '/var/tmp/bodhi/comps' base_address = 'https://admin.rpmfusion.org' bz_server = 'https://bugzilla.rpmfusion.org/xmlrpc.cgi' bz_cookie = '/var/tmp/bodhi-bz.cookie' -bz_products = 'Fedora,Fedora EPEL,oVirt' +bz_products = 'Fedora,Fedora EPEL' acl_system = 'pkgdb' pkgdb_url = 'https://admin.rpmfusion.org/pkgdb' @@ -84,9 +84,11 @@ serverca_cert = '/etc/pki/bodhi/fedora-server-ca.cert' masher_lock_id = 'FEDORA' -master_repomd = 'http://download01.phx2.rpmfusion.org/pub/fedora/linux/updates/%d/%s/repodata/repomd.xml' -fedora_master_repomd = 'http://download01.phx2.rpmfusion.org/pub/fedora/linux/updates/%d/%s/repodata/repomd.xml' -fedora_epel_master_repomd = 'http://download01.phx2.rpmfusion.org/pub/epel/%d/%s/repodata/repomd.xml' +master_repomd = 'http://download1.rpmfusion.org/free/fedora/updates/%d/%s/repodata/repomd.xml' +fedora_free_master_repomd = 'http://download1.rpmfusion.org/free/fedora/linux/updates/%d/%s/repodata/repomd.xml' +fedora_nonfree_master_repomd = 'http://download1.rpmfusion.org/nonfree/fedora/linux/updates/%d/%s/repodata/repomd.xml' +fedora_free_epel_master_repomd = 'http://download1.rpmfusion.org/free/epel/%d/%s/repodata/repomd.xml' +fedora_nonfree_epel_master_repomd = 'http://download1.rpmfusion.org/nonfree/epel/%d/%s/repodata/repomd.xml' arches = 'armhfp i386 x86_64' diff --git a/roles/bodhi2/backend/templates/bodhi-prod.cfg.erb b/roles/bodhi2/backend/templates/bodhi-prod.cfg.erb index de3a041..fa73eed 100644 --- a/roles/bodhi2/backend/templates/bodhi-prod.cfg.erb +++ b/roles/bodhi2/backend/templates/bodhi-prod.cfg.erb @@ -8,7 +8,17 @@ # Release status # pre-beta enforces the 'Pre Beta' policy defined here: -# https://rpmfusion.org/wiki/Updates_Policy +# https://fedoraproject.org/wiki/Updates_Policy +f22.status = 'post_beta' + +f22.post_beta.mandatory_days_in_testing = 7 +f22.post_beta.critpath.num_admin_approvals = 0 +f22.post_beta.critpath.min_karma = 2 +f22.post_beta.critpath.stable_after_days_without_negative_karma = 14 + +f22.pre_beta.mandatory_days_in_testing = 3 +f22.pre_beta.critpath.num_admin_approvals = 0 +f22.pre_beta.critpath.min_karma = 1 # Bodhi Defaults: # diff --git a/roles/bodhi2/base/files/bowlofeggs-bodhi-epel-7.repo b/roles/bodhi2/base/files/bowlofeggs-bodhi-epel-7.repo new file mode 100644 index 0000000..29042ce --- /dev/null +++ b/roles/bodhi2/base/files/bowlofeggs-bodhi-epel-7.repo @@ -0,0 +1,8 @@ +[bowlofeggs-bodhi-pre-release] +name=Copr repo for bodhi owned by bowlofeggs +baseurl=https://copr-be.cloud.fedoraproject.org/results/bowlofeggs/bodhi-pre-release/epel-7-$basearch/ +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://copr-be.cloud.fedoraproject.org/results/bowlofeggs/bodhi-pre-release/pubkey.gpg +enabled=1 +enabled_metadata=1 diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index c99fb52..06c8303 100644 --- a/roles/bodhi2/base/tasks/main.yml +++ b/roles/bodhi2/base/tasks/main.yml @@ -2,20 +2,8 @@ # tasklist for setting up bodhi # This is the base set of files needed for bodhi -- name: setup the bodhi2 copr repo - copy: > - src="lmacken-bodhi2-epel-7.repo" - dest="/etc/yum.repos.d/lmacken-bodhi2-epel-7.repo" - owner=root - group=root - mode=0644 - tags: - - config - - bodhi - - - name: install needed packages - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - bodhi-server - libsemanage-python @@ -30,30 +18,30 @@ - config - bodhi -- name: setup basic /etc/bodhi/ contents - template: > - src="staging.ini.j2" - dest="/etc/bodhi/production.ini" - owner=bodhi - group=bodhi +- name: setup basic /etc/bodhi/ contents (staging) + template: > + src="staging.ini.j2" + dest="/etc/bodhi/production.ini" + owner=bodhi + group=bodhi mode=0600 - when: inventory_hostname.startswith('bodhi') and env == 'staging' + when: inventory_hostname.startswith('bodhi0') and env == 'staging' notify: - reload bodhi httpd tags: - config - bodhi -- name: setup basic /etc/bodhi/ contents - template: > - src="production.ini.j2" - dest="/etc/bodhi/production.ini" - owner=bodhi - group=bodhi +- name: setup basic /etc/bodhi/ contents (production) + template: > + src="production.ini.j2" + dest="/etc/bodhi/production.ini" + owner=bodhi + group=bodhi mode=0600 - when: inventory_hostname.startswith('bodhi') and env == 'production' + when: inventory_hostname.startswith('bodhi0') and env == 'production' notify: - - reload httpd + - reload bodhi httpd tags: - config - bodhi @@ -79,14 +67,14 @@ - name: setup basic /etc/httpd/conf.d/ bodhi contents template: > - src="bodhi-app.conf" + src="bodhi-app.conf" dest="/etc/httpd/conf.d/bodhi.conf" owner=root group=root mode=0644 when: inventory_hostname.startswith('bodhi0') notify: - - reload httpd + - reload bodhi httpd tags: - config - bodhi @@ -154,14 +142,14 @@ # - bodhi # - selinux -- name: enable httpd_tmp_exec SELinux boolean +- name: enable httpd_tmp_exec SELinux boolean seboolean: name=httpd_tmp_exec state=yes persistent=yes tags: - config - bodhi - selinux -- name: enable httpd_can_network_connect_db SELinux boolean +- name: enable httpd_can_network_connect_db SELinux boolean seboolean: name=httpd_can_network_connect_db state=yes persistent=yes tags: - config diff --git a/roles/bodhi2/base/templates/bodhi-app.conf b/roles/bodhi2/base/templates/bodhi-app.conf index 1d71286..00a1216 100644 --- a/roles/bodhi2/base/templates/bodhi-app.conf +++ b/roles/bodhi2/base/templates/bodhi-app.conf @@ -1,4 +1,4 @@ -Alias /static /usr/lib/python2.7/site-packages/bodhi/static/ +Alias /static /usr/lib/python2.7/site-packages/bodhi/server/static/ <FilesMatch ".(eot|ttf|otf|woff)"> # modern browsers require that fonts have this diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 0a5b8d3..b9f03e3 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -4,22 +4,22 @@ prefix = / scheme = https [app:main] -use = egg:bodhi +use = egg:bodhi-server filter-with = proxy-prefix # Release status # pre-beta enforces the 'Pre Beta' policy defined here: # https://fedoraproject.org/wiki/Updates_Policy -f24.status = pre_beta +f25.status = pre_beta -f24.post_beta.mandatory_days_in_testing = 7 -f24.post_beta.critpath.num_admin_approvals = 0 -f24.post_beta.critpath.min_karma = 2 -f24.post_beta.critpath.stable_after_days_without_negative_karma = 14 +f25.post_beta.mandatory_days_in_testing = 7 +f25.post_beta.critpath.num_admin_approvals = 0 +f25.post_beta.critpath.min_karma = 2 +f25.post_beta.critpath.stable_after_days_without_negative_karma = 14 -f24.pre_beta.mandatory_days_in_testing = 3 -f24.pre_beta.critpath.num_admin_approvals = 0 -f24.pre_beta.critpath.min_karma = 1 +f25.pre_beta.mandatory_days_in_testing = 3 +f25.pre_beta.critpath.num_admin_approvals = 0 +f25.pre_beta.critpath.min_karma = 1 ## ## Atomic OSTree support @@ -123,8 +123,8 @@ createrepo_cache_dir = /var/cache/createrepo jobs = cache_release_data refresh_metrics approve_testing_updates ## Comps configuration -comps_dir = /var/cache/bodhi/comps -comps_url = https://git.rpmfusion.org/comps.git +comps_free_dir = /var/cache/bodhi/comps +comps_free_url = https://git.rpmfusion.org/comps.git ## ## Mirror settings @@ -390,10 +390,10 @@ updateinfo_rights = Copyright (C) 2015 Red Hat, Inc. and others. ## # pyramid.openid -openid.success_callback = bodhi.security:remember_me +openid.success_callback = bodhi.server.security:remember_me openid.provider = https://id.rpmfusion.org/openid/ openid.url = https://id.rpmfusion.org/ -openid_template = {username}.id.rpmfusion.org +openid_template = id.rpmfusion.org/openid/id/{username} openid.sreg_required = email # CORS allowed origins for cornice services @@ -426,7 +426,7 @@ sqlalchemy.url = postgresql://bodhi2:{{ bodhi2Password }}@db02/bodhi2 ## ## Templates ## -mako.directories = bodhi:templates +mako.directories = bodhi:server/templates ## ## Authentication & Sessions @@ -455,8 +455,8 @@ host = 0.0.0.0 port = 6543 [pshell] -m = bodhi.models -#db = bodhi.models.DBSession +m = bodhi.server.models +#db = bodhi.server.models.DBSession t = transaction # Begin logging configuration diff --git a/roles/bodhi2/base/templates/staging.ini.j2 b/roles/bodhi2/base/templates/staging.ini.j2 index 39c4c8f..10c2004 100644 --- a/roles/bodhi2/base/templates/staging.ini.j2 +++ b/roles/bodhi2/base/templates/staging.ini.j2 @@ -4,7 +4,7 @@ prefix = / scheme = https [app:main] -use = egg:bodhi +use = egg:bodhi-server filter-with = proxy-prefix ## @@ -101,7 +101,7 @@ jobs = cache_release_data refresh_metrics approve_testing_updates ## Comps configuration comps_dir = /var/cache/bodhi/comps -comps_url = https://git.fedorahosted.org/comps.git +comps_url = https://pagure.io/fedora-comps.git ## ## Mirror settings @@ -366,7 +366,7 @@ updateinfo_rights = Copyright (C) 2015 Red Hat, Inc. and others. ## # pyramid.openid -openid.success_callback = bodhi.security:remember_me +openid.success_callback = bodhi.server.security:remember_me openid.provider = https://id.stg.fedoraproject.org/openid/ openid.url = https://id.stg.fedoraproject.org/ openid_template = {username}.id.fedoraproject.org @@ -402,7 +402,7 @@ sqlalchemy.url = postgresql://bodhi2:{{ bodhi2PasswordSTG }}@db-bodhi/bodhi2 ## ## Templates ## -mako.directories = bodhi:templates +mako.directories = bodhi:server/templates ## ## Authentication & Sessions @@ -432,8 +432,8 @@ port = 6543 [pshell] -m = bodhi.models -db = bodhi.models.DBSession +m = bodhi.server.models +db = bodhi.server.models.DBSession t = transaction # Begin logging configuration