John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188612
Change subject: base: move instance-upstarts to manifest
......................................................................
base: move instance-upstarts to manifest
Change-Id: Ie13e9534304af96ca0f7bbf0ae0f5853fd8e75df
---
M modules/base/manifests/init.pp
A modules/base/manifests/instance-upstarts.pp
2 files changed, 10 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/188612/1
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index f2c8ac4..14bf4dc 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,47 +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':
- owner => 'root',
- group => 'root',
- mode => '0444',
- 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 {
include apt
diff --git a/modules/base/manifests/instance-upstarts.pp
b/modules/base/manifests/instance-upstarts.pp
new file mode 100644
index 0000000..e3363b0
--- /dev/null
+++ b/modules/base/manifests/instance-upstarts.pp
@@ -0,0 +1,10 @@
+class base::instance-upstarts {
+
+ file { '/etc/init/ttyS0.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/base/upstart/ttyS0.conf';
+ }
+
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/188612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie13e9534304af96ca0f7bbf0ae0f5853fd8e75df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
