[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch: use logrotate::conf for logrotate

2017-05-09 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352635 )

Change subject: elasticsearch: use logrotate::conf for logrotate
..


elasticsearch: use logrotate::conf for logrotate

Change-Id: I30ee0bb74e2c96f333b70f4b08964e284518691c
---
M modules/elasticsearch/manifests/init.pp
1 file changed, 4 insertions(+), 5 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 7c050b6..ab36d98 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -222,13 +222,12 @@
 mode=> '0444',
 require => Package['elasticsearch'],
 }
-file { '/etc/logrotate.d/elasticsearch':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
+
+logrotate::conf { 'elasticsearch':
+ensure => present,
 source => 'puppet:///modules/elasticsearch/logrotate',
 }
+
 file { $data_dir:
   ensure  => directory,
   owner   => 'elasticsearch',

-- 
To view, visit https://gerrit.wikimedia.org/r/352635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I30ee0bb74e2c96f333b70f4b08964e284518691c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352635 )

Change subject: elasticsearch: use logrotate::conf for logrotate
..

elasticsearch: use logrotate::conf for logrotate

Change-Id: I30ee0bb74e2c96f333b70f4b08964e284518691c
---
M modules/elasticsearch/manifests/init.pp
1 file changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/352635/1

diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 7c050b6..ab36d98 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -222,13 +222,12 @@
 mode=> '0444',
 require => Package['elasticsearch'],
 }
-file { '/etc/logrotate.d/elasticsearch':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
+
+logrotate::conf { 'elasticsearch':
+ensure => present,
 source => 'puppet:///modules/elasticsearch/logrotate',
 }
+
 file { $data_dir:
   ensure  => directory,
   owner   => 'elasticsearch',

-- 
To view, visit https://gerrit.wikimedia.org/r/352635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30ee0bb74e2c96f333b70f4b08964e284518691c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits