diff --git a/roles/bodhi2/backend/files/bodhi-masher.conf b/roles/bodhi2/backend/files/bodhi-masher.conf deleted file mode 100644 index 1f962ed504..0000000000 --- a/roles/bodhi2/backend/files/bodhi-masher.conf +++ /dev/null @@ -1,15 +0,0 @@ -Alias /updates/static /usr/share/bodhi/static - -WSGISocketPrefix run/wsgi -WSGIRestrictSignal Off - -WSGIDaemonProcess bodhi user=masher group=masher display-name=bodhi -WSGIPythonOptimize 1 - -WSGIScriptAlias /updates /usr/share/bodhi/bodhi.wsgi/updates - - - WSGIProcessGroup bodhi - Order deny,allow - Allow from all - diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 47bafd419c..24946b6a5f 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -40,19 +40,6 @@ tags: - bodhi -- name: install bodhi-masher /etc/httpd/conf.d/bodhi.conf file - copy: > - src="bodhi-masher.conf" - dest="/etc/httpd/conf.d/bodhi.conf" - owner=root - group=root - mode=0644 - notify: - - restart httpd - tags: - - bodhi - - config - - name: change owner and group attributes of bodhi.pem file file: > path="/etc/pki/bodhi/bodhi.pem" @@ -130,35 +117,6 @@ - packages - bodhi -- name: install bodhi-epel-masher /etc/bodhi/bodhi.cfg file - template: > - src="bodhi-epel-masher.cfg.j2" - dest="/etc/bodhi/bodhi.cfg" - owner=masher - group=masher - mode=0600 - when: inventory_hostname.startswith('bodhi-backend02') - notify: - - restart httpd - tags: - - config - - bodhi - -# tasklist for setting up jobrunner - -- name: install bodhi-masher-jobrunner /etc/bodhi/bodhi.cfg file - template: > - src="bodhi-masher-jobrunner.cfg.j2" - dest="/etc/bodhi/bodhi.cfg" - owner=masher - group=masher - mode=0600 - when: inventory_hostname.startswith('bodhi-backend01') - notify: - - restart httpd - tags: - - config - - bodhi # # cron job that syncs packages to koji diff --git a/roles/bodhi2/backend/templates/bodhi-epel-masher.cfg.j2 b/roles/bodhi2/backend/templates/bodhi-epel-masher.cfg.j2 deleted file mode 100644 index 0d99085655..0000000000 --- a/roles/bodhi2/backend/templates/bodhi-epel-masher.cfg.j2 +++ /dev/null @@ -1,152 +0,0 @@ -[global] - -## -## Bodhi Production Masher Configuration -## -## $Id: bodhi-prod.cfg.erb,v 1.8 2008/05/21 23:38:07 lmacken Exp $ -## - -arches = 'i386 x86_64 ppc/ppc64' - -# EPEL specific configuration -epel7_arches = 'x86_64 ppc64' -epel7-testing_arches = 'x86_64 ppc64' -el6-epel_arches = 'x86_64 i386 ppc64' -el6-epel-testing_arches = 'x86_64 i386 ppc64' -el5-epel_arches = 'x86_64 i386 ppc' -el5-epel-testing_arches = 'x86_64 i386 ppc' - -# For pushing EPEL updates from the masher -bodhi_url = 'http://localhost/updates' - -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. -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-EPEL' - -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' - - -[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']