Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/310779
Change subject: role::logging: move templates to role
......................................................................
role::logging: move templates to role
Change-Id: I369cd1e543d1345f5550599e98624302f608ff38
---
M manifests/role/logging.pp
R modules/role/templates/logging/kafkatee_logrotate.erb
D templates/kafkatee/logrotate_fundraising.erb
3 files changed, 1 insertion(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/310779/1
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 789689b..a12d7ea 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -224,7 +224,7 @@
mode => '0444',
owner => 'root',
group => 'root',
- content => template('kafkatee/logrotate.erb'),
+ content => template('role/logging/kafkatee_logrotate.erb'),
}
}
diff --git a/templates/kafkatee/logrotate.erb
b/modules/role/templates/logging/kafkatee_logrotate.erb
similarity index 100%
rename from templates/kafkatee/logrotate.erb
rename to modules/role/templates/logging/kafkatee_logrotate.erb
diff --git a/templates/kafkatee/logrotate_fundraising.erb
b/templates/kafkatee/logrotate_fundraising.erb
deleted file mode 100644
index da6fe93..0000000
--- a/templates/kafkatee/logrotate_fundraising.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-##################################
-# THIS FILE IS MANAGED BY PUPPET #
-##################################
-
-# Rotate anything in <%= @log_directory %>/*.log daily
-<%= @log_directory %>/*.log {
- daily
- olddir <%= @log_directory %>/archive
- notifempty
- nocreate
- maxage 90
- rotate 1000
- dateext
- compress
- delaycompress
- postrotate
- service kafkatee reload
- endscript
-}
--
To view, visit https://gerrit.wikimedia.org/r/310779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I369cd1e543d1345f5550599e98624302f608ff38
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
