Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202642
Change subject: phab: indentation fixes in role class
......................................................................
phab: indentation fixes in role class
puppet-lint 1.1.0 said 59 times: "WARNING: indentation of => is not properly
aligned"
after this patch 58 of 59 are gone. fixme: the last one, line 100?!
puppet-lint phabricator.pp | grep aligned
Bug:T93645
Change-Id: I48257de1b834ca2bfa2dce1e520429e9507c9281
---
M manifests/role/phabricator.pp
1 file changed, 59 insertions(+), 59 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/202642/1
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 8601c74..ade8139 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -52,52 +52,52 @@
extensions => [ 'MediaWikiUserpageCustomField.php',
'LDAPUserpageCustomField.php'],
settings => {
- 'storage.upload-size-limit' => '10M',
- 'darkconsole.enabled' => false,
- 'phabricator.base-uri' => "https://${domain}";,
- 'security.alternate-file-domain' => "https://${altdom}";,
- 'mysql.user' =>
$role::phabricator::config::mysql_appuser,
- 'mysql.pass' =>
$role::phabricator::config::mysql_apppass,
- 'mysql.host' => $mysql_host,
- 'phpmailer.smtp-host' =>
inline_template('<%= @mail_smarthost.join(";") %>'),
- 'metamta.default-address' =>
"no-reply@${domain}",
- 'metamta.domain' => $domain,
- 'metamta.maniphest.reply-handler-domain' => $domain,
- 'metamta.maniphest.public-create-email' => "task@${domain}",
- 'metamta.reply-handler-domain' => $domain,
- 'repository.default-local-path' => '/srv/phab/repos',
- 'phd.start-taskmasters' => 10,
- 'events.listeners' =>
['SecurityPolicyEventListener'],
+ 'storage.upload-size-limit' => '10M',
+ 'darkconsole.enabled' => false,
+ 'phabricator.base-uri' => "https://${domain}";,
+ 'security.alternate-file-domain' => "https://${altdom}";,
+ 'mysql.user' =>
$role::phabricator::config::mysql_appuser,
+ 'mysql.pass' =>
$role::phabricator::config::mysql_apppass,
+ 'mysql.host' => $mysql_host,
+ 'phpmailer.smtp-host' => inline_template('<%=
@mail_smarthost.join(";") %>'),
+ 'metamta.default-address' => "no-reply@${domain}",
+ 'metamta.domain' => $domain,
+ 'metamta.maniphest.reply-handler-domain' => $domain,
+ 'metamta.maniphest.public-create-email' => "task@${domain}",
+ 'metamta.reply-handler-domain' => $domain,
+ 'repository.default-local-path' => '/srv/phab/repos',
+ 'phd.start-taskmasters' => 10,
+ 'events.listeners' =>
['SecurityPolicyEventListener'],
},
}
class { '::phabricator::migration':
- dbhost => $mysql_host,
- manifest_user => $role::phabricator::config::mysql_maniphestuser,
- manifest_pass => $role::phabricator::config::mysql_maniphestpass,
- app_user => $role::phabricator::config::mysql_appuser,
- app_pass => $role::phabricator::config::mysql_apppass,
- bz_user => $role::phabricator::config::bz_user,
- bz_pass => $role::phabricator::config::bz_pass,
- rt_user => $role::phabricator::config::rt_user,
- rt_pass => $role::phabricator::config::rt_pass,
- phabtools_cert => $role::phabricator::config::phabtools_cert,
- phabtools_user => $role::phabricator::config::phabtools_user,
+ dbhost => $mysql_host,
+ manifest_user => $role::phabricator::config::mysql_maniphestuser,
+ manifest_pass => $role::phabricator::config::mysql_maniphestpass,
+ app_user => $role::phabricator::config::mysql_appuser,
+ app_pass => $role::phabricator::config::mysql_apppass,
+ bz_user => $role::phabricator::config::bz_user,
+ bz_pass => $role::phabricator::config::bz_pass,
+ rt_user => $role::phabricator::config::rt_user,
+ rt_pass => $role::phabricator::config::rt_pass,
+ phabtools_cert => $role::phabricator::config::phabtools_cert,
+ phabtools_user => $role::phabricator::config::phabtools_user,
}
class { 'exim::roled':
- local_domains => [ '+system_domains', '+phab_domains' ],
- enable_mail_relay => false,
- enable_external_mail => false,
- smart_route_list => $::mail_smarthost,
- enable_mailman => false,
- phab_relay => true,
- enable_spamassassin => false,
+ local_domains => [ '+system_domains', '+phab_domains' ],
+ enable_mail_relay => false,
+ enable_external_mail => false,
+ smart_route_list => $::mail_smarthost,
+ enable_mailman => false,
+ phab_relay => true,
+ enable_spamassassin => false,
}
$emailbotcert = $passwords::phabricator::emailbot_cert
class { '::phabricator::mailrelay':
- default => {
+ default => {
security => 'users',
maint => false,
taskcreation => "task@${domain}",
@@ -111,7 +111,7 @@
procurement =>
'cdw.com,dasher.com,dell.com,fishnetsecurity.com,wikimedia.org',
},
- phab_bot => {
+ phab_bot => {
root_dir => '/srv/phab/phabricator/',
username => 'emailbot',
host => "https://${domain}/api/";,
@@ -120,32 +120,32 @@
}
ferm::service { 'phabmain_http':
- proto => 'tcp',
- port => '80',
+ proto => 'tcp',
+ port => '80',
}
ferm::service { 'phabmain_https':
- proto => 'tcp',
- port => '443',
+ proto => 'tcp',
+ port => '443',
}
# receive mail from mail smarthosts
ferm::service { 'phabmain-smtp':
- port => '25',
- proto => 'tcp',
- srange => inline_template('(<%= @mail_smarthost.map{|x|
"@resolve(#{x})" }.join(" ") %>)'),
+ port => '25',
+ proto => 'tcp',
+ srange => inline_template('(<%= @mail_smarthost.map{|x|
"@resolve(#{x})" }.join(" ") %>)'),
}
# redirect bugzilla URL patterns to phabricator
# handles translation of bug numbers to maniphest task ids
phabricator::redirector { "redirector.${domain}":
- mysql_user => $role::phabricator::config::mysql_maniphestuser,
- mysql_pass => $role::phabricator::config::mysql_maniphestpass,
- mysql_host => $mysql_host,
- rootdir => '/srv/phab',
- field_index => '4rRUkCdImLQU',
- phab_host => $domain,
- alt_host => $altdom,
+ mysql_user => $role::phabricator::config::mysql_maniphestuser,
+ mysql_pass => $role::phabricator::config::mysql_maniphestpass,
+ mysql_host => $mysql_host,
+ rootdir => '/srv/phab',
+ field_index => '4rRUkCdImLQU',
+ phab_host => $domain,
+ alt_host => $altdom,
}
# community metrics mail (RT #3962, T1003)
@@ -164,17 +164,17 @@
$mysqlpass = 'labspass'
$current_tag = 'release/2015-02-18/1'
class { '::phabricator':
- git_tag => $current_tag,
- lock_file => '/var/run/phab_repo_lock',
- auth_type => 'local',
- sprint_tag => 'release/2015-02-18',
- libraries => {
- 'sprint' => '/srv/phab/libext/Sprint/src',
+ git_tag => $current_tag,
+ lock_file => '/var/run/phab_repo_lock',
+ auth_type => 'local',
+ sprint_tag => 'release/2015-02-18',
+ libraries => {
+ 'sprint' => '/srv/phab/libext/Sprint/src',
},
- extension_tag => 'HEAD',
- extensions => [ 'MediaWikiUserpageCustomField.php',
+ extension_tag => 'HEAD',
+ extensions => [ 'MediaWikiUserpageCustomField.php',
'LDAPUserpageCustomField.php'],
- settings => {
+ settings => {
'darkconsole.enabled' => true,
'phabricator.base-uri' =>
"https://${::hostname}.wmflabs.org";,
'mysql.pass' => $mysqlpass,
--
To view, visit https://gerrit.wikimedia.org/r/202642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48257de1b834ca2bfa2dce1e520429e9507c9281
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
