From 5d48d0b4e234b760c1757dee5e25e092960c76e2 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 2 Feb 2015 06:27:44 +0000 Subject: [PATCH] trying a different var, ansible doesn't seem to like hyphens --- inventory/group_vars/qadevel-stg | 2 +- roles/phabricator/templates/qadevelconfig.conf.php.j2 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/qadevel-stg b/inventory/group_vars/qadevel-stg index e8184f5f9f..93bc2b0d27 100644 --- a/inventory/group_vars/qadevel-stg +++ b/inventory/group_vars/qadevel-stg @@ -20,7 +20,7 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me --network=bridge=br0,model=virtio --autostart --noautoconsole sshd_config: ssh/sshd_config.qadevel -external-hostname: qadevel-stg.qa.fedoraproject.org +externalhostname: qadevel-stg.qa.fedoraproject.org mariadb_host: db-qa01.qa.fedoraproject.org mariadb_user: '{{ qadevel_stg_mariadb_user }}' diff --git a/roles/phabricator/templates/qadevelconfig.conf.php.j2 b/roles/phabricator/templates/qadevelconfig.conf.php.j2 index 2db0f87772..5667f8b344 100644 --- a/roles/phabricator/templates/qadevelconfig.conf.php.j2 +++ b/roles/phabricator/templates/qadevelconfig.conf.php.j2 @@ -14,9 +14,9 @@ return array( 'diffusion.ssh-user' => '{{ phabricator_vcs_user }}', 'welcome.html' => '{{ lookup("file", "phabricator-welcome.html") }}', 'ui.header-color' => '{{ phabricator_header_color }}', - 'metamta.default-address' => 'phab@{{ external-hostname }}', - 'metamta.domain' => '{{ external-hostname }}', - 'metamta.reply-handler-domain' => '{{ external-hostname }}', + 'metamta.default-address' => 'phab@{{ externalhostname }}', + 'metamta.domain' => '{{ externalhostname }}', + 'metamta.reply-handler-domain' => '{{ externalhostname }}', 'metamta.mail-adapter' => '{{ 'PhabricatorMailImplementationPHPMailerLiteAdapter' if phabricator_mail_enabled else 'PhabricatorMailImplementationTestAdapter'}}', 'phabricator.uninstalled-applications' => array( 'PhabricatorApplicationPhame' => true,