Dzahn has submitted this change and it was merged.

Change subject: Phabricator: Allow us to change the default web domain
......................................................................


Phabricator: Allow us to change the default web domain

This allows us to change the default web domain ie
phabricator.wikimedia.org to something else.

Change-Id: Ia0cb903c340dc3673e69451f9e52ada2c2575dea
---
M modules/role/manifests/phabricator/main.pp
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/role/manifests/phabricator/main.pp 
b/modules/role/manifests/phabricator/main.pp
index 902256e..ebde0cf 100644
--- a/modules/role/manifests/phabricator/main.pp
+++ b/modules/role/manifests/phabricator/main.pp
@@ -19,8 +19,9 @@
 
     # this site's misc-lb caching proxies hostnames
     $cache_misc_nodes = hiera('cache::misc::nodes', [])
-    $domain = 'phabricator.wikimedia.org'
-    $altdom = 'phab.wmfusercontent.org'
+    $domain = hiera('phabricator_domain', 'phabricator.wikimedia.org')
+    $altdom = hiera('phabricator_altdomain', 'phab.wmfusercontent.org')
+
     $mysql_host = hiera('phabricator::mysql::master', 'localhost')
     $mysql_slave = hiera('phabricator::mysql::slave', 'localhost')
     $phab_root_dir = '/srv/phab'
@@ -125,6 +126,8 @@
         $mysql_admin_pass = $phab_mysql_admin_pass
     }
 
+    $phab_diffusion_ssh_host = hiera('phabricator_diffusion_ssh_host', 
'git-ssh.wikimedia.org')
+
     # lint:ignore:arrow_alignment
     class { '::phabricator':
         deploy_target    => $deploy_target,
@@ -153,7 +156,7 @@
             'phd.taskmasters'                        => 10,
             'events.listeners'                       => [],
             'diffusion.allow-http-auth'              => true,
-            'diffusion.ssh-host'                     => 
'git-ssh.wikimedia.org',
+            'diffusion.ssh-host'                     => 
$phab_diffusion_ssh_host,
             'gitblit.hostname'                       => 'git.wikimedia.org',
         },
         conf_files     => $conf_files,

-- 
To view, visit https://gerrit.wikimedia.org/r/324408
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0cb903c340dc3673e69451f9e52ada2c2575dea
Gerrit-PatchSet: 24
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to