Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395716 )
Change subject: profile::mediawiki::web: explicitly set log retention days
......................................................................
profile::mediawiki::web: explicitly set log retention days
Change-Id: Ibf92a3f92d0c0bb6e953037cd96556fdc0f13aba
---
M hieradata/role/common/mediawiki/appserver.yaml
M modules/apache/manifests/init.pp
M modules/apache/manifests/logrotate.pp
M modules/profile/manifests/mediawiki/web.pp
4 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/395716/1
diff --git a/hieradata/role/common/mediawiki/appserver.yaml
b/hieradata/role/common/mediawiki/appserver.yaml
index 3534daa..fba6acf 100644
--- a/hieradata/role/common/mediawiki/appserver.yaml
+++ b/hieradata/role/common/mediawiki/appserver.yaml
@@ -8,6 +8,7 @@
- deployment
- perf-roots
profile::mediawiki::web::apache_mpm: worker
+profile::mediawiki::web::log_retention_days: 12
role::mediawiki::webserver::tls: true
hhvm::extra::fcgi:
hhvm:
@@ -18,8 +19,5 @@
mysql:
connect_timeout: 3000
-
-
# Parameters we get from hiera autolookup
-apache::logrotate::rotate: 12
nutcracker::verbosity: "4"
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index 4fb3233..1e46208 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -83,9 +83,5 @@
# manage logrotate periodicity and keeping period
#
- # The augeas rule in apache::logrotate needs /etc/logrotate.d/apache2 which
- # is provided by apache2 package
- class {'::apache::logrotate':
- require => Package['apache2'],
- }
+ include ::apache::logrotate
}
diff --git a/modules/apache/manifests/logrotate.pp
b/modules/apache/manifests/logrotate.pp
index 45f4f49..b9ee2d7 100644
--- a/modules/apache/manifests/logrotate.pp
+++ b/modules/apache/manifests/logrotate.pp
@@ -7,7 +7,8 @@
$period = 'daily',
$rotate = 30,
) {
-
+ # The augeas rule in apache::logrotate needs /etc/logrotate.d/apache2 which
+ # is provided by apache2 package
augeas { 'Apache2 logs':
lens => 'Logrotate.lns',
incl => '/etc/logrotate.d/apache2',
@@ -15,5 +16,6 @@
"set rule/schedule ${period}",
"set rule/rotate ${rotate}",
],
+ require => Package['apache2']
}
}
diff --git a/modules/profile/manifests/mediawiki/web.pp
b/modules/profile/manifests/mediawiki/web.pp
index 02fccd1..588357c 100644
--- a/modules/profile/manifests/mediawiki/web.pp
+++ b/modules/profile/manifests/mediawiki/web.pp
@@ -4,6 +4,7 @@
class profile::mediawiki::web(
$apache_mpm = hiera('profile::mediawiki::web::apache_mpm'),
$workers_limit = hiera('profile::mediawiki::web::workers_limit', undef),
+ $log_retention_days = hiera('profile::mediawiki::web::log_retention_days'),
) {
tag 'mediawiki', 'mw-apache-config'
@@ -15,6 +16,9 @@
mpm => $apache_mpm
}
+ class { '::apache::logrotate':
+ rotate => $log_retention_days,
+ }
class { '::apache': }
class { '::mediawiki::users':
--
To view, visit https://gerrit.wikimedia.org/r/395716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf92a3f92d0c0bb6e953037cd96556fdc0f13aba
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
