From 1ded20423c4263241b88be1118b68599215c4592 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 9 Jun 2014 22:41:36 +0000 Subject: [PATCH 01/22] A few tweaks for the web side. --- roles/supybot/files/meetbot.conf | 1 + roles/supybot/tasks/main.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/roles/supybot/files/meetbot.conf b/roles/supybot/files/meetbot.conf index fb433618e0..76efeed163 100644 --- a/roles/supybot/files/meetbot.conf +++ b/roles/supybot/files/meetbot.conf @@ -1,4 +1,5 @@ Alias /meetbot /srv/web/meetbot +Alias /icons /var/www/icons Options Indexes FollowSymLinks diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml index 9dd197d2a9..0417b3a963 100644 --- a/roles/supybot/tasks/main.yml +++ b/roles/supybot/tasks/main.yml @@ -46,3 +46,6 @@ - name: setup meetbot.conf apache config copy: src=meetbot.conf dest=/etc/httpd/conf.d/meetbot.conf mode=644 + +- name: /srv/web/meetbot file contexts + command: semanage fcontext -a -t httpd_sys_content_t "/srv/web/meetbot(/.*)?" From fb4d78d5e2f73052dcf9b8c190a59b919ee799b8 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 10 Jun 2014 02:44:06 +0000 Subject: [PATCH 02/22] Supybot fedmsg bits for value01. --- roles/fedmsg/base/templates/endpoints.py.j2 | 4 ++++ roles/fedmsg/base/templates/policy.py.j2 | 4 ++++ roles/fedmsg/base/templates/ssl.py.j2 | 1 + 3 files changed, 9 insertions(+) diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2 index 6fffebe29b..9b9b2272ae 100644 --- a/roles/fedmsg/base/templates/endpoints.py.j2 +++ b/roles/fedmsg/base/templates/endpoints.py.j2 @@ -102,6 +102,10 @@ config = dict( "supybot.value03": [ "tcp://value03.%s:3000" % suffix, ], +{% else %} + "supybot.value01": [ + "tcp://value01.%s:3000" % suffix, + ], {% endif %} # Askbot runs as 6 processes with 1 thread each. "askbot.ask01": [ diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2 index 32fb30f73b..d6bc86bbd3 100644 --- a/roles/fedmsg/base/templates/policy.py.j2 +++ b/roles/fedmsg/base/templates/policy.py.j2 @@ -231,7 +231,11 @@ config = dict( # Supybot/meetbot topic_prefix + "meetbot.meeting.start": [ +{% if env == 'staging' %} + "supybot-value01.%s" % suffix, +{% else %} "supybot-value03.%s" % suffix, +{% endif %} ], # When implemented, only @spot and @mattdm can use this one diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index 47fcc96eb0..a075c0a1c0 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -95,6 +95,7 @@ config = dict( ] + [ ("shell.value01", "shell-value01.%s" % suffix), ("shell.value03", "shell-value03.%s" % suffix), + ("supybot.value01", "supybot-value01.%s" % suffix), ("supybot.value03", "supybot-value03.%s" % suffix), ] + [ ("koji.koji04", "koji-koji04.%s" % suffix), From 04c4ddce24a38e5a494035cc131e3273ae072cf8 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 10 Jun 2014 09:22:55 +0200 Subject: [PATCH 03/22] Add bugzilla credentials --- roles/pkgdb2/templates/pkgdb2.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg index 7e8864df56..b0428d22b1 100644 --- a/roles/pkgdb2/templates/pkgdb2.cfg +++ b/roles/pkgdb2/templates/pkgdb2.cfg @@ -37,9 +37,9 @@ PKGDB2_BUGZILLA_NOTIFICATION = False ## URL to the bugzilla instance to update PKGDB2_BUGZILLA_URL = 'https://bugzilla.redhat.com' ## name of the user the pkgdb application can log in to bugzilla with -PKGDB2_BUGZILLA_USER = None +PKGDB2_BUGZILLA_USER = {{ bugzilla_user }} ## password of the user the pkgdb application can log in to bugzilla with -PKGDB2_BUGZILLA_PASSWORD = None +PKGDB2_BUGZILLA_PASSWORD = {{ bugzilla_password }} ### FAS information From 21b6900ab5d055742fd0093166a0d41ba2bf48a0 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 10 Jun 2014 09:28:08 +0200 Subject: [PATCH 04/22] Configuration requires quotes --- roles/pkgdb2/templates/pkgdb2.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg index b0428d22b1..f0a0bc78ca 100644 --- a/roles/pkgdb2/templates/pkgdb2.cfg +++ b/roles/pkgdb2/templates/pkgdb2.cfg @@ -37,9 +37,9 @@ PKGDB2_BUGZILLA_NOTIFICATION = False ## URL to the bugzilla instance to update PKGDB2_BUGZILLA_URL = 'https://bugzilla.redhat.com' ## name of the user the pkgdb application can log in to bugzilla with -PKGDB2_BUGZILLA_USER = {{ bugzilla_user }} +PKGDB2_BUGZILLA_USER = '{{ bugzilla_user }}' ## password of the user the pkgdb application can log in to bugzilla with -PKGDB2_BUGZILLA_PASSWORD = {{ bugzilla_password }} +PKGDB2_BUGZILLA_PASSWORD = '{{ bugzilla_password }}' ### FAS information From a5ba2ac4c3697a11a11006a85521d999fdfd4a93 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 10 Jun 2014 09:33:11 +0200 Subject: [PATCH 05/22] Activate bugzilla notifications in prod --- roles/pkgdb2/templates/pkgdb2.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg index f0a0bc78ca..a564402883 100644 --- a/roles/pkgdb2/templates/pkgdb2.cfg +++ b/roles/pkgdb2/templates/pkgdb2.cfg @@ -33,7 +33,7 @@ PKGDB2_CACHE_KWARGS = { ### Bugzilla information ## Upon changes in pkgdb, update bugzilla -PKGDB2_BUGZILLA_NOTIFICATION = False +# PKGDB2_BUGZILLA_NOTIFICATION = False ## URL to the bugzilla instance to update PKGDB2_BUGZILLA_URL = 'https://bugzilla.redhat.com' ## name of the user the pkgdb application can log in to bugzilla with @@ -52,12 +52,16 @@ SITE_ROOT = 'https://admin.stg.fedoraproject.org' SITE_URL = '%s/pkgdb' % SITE_ROOT ## Pkgdb sends its notifications by email PKGDB2_EMAIL_NOTIFICATION = False +## Upon changes in pkgdb, update bugzilla +PKGDB2_BUGZILLA_NOTIFICATION = False {% else %} PKGDB2_FAS_URL = 'https://admin.fedoraproject.org/accounts' SITE_ROOT = 'https://admin.fedoraproject.org' SITE_URL = '%s/pkgdb' % SITE_ROOT ## Pkgdb sends its notifications by email PKGDB2_EMAIL_NOTIFICATION = True +## Upon changes in pkgdb, update bugzilla +PKGDB2_BUGZILLA_NOTIFICATION = True {% endif %} ## name of the user the pkgdb application can log in to FAS with PKGDB2_FAS_USER = '{{ fedorathirdpartyUser }}' From 25f12fdeab7dabaffd752cdc91ca56ff276b31cd Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 10 Jun 2014 13:10:00 +0200 Subject: [PATCH 06/22] Add the alembic.ini file for elections --- roles/elections/templates/alembic.ini | 50 +++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 roles/elections/templates/alembic.ini diff --git a/roles/elections/templates/alembic.ini b/roles/elections/templates/alembic.ini new file mode 100644 index 0000000000..a28e04744c --- /dev/null +++ b/roles/elections/templates/alembic.ini @@ -0,0 +1,50 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts +script_location = /usr/share/fedora_elections/alembic + +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@{{ elections_db_host }}/{{ elections_db_name }} + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S From 9b117ba2aef64fc5daf22873f351fa97ede6d2b8 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 10 Jun 2014 13:21:11 +0200 Subject: [PATCH 07/22] Install the alembic.ini file --- roles/elections/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/elections/tasks/main.yml b/roles/elections/tasks/main.yml index 09be5e6ed0..2db7d6821a 100644 --- a/roles/elections/tasks/main.yml +++ b/roles/elections/tasks/main.yml @@ -27,6 +27,7 @@ - { file: fedora-elections.cfg, location: /etc/fedora-elections } - { file: fedora-elections.conf, location: /etc/httpd/conf.d } - { file: fedora-elections.wsgi, location: /var/www } + - { file: alembic.ini, location: /usr/share/fedora_elections } tags: - config notify: From f86cd0c693344b4a8d79cfe7e3a67fe7fc97bbe7 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 10 Jun 2014 13:25:22 +0200 Subject: [PATCH 08/22] Fix the location of the alembic.ini file --- roles/elections/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/elections/tasks/main.yml b/roles/elections/tasks/main.yml index 2db7d6821a..03cb357a52 100644 --- a/roles/elections/tasks/main.yml +++ b/roles/elections/tasks/main.yml @@ -27,7 +27,7 @@ - { file: fedora-elections.cfg, location: /etc/fedora-elections } - { file: fedora-elections.conf, location: /etc/httpd/conf.d } - { file: fedora-elections.wsgi, location: /var/www } - - { file: alembic.ini, location: /usr/share/fedora_elections } + - { file: alembic.ini, location: /etc/fedora_elections } tags: - config notify: From d8b058042a28a1f2001bb94f46d6c8e1d8c28374 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 10 Jun 2014 13:28:14 +0200 Subject: [PATCH 09/22] grmbl at typos --- roles/elections/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/elections/tasks/main.yml b/roles/elections/tasks/main.yml index 03cb357a52..564acfc547 100644 --- a/roles/elections/tasks/main.yml +++ b/roles/elections/tasks/main.yml @@ -27,7 +27,7 @@ - { file: fedora-elections.cfg, location: /etc/fedora-elections } - { file: fedora-elections.conf, location: /etc/httpd/conf.d } - { file: fedora-elections.wsgi, location: /var/www } - - { file: alembic.ini, location: /etc/fedora_elections } + - { file: alembic.ini, location: /etc/fedora-elections } tags: - config notify: From 1bf258e7366cd51f93a675a1ed39f1d05abeb1af Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 10 Jun 2014 13:31:38 +0200 Subject: [PATCH 10/22] Yet another one... --- roles/elections/templates/alembic.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/elections/templates/alembic.ini b/roles/elections/templates/alembic.ini index a28e04744c..3450a4ef70 100644 --- a/roles/elections/templates/alembic.ini +++ b/roles/elections/templates/alembic.ini @@ -2,7 +2,7 @@ [alembic] # path to migration scripts -script_location = /usr/share/fedora_elections/alembic +script_location = /usr/share/fedora-elections/alembic # template used to generate migration files # file_template = %%(rev)s_%%(slug)s From 2354972b0c73b49ac19e920f387237908e1dcd8c Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 10 Jun 2014 14:05:03 +0200 Subject: [PATCH 11/22] Use stg FAS in stg, not in prod --- roles/elections/templates/fedora-elections.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/elections/templates/fedora-elections.cfg b/roles/elections/templates/fedora-elections.cfg index 238ec2a3a9..70eff47cb0 100644 --- a/roles/elections/templates/fedora-elections.cfg +++ b/roles/elections/templates/fedora-elections.cfg @@ -18,9 +18,9 @@ FEDORA_ELECTIONS_ADMIN_GROUP = 'elections' ## integration. ## URL of the FAS server to use {% if env == 'staging' %} -FAS_BASE_URL = 'https://admin.fedoraproject.org/accounts/' -{% else %} FAS_BASE_URL = 'https://admin.stg.fedoraproject.org/accounts/' +{% else %} +FAS_BASE_URL = 'https://admin.fedoraproject.org/accounts/' {% endif %} FAS_USERNAME = '{{ fedorathirdpartyUser }}' FAS_PASSWORD = '{{ fedorathirdpartyPassword }}' From 8a2b0c0458da3e9c2e603e72619465c7c15121a1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 10 Jun 2014 16:21:04 +0000 Subject: [PATCH 12/22] Add package for pretty printing infra messages for fedmsg-irc --- roles/fedmsg/irc/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/fedmsg/irc/tasks/main.yml b/roles/fedmsg/irc/tasks/main.yml index 1da4dbe61a..85d3055a09 100644 --- a/roles/fedmsg/irc/tasks/main.yml +++ b/roles/fedmsg/irc/tasks/main.yml @@ -5,6 +5,12 @@ - packages - fedmsg/irc +- name: install python-fedmsg-meta-fedora-infrastructure + yum: pkg=python-fedmsg-meta-fedora-infrastructure state=installed + tags: + - packages + - fedmsg/irc + - name: enable on boot and start fedmsg-irc service: name=fedmsg-irc state=started enabled=true tags: From c6c9fe0a3e928a3c05dbf7817ac1df77ac742817 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 10 Jun 2014 16:50:23 +0000 Subject: [PATCH 13/22] Supply a staging URL for staging fedmsg-irc. --- roles/fedmsg/irc/templates/fas-credentials.py.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/fedmsg/irc/templates/fas-credentials.py.j2 b/roles/fedmsg/irc/templates/fas-credentials.py.j2 index 098962ef87..176c77935b 100644 --- a/roles/fedmsg/irc/templates/fas-credentials.py.j2 +++ b/roles/fedmsg/irc/templates/fas-credentials.py.j2 @@ -2,5 +2,8 @@ config = dict( fas_credentials=dict( username="fedoradummy", password="{{ fedoraDummyUserPassword }}", + {% if env == 'staging' %} + base_url="https://admin.stg.fedoraproject.org/accounts/", + {% endif %} ), ) From acdb55f5603294b411a5daa277fb5959d91349fc Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 10 Jun 2014 17:21:48 +0000 Subject: [PATCH 14/22] Ditch the old value03. --- roles/fedmsg/base/templates/endpoints.py.j2 | 9 +++------ roles/fedmsg/base/templates/policy.py.j2 | 4 ---- roles/fedmsg/base/templates/ssl.py.j2 | 2 -- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2 index 9b9b2272ae..827110cfc1 100644 --- a/roles/fedmsg/base/templates/endpoints.py.j2 +++ b/roles/fedmsg/base/templates/endpoints.py.j2 @@ -98,15 +98,12 @@ config = dict( for i in range(32) ], {% endif %} -{% if env != 'staging' %} - "supybot.value03": [ - "tcp://value03.%s:3000" % suffix, - ], -{% else %} + + # This used to be on value01 and value03.. but now we just have one "supybot.value01": [ "tcp://value01.%s:3000" % suffix, ], -{% endif %} + # Askbot runs as 6 processes with 1 thread each. "askbot.ask01": [ "tcp://ask01.%s:30%02i" % (suffix, i) diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2 index d6bc86bbd3..22ee83d2e7 100644 --- a/roles/fedmsg/base/templates/policy.py.j2 +++ b/roles/fedmsg/base/templates/policy.py.j2 @@ -231,11 +231,7 @@ config = dict( # Supybot/meetbot topic_prefix + "meetbot.meeting.start": [ -{% if env == 'staging' %} "supybot-value01.%s" % suffix, -{% else %} - "supybot-value03.%s" % suffix, -{% endif %} ], # When implemented, only @spot and @mattdm can use this one diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index a075c0a1c0..d02ffbb8f4 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -94,9 +94,7 @@ config = dict( ("shell.busgateway01", "shell-busgateway01.%s" % suffix), ] + [ ("shell.value01", "shell-value01.%s" % suffix), - ("shell.value03", "shell-value03.%s" % suffix), ("supybot.value01", "supybot-value01.%s" % suffix), - ("supybot.value03", "supybot-value03.%s" % suffix), ] + [ ("koji.koji04", "koji-koji04.%s" % suffix), ("koji.koji01", "koji-koji01.%s" % suffix), From 43b0cb1117bb899f4b06da36d946f884d4ac0ee1 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 10 Jun 2014 17:23:38 +0000 Subject: [PATCH 15/22] Bodhi is no longer on app* --- roles/fedmsg/base/templates/endpoints.py.j2 | 8 -------- roles/fedmsg/base/templates/policy.py.j2 | 9 --------- 2 files changed, 17 deletions(-) diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2 index 827110cfc1..bd812f5c45 100644 --- a/roles/fedmsg/base/templates/endpoints.py.j2 +++ b/roles/fedmsg/base/templates/endpoints.py.j2 @@ -17,14 +17,6 @@ config = dict( # name of it's calling module to determine which endpoint definition # to use. This can be overridden by explicitly providing the name in # the initial call to fedmsg.init(...). - "bodhi.app01": [ - "tcp://app01.%s:300%i" % (suffix, i) - for i in range(8) - ], - "bodhi.app02": [ - "tcp://app02.%s:300%i" % (suffix, i) - for i in range(8) - ], "bodhi.releng01": [ "tcp://releng01.%s:3000" % suffix, "tcp://releng01.%s:3001" % suffix, diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2 index 22ee83d2e7..80bc0e3bc7 100644 --- a/roles/fedmsg/base/templates/policy.py.j2 +++ b/roles/fedmsg/base/templates/policy.py.j2 @@ -5,8 +5,6 @@ app_hosts = [ "app02.stg.phx2.fedoraproject.org", ] bodhi_hosts = [ - "app01.stg.phx2.fedoraproject.org", - "app02.stg.phx2.fedoraproject.org", "bodhi01.stg.phx2.fedoraproject.org", ] topic_prefix = "org.fedoraproject.stg." @@ -23,13 +21,6 @@ app_hosts = [ ] # TODO -- think about using the ansible group for this. bodhi_hosts = [ - "app01.phx2.fedoraproject.org", - "app02.phx2.fedoraproject.org", - "app03.phx2.fedoraproject.org", - "app04.phx2.fedoraproject.org", - "app05.fedoraproject.org", - "app07.phx2.fedoraproject.org", - "app08.fedoraproject.org", "bodhi01.phx2.fedoraproject.org", "bodhi02.phx2.fedoraproject.org", ] From 46bd093586f68db8f14ab5e68c396d7b238ede5c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 10 Jun 2014 17:25:10 +0000 Subject: [PATCH 16/22] app0* stuff gone from fedmsg config, now. --- roles/fedmsg/base/templates/policy.py.j2 | 13 ------------- roles/fedmsg/base/templates/ssl.py.j2 | 20 -------------------- 2 files changed, 33 deletions(-) diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2 index 80bc0e3bc7..3e2212cdee 100644 --- a/roles/fedmsg/base/templates/policy.py.j2 +++ b/roles/fedmsg/base/templates/policy.py.j2 @@ -1,24 +1,11 @@ {% if env == 'staging' %} suffix = "stg.phx2.fedoraproject.org" -app_hosts = [ - "app01.stg.phx2.fedoraproject.org", - "app02.stg.phx2.fedoraproject.org", -] bodhi_hosts = [ "bodhi01.stg.phx2.fedoraproject.org", ] topic_prefix = "org.fedoraproject.stg." {% else %} suffix = "phx2.fedoraproject.org" -app_hosts = [ - "app01.phx2.fedoraproject.org", - "app02.phx2.fedoraproject.org", - "app03.phx2.fedoraproject.org", - "app04.phx2.fedoraproject.org", - "app05.fedoraproject.org", - "app07.phx2.fedoraproject.org", - "app08.fedoraproject.org", -] # TODO -- think about using the ansible group for this. bodhi_hosts = [ "bodhi01.phx2.fedoraproject.org", diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index d02ffbb8f4..e34ce1e101 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -1,22 +1,9 @@ {% if env == 'staging' %} suffix = "stg.phx2.fedoraproject.org" -app_hosts = [ - "app01.stg.phx2.fedoraproject.org", - "app02.stg.phx2.fedoraproject.org", -] topic_prefix = "org.fedoraproject.stg." {% else %} suffix = "phx2.fedoraproject.org" -app_hosts = [ - "app01.phx2.fedoraproject.org", - "app02.phx2.fedoraproject.org", - "app03.phx2.fedoraproject.org", - "app04.phx2.fedoraproject.org", - "app05.fedoraproject.org", - "app07.phx2.fedoraproject.org", - "app08.fedoraproject.org", -] topic_prefix = "org.fedoraproject.prod." {% endif %} @@ -37,13 +24,6 @@ config = dict( crl_cache_expiry=86400, # Daily certnames=dict( - [ - ("shell.app0%i" % i, "shell-%s" % app_hosts[i-1]) - for i in range(1, len(app_hosts) + 1) - ] + [ - ("bodhi.app0%i" % i, "bodhi-%s" % app_hosts[i-1]) - for i in range(1, len(app_hosts) + 1) - ] + [ ("shell.pkgdb0%i" % i, "shell-pkgdb0%i.%s" % (i, suffix)) for i in range(1, 3) ] + [ From ccf803d16246d4e694467a45cb2757db8139d547 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 10 Jun 2014 17:26:57 +0000 Subject: [PATCH 17/22] Add value here too --- playbooks/fedmsgupdate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/playbooks/fedmsgupdate.yml b/playbooks/fedmsgupdate.yml index 2b935fa02a..3aac4fd785 100644 --- a/playbooks/fedmsgupdate.yml +++ b/playbooks/fedmsgupdate.yml @@ -19,3 +19,4 @@ - include: /srv/web/infra/ansible/playbooks/groups/pkgdb.yml - include: /srv/web/infra/ansible/playbooks/groups/summershum.yml - include: /srv/web/infra/ansible/playbooks/groups/wiki.yml +- include: /srv/web/infra/ansible/playbooks/groups/value.yml From 098c314b8d5a433480b12700423eb8929193d05d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 10 Jun 2014 17:30:57 +0000 Subject: [PATCH 18/22] Fix fat-finger error. --- roles/fedmsg/base/templates/ssl.py.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index e34ce1e101..fec9e94409 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -24,6 +24,7 @@ config = dict( crl_cache_expiry=86400, # Daily certnames=dict( + [ ("shell.pkgdb0%i" % i, "shell-pkgdb0%i.%s" % (i, suffix)) for i in range(1, 3) ] + [ From 32bc3a550a15307a9aa735f346a764bd36396b07 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 10 Jun 2014 18:33:25 +0000 Subject: [PATCH 19/22] Fix meetbot apache icons. --- roles/supybot/files/meetbot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/supybot/files/meetbot.conf b/roles/supybot/files/meetbot.conf index 76efeed163..68ccc059ca 100644 --- a/roles/supybot/files/meetbot.conf +++ b/roles/supybot/files/meetbot.conf @@ -1,5 +1,5 @@ +Alias /meetbot/icons /var/www/icons Alias /meetbot /srv/web/meetbot -Alias /icons /var/www/icons Options Indexes FollowSymLinks From e2d50e402c3098d08df2e864f38dbe81f1eafa86 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 10 Jun 2014 18:35:57 +0000 Subject: [PATCH 20/22] Add port 5050 to be allowed for supybot notices. --- inventory/group_vars/value | 2 +- inventory/group_vars/value-stg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/value b/inventory/group_vars/value index 5e5f4a5f32..d827e9a271 100644 --- a/inventory/group_vars/value +++ b/inventory/group_vars/value @@ -7,7 +7,7 @@ num_cpus: 2 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 80, 443, +tcp_ports: [ 80, 443, 5050, # These 16 ports are used by fedmsg. One for each wsgi thread. 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] diff --git a/inventory/group_vars/value-stg b/inventory/group_vars/value-stg index 5e5f4a5f32..d827e9a271 100644 --- a/inventory/group_vars/value-stg +++ b/inventory/group_vars/value-stg @@ -7,7 +7,7 @@ num_cpus: 2 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 80, 443, +tcp_ports: [ 80, 443, 5050, # These 16 ports are used by fedmsg. One for each wsgi thread. 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] From e555b5d86ee4abffecc70b0aad5977da8561ccb7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 10 Jun 2014 19:01:12 +0000 Subject: [PATCH 21/22] Make prod value have more memory --- inventory/group_vars/value | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/value b/inventory/group_vars/value index d827e9a271..d3583198e0 100644 --- a/inventory/group_vars/value +++ b/inventory/group_vars/value @@ -1,7 +1,7 @@ --- # Define resources for this group of hosts here. lvm_size: 30000 -mem_size: 2048 +mem_size: 6144 num_cpus: 2 # for systems that do not match the above - specify the same parameter in From a2749fddc92501dbb6ef96877116860e4b2c65c7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 10 Jun 2014 19:31:08 +0000 Subject: [PATCH 22/22] Bump memory for value staging too. --- inventory/group_vars/value-stg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/value-stg b/inventory/group_vars/value-stg index d827e9a271..d3583198e0 100644 --- a/inventory/group_vars/value-stg +++ b/inventory/group_vars/value-stg @@ -1,7 +1,7 @@ --- # Define resources for this group of hosts here. lvm_size: 30000 -mem_size: 2048 +mem_size: 6144 num_cpus: 2 # for systems that do not match the above - specify the same parameter in