Alexandros Kosiaris has submitted this change and it was merged. Change subject: phab: move defines into autoload layout ......................................................................
phab: move defines into autoload layout defines should also be in their own files like classes are ERROR: phabricator::extension not in autoload module layout ERROR: phabricator::redirector not in autoload module layout http://puppet-lint.com/checks/autoloader_layout/ also fixes some lint warnins about aligned errors Change-Id: I4745cc5e02ef8bbb270fae22f50f690206d743ff --- A modules/phabricator/manifests/extension.pp M modules/phabricator/manifests/init.pp M modules/phabricator/manifests/monitoring.pp M modules/phabricator/manifests/phd.pp A modules/phabricator/manifests/redirector.pp 5 files changed, 22 insertions(+), 23 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/phabricator/manifests/extension.pp b/modules/phabricator/manifests/extension.pp new file mode 100644 index 0000000..2eb186e --- /dev/null +++ b/modules/phabricator/manifests/extension.pp @@ -0,0 +1,6 @@ +define phabricator::extension($rootdir='/') { + file { "${rootdir}/phabricator/src/extensions/${name}": + ensure => link, + target => "${rootdir}/extensions/${name}", + } +} diff --git a/modules/phabricator/manifests/init.pp b/modules/phabricator/manifests/init.pp index 3613591..5e67401 100644 --- a/modules/phabricator/manifests/init.pp +++ b/modules/phabricator/manifests/init.pp @@ -259,7 +259,7 @@ class { 'phabricator::phd': settings => $phab_settings, - before => Service['phd'], + before => Service['phd'], } # This needs to become Upstart managed @@ -276,20 +276,3 @@ } } -define phabricator::extension($rootdir='/') { - file { "${rootdir}/phabricator/src/extensions/${name}": - ensure => link, - target => "${rootdir}/extensions/${name}", - } -} - -define phabricator::redirector($mysql_user, $mysql_pass, $mysql_host, $rootdir='/') { - file { "${rootdir}/phabricator/support/preamble.php": - source => 'puppet:///modules/phabricator/preamble.php', - require => File["${rootdir}/phabricator/support/redirect_config.json"] - } - - file { "${rootdir}/phabricator/support/redirect_config.json": - content => template('phabricator/redirect_config.json.erb') - } -} diff --git a/modules/phabricator/manifests/monitoring.pp b/modules/phabricator/manifests/monitoring.pp index 605459b..3ff2c1b 100644 --- a/modules/phabricator/manifests/monitoring.pp +++ b/modules/phabricator/manifests/monitoring.pp @@ -2,7 +2,7 @@ nrpe::monitor_service { 'check_phab_taskmaster': description => 'check if phabricator taskmaster is running', - nrpe_command => "/usr/lib/nagios/plugins/check_procs -w 10:30 -c 10:30 --ereg-argument-array 'PhabricatorTaskmasterDaemon'", + nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 10:30 -c 10:30 --ereg-argument-array PhabricatorTaskmasterDaemon', } monitor_service { 'phabricator-https': diff --git a/modules/phabricator/manifests/phd.pp b/modules/phabricator/manifests/phd.pp index 0576162..18e1893 100644 --- a/modules/phabricator/manifests/phd.pp +++ b/modules/phabricator/manifests/phd.pp @@ -4,14 +4,14 @@ file { $settings['phd.pid-directory']: ensure => 'directory', - owner => $settings['phd.user'], - group => 'phd', + owner => $settings['phd.user'], + group => 'phd', } file { $settings['phd.log-directory']: ensure => 'directory', - owner => $settings['phd.user'], - group => 'phd', + owner => $settings['phd.user'], + group => 'phd', } group { 'phd': diff --git a/modules/phabricator/manifests/redirector.pp b/modules/phabricator/manifests/redirector.pp new file mode 100644 index 0000000..0a7b467 --- /dev/null +++ b/modules/phabricator/manifests/redirector.pp @@ -0,0 +1,10 @@ +define phabricator::redirector($mysql_user, $mysql_pass, $mysql_host, $rootdir='/') { + file { "${rootdir}/phabricator/support/preamble.php": + source => 'puppet:///modules/phabricator/preamble.php', + require => File["${rootdir}/phabricator/support/redirect_config.json"] + } + + file { "${rootdir}/phabricator/support/redirect_config.json": + content => template('phabricator/redirect_config.json.erb') + } +} -- To view, visit https://gerrit.wikimedia.org/r/170273 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4745cc5e02ef8bbb270fae22f50f690206d743ff Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Matanya <mata...@foss.co.il> Gerrit-Reviewer: Rush <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
