From c9395f38723b4d38c9d41b5b4eec3cce5e4fcd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Fri, 17 Oct 2014 09:12:08 +0000 Subject: [PATCH] Fix HyperKitty's URL --- inventory/group_vars/mailman | 1 + inventory/group_vars/mailman-stg | 1 + playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml | 1 + roles/mailman/templates/mailman-hyperkitty.cfg.j2 | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/mailman b/inventory/group_vars/mailman index 29a68c21f8..d9b70f97d2 100644 --- a/inventory/group_vars/mailman +++ b/inventory/group_vars/mailman @@ -24,6 +24,7 @@ postfix_group: mailman # Used by the mailman role mailman_db_server: db01.phx2.fedoraproject.org +mailman_url: lists.fedoraproject.org # by default, the number of emails in queue before we whine nrpe_check_postfix_queue_warn: 20 diff --git a/inventory/group_vars/mailman-stg b/inventory/group_vars/mailman-stg index 3b761d159e..92cdcfad9d 100644 --- a/inventory/group_vars/mailman-stg +++ b/inventory/group_vars/mailman-stg @@ -30,6 +30,7 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m # Postfix main.cf postfix_group: mailman-stg +mailman_url: lists.stg.fedoraproject.org # Used by the mailman role mailman_db_server: db02.stg.phx2.fedoraproject.org diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml index fd9de8cf75..1833297e71 100644 --- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml @@ -127,6 +127,7 @@ mailman_kittystore_admin_db_pass: "{{ lists_dev_ks_db_pass }}" mailman_kittystore_db_pass: "{{ lists_dev_ks_db_pass }}" mailman_hyperkitty_cookie_key: "randomstringusedasacookiesecurekey-yesthisshouldbeinaprivaterepo_butidonthaveaccesstoit" + mailman_url: "{{ ansible_fqdn }}" - collectd/base tasks: diff --git a/roles/mailman/templates/mailman-hyperkitty.cfg.j2 b/roles/mailman/templates/mailman-hyperkitty.cfg.j2 index b59c1f4689..7ea9aa0dbb 100644 --- a/roles/mailman/templates/mailman-hyperkitty.cfg.j2 +++ b/roles/mailman/templates/mailman-hyperkitty.cfg.j2 @@ -8,5 +8,5 @@ # [general] -base_url: http://apps.stg.fedoraproject.org/lists +base_url: http://{{ mailman_url }} django_settings: {{ mailman_webui_confdir }}/settings.py