Dzahn has submitted this change and it was merged. Change subject: retab, quoting, linting of ishmael.pp ......................................................................
retab, quoting, linting of ishmael.pp do this first, next move it to module, less changes in a single patch set then put the definition into its own file to also get rid of warning that a "definition (is) defined inside a class" Change-Id: I15ed9f259ec810781e34a22bced40bc90e99bc20 --- M manifests/misc/ishmael.pp 1 file changed, 26 insertions(+), 23 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/misc/ishmael.pp b/manifests/misc/ishmael.pp index 81c2810..791a927 100644 --- a/manifests/misc/ishmael.pp +++ b/manifests/misc/ishmael.pp @@ -4,33 +4,36 @@ # cd /srv ; git clone https://github.com/asher/ishmael.git ; cd ishmael ; git clone https://github.com/asher/ishmael.git sample # class misc::ishmael { - system::role { "misc::ishmael": description => "ishmael server" } + system::role { 'misc::ishmael': description => 'ishmael server' } - include passwords::ldap::wmf_cluster - $proxypass = $passwords::ldap::wmf_cluster::proxypass + include passwords::ldap::wmf_cluster + $proxypass = $passwords::ldap::wmf_cluster::proxypass - file { '/etc/apache2/sites-available/ishmael.wikimedia.org': - ensure => present, - owner => 'root', - group => 'root', - mode => '0440', - content => template('apache/sites/ishmael.wikimedia.org.erb'); - } + file { '/etc/apache2/sites-available/ishmael.wikimedia.org': + ensure => present, + owner => 'root', + group => 'root', + mode => '0440', + content => template('apache/sites/ishmael.wikimedia.org.erb'); + } - apache_site { 'ishmael': name => 'ishmael.wikimedia.org' } + apache_site { 'ishmael': name => 'ishmael.wikimedia.org' } - define ishmael_config( $db_central_host='db1001.eqiad.wmnet', $review_table='%query_review', $history_table='%query_review_history' ) { - include passwords::mysql::querydigest + define ishmael_config( $db_central_host='db1001.eqiad.wmnet', $review_table='%query_review', $history_table='%query_review_history' ) { + include passwords::mysql::querydigest - file { $title: - owner => "root", - group => "root", - mode => 0444, - content => template('ishmael/conf.php.erb'); - } - } + file { $title: + owner => 'root', + group => 'root', + mode => '0444', + content => template('ishmael/conf.php.erb'); + } + } - ishmael_config { '/srv/ishmael/conf.php': } - ishmael_config { '/srv/ishmael/sample/conf.php': - review_table => '%tcpquery_review', history_table => '%tcpquery_review_history' } + ishmael_config { '/srv/ishmael/conf.php': } + + ishmael_config { '/srv/ishmael/sample/conf.php': + review_table => '%tcpquery_review', + history_table => '%tcpquery_review_history', + } } -- To view, visit https://gerrit.wikimedia.org/r/96362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I15ed9f259ec810781e34a22bced40bc90e99bc20 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Matanya <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
