Gehel has submitted this change and it was merged.
Change subject: service::configuration: Set the default log_dir to /srv/log
......................................................................
service::configuration: Set the default log_dir to /srv/log
Most services that use service::configuration store their logs in
/srv/log (changed in Hiera), but some still use /var/log. Make the
former the default for uniformity. Another point is that all of these
services are firejail-ed, which makes /var read-only, hence making it
pointless for services to try to log into /var/log.
Also fix a bug whereby service::node assumed
service::configuration::log_dir existed.
Change-Id: I2fd39e72f3b400a1b09320e92fa8105b847ab439
---
M hieradata/role/common/sca.yaml
M hieradata/role/common/scb.yaml
M modules/service/manifests/configuration.pp
M modules/service/manifests/node.pp
4 files changed, 16 insertions(+), 9 deletions(-)
Approvals:
Gehel: Looks good to me, approved
Muehlenhoff: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/hieradata/role/common/sca.yaml b/hieradata/role/common/sca.yaml
index d5d37e8..78e8f29 100644
--- a/hieradata/role/common/sca.yaml
+++ b/hieradata/role/common/sca.yaml
@@ -3,7 +3,6 @@
- sc-admins
- zotero-admin
- apertium-admins
-service::configuration::log_dir: /srv/log
debdeploy::grains:
debdeploy-sca:
value: standard
diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index cef6d88..8b244ea 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -10,7 +10,6 @@
- mobileapps-admin
- changeprop-admin
- ores-admin
-service::configuration::log_dir: /srv/log
graphoid::allowed_domains:
https:
- mediawiki.org
diff --git a/modules/service/manifests/configuration.pp
b/modules/service/manifests/configuration.pp
index c10c056..f6281cf 100644
--- a/modules/service/manifests/configuration.pp
+++ b/modules/service/manifests/configuration.pp
@@ -29,7 +29,7 @@
#
# [*log_dir*]
# Local root log directory. The service's logs will be placed in its
-# subdirectory. Default: /var/log
+# subdirectory. Default: /srv/log
#
# [*use_dev_pkgs*]
# Whether the development packages declared for services should be installed.
@@ -43,7 +43,7 @@
$statsd_port = 8125,
$logstash_host = 'localhost',
$logstash_port = 12201,
- $log_dir = '/var/log',
+ $log_dir = '/srv/log',
$use_dev_pkgs = false,
){
# No op for now.
diff --git a/modules/service/manifests/node.pp
b/modules/service/manifests/node.pp
index 79d2b15..1ca33ea 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -247,12 +247,21 @@
}
if $local_logging {
+ if !defined(File[$::service::configuration::log_dir]) {
+ file { $::service::configuration::log_dir:
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ }
+ }
file { $local_logdir:
- ensure => directory,
- owner => $title,
- group => 'root',
- mode => '0755',
- before => Service[$title],
+ ensure => directory,
+ owner => $title,
+ group => 'root',
+ mode => '0755',
+ before => Service[$title],
+ require => File[$::service::configuration::log_dir],
}
file { "/etc/logrotate.d/${title}":
content => template('service/logrotate.erb'),
--
To view, visit https://gerrit.wikimedia.org/r/294289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fd39e72f3b400a1b09320e92fa8105b847ab439
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
