John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188611
Change subject: base: move syslogs/remote-syslogs to manifests
......................................................................
base: move syslogs/remote-syslogs to manifests
Change-Id: I6f2293d8d2c276eaa85c8f430be760ca5364aa3e
---
M modules/base/manifests/init.pp
A modules/base/manifests/remote-syslog.pp
A modules/base/manifests/syslogs.pp
3 files changed, 31 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/188611/1
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index f2c8ac4..a204d41 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':
@@ -22,24 +7,6 @@
source => 'puppet:///modules/base/upstart/ttyS0.conf';
}
-}
-
-# 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: }
- }
}
class base {
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..835868a
--- /dev/null
+++ b/modules/base/manifests/syslogs.pp
@@ -0,0 +1,17 @@
+# 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: }
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/188611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f2293d8d2c276eaa85c8f430be760ca5364aa3e
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
