Dzahn has submitted this change and it was merged.
Change subject: phab - small lint fixes
......................................................................
phab - small lint fixes
Change-Id: Ia9647fad8ba2fc4ee85c8281b6256426a02e542c
---
M modules/phabricator/manifests/init.pp
M modules/phabricator/manifests/mail.pp
2 files changed, 19 insertions(+), 10 deletions(-)
Approvals:
Rush: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/phabricator/manifests/init.pp
b/modules/phabricator/manifests/init.pp
index 4d6ea75..d1813e9 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -85,9 +85,18 @@
$storage_pass = $mysql_admin_pass
}
- package {
- ['git-core', 'php5', 'php5-mysql', 'php5-gd', 'php-apc',
'php5-mailparse',
- 'php5-dev', 'php5-curl', 'php5-cli', 'php5-json', 'php5-ldap']:
+ package { [
+ 'git-core',
+ 'php5',
+ 'php5-mysql',
+ 'php5-gd',
+ 'php-apc',
+ 'php5-mailparse',
+ 'php5-dev',
+ 'php5-curl',
+ 'php5-cli',
+ 'php5-json',
+ 'php5-ldap']:
ensure => present;
}
@@ -134,8 +143,8 @@
file { $php_ini:
content => template("phabricator/${lsbdistcodename}_php.ini.erb"),
- notify => Service[apache2],
- require => Package[php5],
+ notify => Service['apache2'],
+ require => Package['php5'],
}
file { "${phabdir}/phabricator/conf/local/local.json":
@@ -147,15 +156,15 @@
#default location for phabricator tracked repositories
file { $phab_settings['repository.default-local-path']:
ensure => directory,
- owner => www-data,
- group => www-data,
+ owner => 'www-data',
+ group => 'www-data',
require => Git::Install['phabricator/phabricator'],
}
file { '/usr/local/sbin/phab_update_tag':
content => template('phabricator/phab_update_tag.erb'),
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0500',
}
diff --git a/modules/phabricator/manifests/mail.pp
b/modules/phabricator/manifests/mail.pp
index a962935..678d676 100644
--- a/modules/phabricator/manifests/mail.pp
+++ b/modules/phabricator/manifests/mail.pp
@@ -36,7 +36,7 @@
file { '/usr/local/bin/phab_epipe.py':
ensure => file,
- source => 'puppet:///modules/phabricator/phab_epipe.py',
+ source => 'puppet:///modules/phabricator/phab_epipe.py',
owner => mail,
group => mail,
}
--
To view, visit https://gerrit.wikimedia.org/r/148288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9647fad8ba2fc4ee85c8281b6256426a02e542c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
