Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/111520
Change subject: lucene: puppet 3 compatibility fix: fully qualify variable
......................................................................
lucene: puppet 3 compatibility fix: fully qualify variable
Change-Id: I424e006cd37ece2a8ab3590e2d33581b61d8c9b0
---
M manifests/search.pp
M templates/lucene/lsearch.log4j.erb
2 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/111520/1
diff --git a/manifests/search.pp b/manifests/search.pp
index c333125..cbd2985 100644
--- a/manifests/search.pp
+++ b/manifests/search.pp
@@ -14,7 +14,6 @@
$lucene_oai_pass = $passwords::lucene::oai_pass
include lucene::packages,
- lucene::config,
lucene::service
if $indexer == true {
@@ -37,7 +36,6 @@
}
}
- class config {
require role::lucene::configuration
file { '/a/search/conf/lsearch-global-2.1.conf':
@@ -127,8 +125,6 @@
hour => '0',
minute => '0',
}
-
- }
class service {
service { 'lucene-search-2':
diff --git a/templates/lucene/lsearch.log4j.erb
b/templates/lucene/lsearch.log4j.erb
index 101bdc0..55d6f39 100644
--- a/templates/lucene/lsearch.log4j.erb
+++ b/templates/lucene/lsearch.log4j.erb
@@ -1,5 +1,5 @@
# Set root logger level and its only appender to A1.
-log4j.rootLogger=INFO, A1<% if udplogging == true then -%>, udp2log<% end -%>
+log4j.rootLogger=INFO, A1<% if @udplogging == true then -%>, udp2log<% end -%>
# A1 is set to be a ConsoleAppender.
#log4j.appender.A1=org.apache.log4j.ConsoleAppender
@@ -18,7 +18,7 @@
# Log progress messages from the incremental indexer
log4j.logger.org.wikimedia.lsearch.oai.IncrementalUpdater=INFO
-<% if udplogging == true then -%>
+<% if @udplogging == true then -%>
# udp2log log4j appender.
# Logs to Oxygen's udp2log-lucene instance on port 51234
log4j.appender.udp2log=org.wikimedia.log4j.Udp2LogAppender
--
To view, visit https://gerrit.wikimedia.org/r/111520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I424e006cd37ece2a8ab3590e2d33581b61d8c9b0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
