John F. Lewis has uploaded a new change for review. https://gerrit.wikimedia.org/r/188610
Change subject: base: move syslogs/remote-syslogs to manifests ...................................................................... base: move syslogs/remote-syslogs to manifests Change-Id: I83132bc61ae58928f107104addd2c786623d61f7 --- M modules/base/manifests/init.pp A modules/base/manifests/remote-syslog.pp A modules/base/manifests/syslogs.pp 3 files changed, 30 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/10/188610/1 diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp index 1da77fc..8081d8c 100644 --- a/modules/base/manifests/init.pp +++ b/modules/base/manifests/init.pp @@ -1,18 +1,3 @@ -class base::remote-syslog { - if ($::hostname != 'lithium') and ($::instancename != 'deployment-bastion') { - - $syslog_host = $::realm ? { - 'production' => 'syslog.eqiad.wmnet', - 'labs' => "deployment-bastion.${::site}.wmflabs", - } - - rsyslog::conf { 'remote_syslog': - content => "*.info;mail.none;authpriv.none;cron.none @${syslog_host}", - priority => 30, - } - } -} - class base::instance-upstarts { file { '/etc/init/ttyS0.conf': @@ -23,25 +8,6 @@ } } - -# handle syslog permissions (e.g. 'make common logs readable by normal users (RT-2712)') -class base::syslogs ( - $readable = false, - $logfiles = [ 'syslog', 'messages' ], - ) { - - define syslogs::readable() { - - file { "/var/log/${name}": - mode => '0644', - } - } - - if $readable == true { - syslogs::readable { $logfiles: } - } -} - # Don't include this sub class on all hosts yet # NOTE: Policy is DROP by default diff --git a/modules/base/manifests/remote-syslog.pp b/modules/base/manifests/remote-syslog.pp new file mode 100644 index 0000000..f52de0f --- /dev/null +++ b/modules/base/manifests/remote-syslog.pp @@ -0,0 +1,14 @@ +class base::remote-syslog { + if ($::hostname != 'lithium') and ($::instancename != 'deployment-bastion') { + + $syslog_host = $::realm ? { + 'production' => 'syslog.eqiad.wmnet', + 'labs' => "deployment-bastion.${::site}.wmflabs", + } + + rsyslog::conf { 'remote_syslog': + content => "*.info;mail.none;authpriv.none;cron.none @${syslog_host}", + priority => 30, + } + } +} \ No newline at end of file diff --git a/modules/base/manifests/syslogs.pp b/modules/base/manifests/syslogs.pp new file mode 100644 index 0000000..b020572 --- /dev/null +++ b/modules/base/manifests/syslogs.pp @@ -0,0 +1,16 @@ +class base::syslogs ( + $readable = false, + $logfiles = [ 'syslog', 'messages' ], + ) { + + define syslogs::readable() { + + file { "/var/log/${name}": + mode => '0644', + } + } + + if $readable == true { + syslogs::readable { $logfiles: } + } +} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/188610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83132bc61ae58928f107104addd2c786623d61f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: John F. Lewis <johnflewi...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits