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

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

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


services: use logrotate::conf for logrotate

Change-Id: Id0556d83d6032e29e149fe4ef95277e522cd2e0e
---
M modules/service/manifests/node.pp
M modules/service/manifests/uwsgi.pp
2 files changed, 4 insertions(+), 8 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/service/manifests/node.pp 
b/modules/service/manifests/node.pp
index 5a9c819..1b866c9 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -318,11 +318,9 @@
 mode   => '0755',
 }
 
-file { "/etc/logrotate.d/${title}":
+logrotate::conf { $title:
+ensure  => present,
 content => template('service/logrotate.erb'),
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
 }
 }
 
diff --git a/modules/service/manifests/uwsgi.pp 
b/modules/service/manifests/uwsgi.pp
index 79f74a3..8bda7ae 100644
--- a/modules/service/manifests/uwsgi.pp
+++ b/modules/service/manifests/uwsgi.pp
@@ -124,11 +124,9 @@
 mode   => '0755',
 before => Uwsgi::App[$title],
 }
-file { "/etc/logrotate.d/${title}":
+logrotate::conf { $title:
+ensure  => present,
 content => template('service/logrotate.erb'),
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
 }
 $local_log_config = {
 logger => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0556d83d6032e29e149fe4ef95277e522cd2e0e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
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]: services: 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/352641 )

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

services: use logrotate::conf for logrotate

Change-Id: Id0556d83d6032e29e149fe4ef95277e522cd2e0e
---
M modules/service/manifests/node.pp
M modules/service/manifests/uwsgi.pp
2 files changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/352641/1

diff --git a/modules/service/manifests/node.pp 
b/modules/service/manifests/node.pp
index 5a9c819..1b866c9 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -318,11 +318,9 @@
 mode   => '0755',
 }
 
-file { "/etc/logrotate.d/${title}":
+logrotate::conf { $title:
+ensure  => present,
 content => template('service/logrotate.erb'),
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
 }
 }
 
diff --git a/modules/service/manifests/uwsgi.pp 
b/modules/service/manifests/uwsgi.pp
index 79f74a3..3e42432 100644
--- a/modules/service/manifests/uwsgi.pp
+++ b/modules/service/manifests/uwsgi.pp
@@ -124,11 +124,9 @@
 mode   => '0755',
 before => Uwsgi::App[$title],
 }
-file { "/etc/logrotate.d/${title}":
+logrotate:;conf { $title:
+ensure  => present,
 content => template('service/logrotate.erb'),
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
 }
 $local_log_config = {
 logger => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0556d83d6032e29e149fe4ef95277e522cd2e0e
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