diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 294a9db791..60728e17ac 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -95,13 +95,6 @@ - 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('bodhi-backend') - tags: - - bodhi - - config - - name: Put pungi configurations in place template: src="{{item}}" dest=/etc/bodhi/{{item}} with_items: diff --git a/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2 b/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2 deleted file mode 100644 index a25e1d677e..0000000000 --- a/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2 +++ /dev/null @@ -1,159 +0,0 @@ -[global] - -## -## Bodhi Production Masher Configuration -## -## $Id: bodhi-prod.cfg.erb,v 1.8 2008/05/21 23:38:07 lmacken Exp $ -## - -# Release status -# pre-beta enforces the 'Pre Beta' policy defined here: -# https://fedoraproject.org/wiki/Updates_Policy -f22.status = 'pre_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 - -sqlobject.dburi="notrans_postgres://bodhi:{{ bodhiPassword }}@db-bodhi/bodhi" - -masher = None # we are the masher - -server.socket_port=8084 -server.environment="production" -autoreload.on = False -server.webpath="/updates" -server.log_file = "server.log" -server.log_to_screen = False -server.thread_pool = 50 -server.socket_queue_size = 30 - -# We probably want to have apache do this for us... -#gzipFilter.on = True - -session_filter.on = False -base_url_filter.on = True -base_url_filter.use_x_forwarded_host = False -base_url_filter.base_url = 'https://admin.fedoraproject.org' - -tg.strict_parameters = True -tg.ignore_parameters = ["_csrf_token"] - -# Periodic jobs -jobs = 'nagmail cache_release_data refresh_metrics approve_testing_updates expire_buildroot_overrides clean_pending_tags' - -# Query the Fedora Package Database for the list of Critical Path Packages. -critpath.type = 'pkgdb' - -# FAS2 -#sqlalchemy.dburi="sqlite:///" -fas.url = 'https://admin.fedoraproject.org/accounts/' -identity.provider='jsonfas2' -identity.saprovider.model.visit="fedora.accounts.tgfas.VisitIdentity" -visit.manager="jsonfas2" -visit.saprovider.model="fedora.accounts.tgfas.Visit" -visit.cookie.secure = True - -# Our identity that we use to fetch bugzilla details and such -bodhi_password='<%= bodhiBugzillaPassword %>' -bodhi_email = 'updates@fedoraproject.org' - -# TurboMail 3.0 settings -mail.on = True -mail.transport = 'smtp' -mail.smtp.server = 'bastion' -# The 'utf-8-qp' encoding causes problems with TurboMail 3.x -# https://fedorahosted.org/bodhi/ticket/648 -mail.message.encoding = 'utf-8' - -notice_sender = 'updates@fedoraproject.org' -security_team = 'security_respons-members@fedoraproject.org' -release_team_address = 'bodhiadmin-members@fedoraproject.org' -fedora_announce_list = 'package-announce@lists.fedoraproject.org' -fedora_test_announce_list = 'test@lists.fedoraproject.org' -fedora_epel_announce_list = 'epel-package-announce@lists.fedoraproject.org' -fedora_epel_test_announce_list = 'epel-devel@lists.fedoraproject.org' - -build_dir = '/mnt/koji/packages' -mashed_dir = '/mnt/koji/mash/updates/' -mashed_stage_dir = '/mnt/koji/mash/updates/' -mash_conf = '/etc/bodhi/mash.conf' - -comps_dir = '/var/tmp/bodhi/comps' - -base_address = 'https://admin.fedoraproject.org' -#bz_server = 'https://bzprx.vip.phx.redhat.com/xmlrpc.cgi' -bz_server = 'https://bugzilla.redhat.com/xmlrpc.cgi' -bz_cookie = '/var/tmp/bodhi-bz.cookie' -bz_products = 'Fedora,Fedora EPEL,oVirt' - -acl_system = 'pkgdb' -pkgdb_url = 'https://admin.fedoraproject.org/pkgdb' - -buildsystem = 'koji' -client_cert = '/etc/pki/bodhi/bodhi.pem' -clientca_cert = '/etc/pki/bodhi/fedora-upload-ca.cert' -serverca_cert = '/etc/pki/bodhi/fedora-server-ca.cert' - -masher_lock_id = 'FEDORA' - -master_repomd = 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%d/%s/repodata/repomd.xml' -fedora_master_repomd = 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%d/%s/repodata/repomd.xml' -fedora_epel_master_repomd = 'http://download01.phx2.fedoraproject.org/pub/epel/%d/%s/repodata/repomd.xml' - -arches = 'i386 x86_64' - -[logging] - -[[handlers]] - -[[[debug_out]]] -class='TimedRotatingFileHandler' -args="('/var/log/bodhi/server.log', 'D', 7)" -level='DEBUG' -formatter='full_content' - -[[[access_out]]] -class='TimedRotatingFileHandler' -level='INFO' -args="('/var/log/bodhi/access.log', 'D', 7)" -formatter='message_only' - -[[[error_out]]] -class='TimedRotatingFileHandler' -args="('/var/log/bodhi/server.log', 'D', 7)" -level='ERROR' -formatter='full_content' - - -[[loggers]] -[[[bodhi]]] -level='DEBUG' -qualname='bodhi' -handlers=['debug_out'] -propagate=0 - -[[[allinfo]]] -level='INFO' -handlers=['debug_out'] -propagate=0 - -#[[[access]]] -#level='INFO' -#qualname='turbogears.access' -#handlers=['debug_out'] - -[[[turbomail]]] -level='INFO' -qualname='turbomail' -handlers=['debug_out'] - -[[[urllib3]]] -level='WARN' -qualname='urllib3' -handlers=['debug_out'] diff --git a/roles/bodhi2/backend/templates/bodhi-masher.cfg.j2 b/roles/bodhi2/backend/templates/bodhi-masher.cfg.j2 deleted file mode 100644 index 5849dd62f8..0000000000 --- a/roles/bodhi2/backend/templates/bodhi-masher.cfg.j2 +++ /dev/null @@ -1,142 +0,0 @@ -[global] - -## -## Bodhi Production Masher Configuration -## -## $Id: bodhi-prod.cfg.erb,v 1.8 2008/05/21 23:38:07 lmacken Exp $ -## - -sqlobject.dburi="notrans_postgres://bodhi:{{ bodhiPassword }}@db-bodhi/bodhi" - -masher = None # we are the masher - -server.socket_port=8084 -server.environment="production" -autoreload.on = False -server.webpath="/updates" -server.log_file = "server.log" -server.log_to_screen = False -server.thread_pool = 50 -server.socket_queue_size = 30 - -# We probably want to have apache do this for us... -#gzipFilter.on = True - -session_filter.on = False -base_url_filter.on = True -base_url_filter.use_x_forwarded_host = False -base_url_filter.base_url = 'https://admin.fedoraproject.org' - -tg.strict_parameters = True -tg.ignore_parameters = ["_csrf_token"] - -# Periodic jobs -jobs = '' - -# Query the Fedora Package Database for the list of Critical Path Packages. -# This pkgdb feature is currently broken in staging. -<% if environment == "production" %> -critpath.type = 'pkgdb' -<% end %> - -# FAS2 -#sqlalchemy.dburi="sqlite:///" -fas.url = 'https://admin.fedoraproject.org/accounts/' -identity.provider='jsonfas2' -identity.saprovider.model.visit="fedora.accounts.tgfas.VisitIdentity" -visit.manager="jsonfas2" -visit.saprovider.model="fedora.accounts.tgfas.Visit" -visit.cookie.secure = True - -# Our identity that we use to fetch bugzilla details and such -bodhi_password='<%= bodhiBugzillaPassword %>' -bodhi_email = 'updates@fedoraproject.org' - -mail.on = True -mail.server = 'bastion' -notice_sender = 'updates@fedoraproject.org' -security_team = 'security_respons-members@fedoraproject.org' -release_team_address = 'bodhiadmin-members@fedoraproject.org' -fedora_announce_list = 'package-announce@lists.fedoraproject.org' -fedora_test_announce_list = 'test@lists.fedoraproject.org' -fedora_epel_announce_list = 'epel-package-announce@lists.fedoraproject.org' -fedora_epel_test_announce_list = 'epel-devel@lists.fedoraproject.org' - -build_dir = '/mnt/koji/packages' -mashed_dir = '/mnt/koji/mash/updates/' -mashed_stage_dir = '/mnt/koji/mash/updates/' -mash_conf = '/etc/bodhi/mash.conf' - -comps_dir = '/var/tmp/bodhi/comps' - -base_address = 'https://admin.fedoraproject.org' -#bz_server = 'https://bzprx.vip.phx.redhat.com/xmlrpc.cgi' -bz_server = 'https://bugzilla.redhat.com/xmlrpc.cgi' -bz_cookie = '/var/tmp/bodhi-bz.cookie' -bz_products = 'Fedora,Fedora EPEL,oVirt' - -acl_system = 'pkgdb' -pkgdb_url = 'https://admin.fedoraproject.org/pkgdb' - -buildsystem = 'koji' -client_cert = '/etc/pki/bodhi/bodhi.pem' -clientca_cert = '/etc/pki/bodhi/fedora-upload-ca.cert' -serverca_cert = '/etc/pki/bodhi/fedora-server-ca.cert' - -masher_lock_id = 'FEDORA' - -master_repomd = 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%d/%s/repodata/repomd.xml' -fedora_master_repomd = 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%d/%s/repodata/repomd.xml' -fedora_epel_master_repomd = 'http://download01.phx2.fedoraproject.org/pub/epel/%d/%s/repodata/repomd.xml' - -arches = 'armhfp i386 x86_64' - -[logging] - -[[handlers]] - -[[[debug_out]]] -class='TimedRotatingFileHandler' -args="('/var/log/bodhi/server.log', 'D', 7)" -level='DEBUG' -formatter='full_content' - -[[[access_out]]] -class='TimedRotatingFileHandler' -level='INFO' -args="('/var/log/bodhi/access.log', 'D', 7)" -formatter='message_only' - -[[[error_out]]] -class='TimedRotatingFileHandler' -args="('/var/log/bodhi/server.log', 'D', 7)" -level='ERROR' -formatter='full_content' - - -[[loggers]] -[[[bodhi]]] -level='DEBUG' -qualname='bodhi' -handlers=['debug_out'] -propagate=0 - -[[[allinfo]]] -level='INFO' -handlers=['debug_out'] -propagate=0 - -#[[[access]]] -#level='INFO' -#qualname='turbogears.access' -#handlers=['debug_out'] - -[[[turbomail]]] -level='INFO' -qualname='turbomail' -handlers=['debug_out'] - -[[[urllib3]]] -level='WARN' -qualname='urllib3' -handlers=['debug_out'] diff --git a/roles/bodhi2/backend/templates/bodhi-prod.cfg.erb b/roles/bodhi2/backend/templates/bodhi-prod.cfg.erb deleted file mode 100644 index c166c65c6d..0000000000 --- a/roles/bodhi2/backend/templates/bodhi-prod.cfg.erb +++ /dev/null @@ -1,205 +0,0 @@ -[global] - -## -## Bodhi Production Configuration -## -## $Id: bodhi-prod.cfg.erb,v 1.8 2008/05/21 23:38:07 lmacken Exp $ -## - -# Release status -# pre-beta enforces the 'Pre Beta' policy defined here: -# 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: -# -# The number of admin approvals it takes to be able to push a critical path -# # update to stable for a pending release. -# critpath.num_admin_approvals = 0 -# -# # The net karma required to submit a critial path update to a pending release) -# critpath.min_karma = 2 -# -# # Allow critpath to submit for stable after 2 weeks with no negative karma -# critpath.stable_after_days_without_negative_karma = 14 - - -## A notice to flash on the front page -#frontpage_notice = 'Bodhi is now enforcing the Package Update Acceptance Criteria across all Fedora releases.' - -## A notice to flash on the New Update page -#newupdate_notice = 'Koji is currently down for a scheduled outage. Please see status.fedoraproject.org for more information' - -# Query the Fedora Package Database for the list of Critical Path Packages. -<% if environment == "production" %> -critpath.type = 'pkgdb' -<% else %> -<% end %> - -<% if environment == "production" %> -deployment_type = "prod" -<% end %> -<% if environment == "staging" %> -deployment_type = "stg" -<% end %> -<% if environment == "development" %> -deployment_type = "dev" -<% end %> - -# We no longer require proventester karma for critpath approval -# https://fedorahosted.org/bodhi/ticket/653 -critpath.num_admin_approvals = 0 - -#f17.pre_beta.critpath.num_admin_approvals = 0 - -query_wiki_test_cases = True - -sqlobject.dburi="notrans_postgres://bodhi:<%= bodhiPassword %>@db-bodhi/bodhi" - -masher = 'http://releng04/updates' - -# For the build auto-complete widget -tg_mochikit.packed = True - -server.socket_port=8084 -server.environment="production" -autoreload.on = False -server.webpath="/updates" -server.log_file = "server.log" -server.log_to_screen = False -server.thread_pool = 50 -server.socket_queue_size = 30 - -# We probably want to have apache do this for us... -#gzipFilter.on = True - -session_filter.on = False -base_url_filter.on = True -base_url_filter.use_x_forwarded_host = False -<% if environment == "staging" %> -base_url_filter.base_url = 'https://admin.stg.fedoraproject.org' -<% else %> -base_url_filter.base_url = 'https://admin.fedoraproject.org' -<% end %> - -tg.strict_parameters = True -tg.ignore_parameters = ["_csrf_token"] - -# Periodic jobs -jobs = 'cache_release_data' - -# FAS2 -#sqlalchemy.dburi="sqlite:///" -fas.url = 'https://admin.fedoraproject.org/accounts/' -identity.provider='jsonfas2' -identity.saprovider.model.visit="fedora.accounts.tgfas.VisitIdentity" -visit.manager="jsonfas2" -visit.saprovider.model="fedora.accounts.tgfas.Visit" -visit.cookie.secure = True -visit.cookie.httponly = True - -# Our identity that we use to fetch bugzilla details and such -bodhi_password='<%= bodhiBugzillaPassword %>' -bodhi_email = 'updates@fedoraproject.org' -security_team = 'security_respons-members@fedoraproject.org' -release_team_address = 'bodhiadmin-members@fedoraproject.org' -fedora_announce_list = 'package-announce@lists.fedoraproject.org' -fedora_test_announce_list = 'test@lists.fedoraproject.org' -mashed_dir = '/mnt/koji/mash/updates' -# TurboMail 3.0 settings -<% if environment == "staging" %> -mail.on = False -<% else %> -mail.on = True -<% end %> -mail.transport = 'smtp' -mail.smtp.server = 'bastion' -# The 'utf-8-qp' encoding causes problems with TurboMail 3.x -# https://fedorahosted.org/bodhi/ticket/648 -mail.message.encoding = 'utf-8' -notice_sender = 'updates@fedoraproject.org' -#bz_server = 'https://bzprx.vip.phx.redhat.com/xmlrpc.cgi' -bz_server = 'https://bugzilla.redhat.com/xmlrpc.cgi' -bz_cookie = '/var/tmp/bodhi-bz.cookie' -bz_products = 'Fedora,Fedora EPEL,oVirt' - -build_dir = '/mnt/koji/packages' -<% if environment == "staging" %> -base_address = 'https://admin.stg.fedoraproject.org' -<% else %> -base_address = 'https://admin.fedoraproject.org' -<% end %> - -acl_system = 'pkgdb' -<% if environment == "staging" %> -pkgdb_url = 'http://localhost/pkgdb' -<% else %> -pkgdb_url = 'https://admin.fedoraproject.org/pkgdb' -<% end %> - -<% if environment == "staging" %> -buildsystem = 'dev' -<% else %> -buildsystem = 'koji' -<% end %> -client_cert = '/etc/pki/bodhi/bodhi.pem' -clientca_cert = '/etc/pki/bodhi/fedora-upload-ca.cert' -serverca_cert = '/etc/pki/bodhi/fedora-server-ca.cert' - -[logging] - -[[handlers]] - -[[[debug_out]]] -class='TimedRotatingFileHandler' -args="('/var/log/bodhi/server.log', 'D', 7)" -level='DEBUG' -formatter='full_content' - -[[[access_out]]] -class='TimedRotatingFileHandler' -level='INFO' -args="('/var/log/bodhi/access.log', 'D', 7)" -formatter='message_only' - -[[[error_out]]] -class='TimedRotatingFileHandler' -args="('/var/log/bodhi/server.log', 'D', 7)" -level='ERROR' -formatter='full_content' - -[[loggers]] -[[[bodhi]]] -level='DEBUG' -qualname='bodhi' -handlers=['debug_out'] -propagate=0 - -[[[allinfo]]] -level='INFO' -handlers=['debug_out'] -propagate=0 - -#[[[access]]] -#level='INFO' -#qualname='turbogears.access' -#handlers=['debug_out'] - -[[[turbomail]]] -level='INFO' -qualname='turbomail' -handlers=['debug_out'] - -[[[urllib3]]] -level='WARN' -qualname='urllib3' -handlers=['debug_out'] diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index 2ebbb7e75e..52c499aa0f 100644 --- a/roles/bodhi2/base/tasks/main.yml +++ b/roles/bodhi2/base/tasks/main.yml @@ -96,13 +96,6 @@ - config - bodhi -#- name: setup /var/log/bodhi directory -# file: path=/var/log/bodhi owner=bodhi group=bodhi mode=0755 state=directory -# when: inventory_hostname.startswith('bodhi0') -# tags: -# - config -# - bodhi - #- name: check the selinux context of the bugzilla cookie # command: matchpathcon /var/tmp/bodhi-bz.cookie # register: cookiecontext