From d68824b7bd739c942c31bf91535efbbb0c6fb2c5 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 12 Jun 2015 14:09:41 +0000 Subject: [PATCH] Try mote config in staging. --- playbooks/groups/value.yml | 1 + playbooks/include/proxies-reverseproxy.yml | 9 ++++++++- playbooks/include/proxies-websites.yml | 5 +++++ roles/mote/templates/config.py | 4 ++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 2cb948b0be..10ef669054 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -42,6 +42,7 @@ when: env != "staging" } - role: collectd/fedmsg-service process: fedmsg-irc + - role: mote tasks: - include: "{{ tasks }}/yumrepos.yml" diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 4fb1976187..b38474fd94 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -51,12 +51,19 @@ when: env == "staging" - role: httpd/reverseproxy - website: meetbot.fedoraproject.org + website: meetbot-raw.fedoraproject.org destname: meetbot remotepath: /meetbot/ # Talk directly to the app server, not haproxy proxyurl: http://value01 + - role: httpd/reverseproxy + website: meetbot.fedoraproject.org + #destname: mote + #remotepath: /mote/ + # Talk directly to the app server, not haproxy + proxyurl: http://value01 + - role: httpd/reverseproxy website: apps.fedoraproject.org destname: gallery diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index febfc83059..e1b9391aa9 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -342,6 +342,11 @@ server_aliases: [meetbot.stg.fedoraproject.org] cert_name: "{{wildcard_cert_name}}" + - role: httpd/website + name: meetbot-raw.fedoraproject.org + server_aliases: [meetbot-raw.stg.fedoraproject.org] + cert_name: "{{wildcard_cert_name}}" + - role: httpd/website name: fudcon.fedoraproject.org server_aliases: [fudcon.stg.fedoraproject.org] diff --git a/roles/mote/templates/config.py b/roles/mote/templates/config.py index 47d848dc18..4aca977e43 100644 --- a/roles/mote/templates/config.py +++ b/roles/mote/templates/config.py @@ -18,9 +18,9 @@ ignore_dir = "meetbot" # Location where raw logs/minutes are stored (remote location) {% if env == 'staging' %} -meetbot_prefix = "http://meetbot.stg.fedoraproject.org" +meetbot_prefix = "http://meetbot-raw.stg.fedoraproject.org" {% else %} -meetbot_prefix = "http://meetbot.fedoraproject.org" +meetbot_prefix = "http://meetbot-raw.fedoraproject.org" {% endif %} # Time (in seconds) after which the log/meeting cache expires