Faidon Liambotis has submitted this change and it was merged.
Change subject: miredo: convert into a module
......................................................................
miredo: convert into a module
Change-Id: I5c0eac593a143b00e72a47d443cfe9d64c627af0
---
D manifests/misc/miredo.pp
M manifests/role/ipv6relay.pp
R modules/miredo/files/miredo.conf
A modules/miredo/manifests/init.pp
4 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/miredo.pp b/manifests/misc/miredo.pp
deleted file mode 100644
index 4181f01..0000000
--- a/manifests/misc/miredo.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-class misc::miredo {
-
- package { 'miredo':
- ensure => installed;
- }
-
- file { "/etc/miredo.conf":
- owner => root,
- group => root,
- mode => 0444,
- require => Package['miredo'],
- source => 'puppet:///files/miredo/miredo.conf',
- }
-
- service { 'miredo':
- ensure => running,
- enable => true,
- hasstatus => false,
- require => Package['miredo'];
- }
-
-}
diff --git a/manifests/role/ipv6relay.pp b/manifests/role/ipv6relay.pp
index 80fd304..4a59eca 100644
--- a/manifests/role/ipv6relay.pp
+++ b/manifests/role/ipv6relay.pp
@@ -21,7 +21,7 @@
}
# Teredo
- include misc::miredo
+ include miredo
# 6to4
interface::tun6to4 { 'tun6to4': }
diff --git a/files/miredo/miredo.conf b/modules/miredo/files/miredo.conf
similarity index 100%
rename from files/miredo/miredo.conf
rename to modules/miredo/files/miredo.conf
diff --git a/modules/miredo/manifests/init.pp b/modules/miredo/manifests/init.pp
new file mode 100644
index 0000000..3a161c2
--- /dev/null
+++ b/modules/miredo/manifests/init.pp
@@ -0,0 +1,22 @@
+class miredo {
+
+ package { 'miredo':
+ ensure => installed,
+ }
+
+ file { '/etc/miredo.conf':
+ owner => root,
+ group => root,
+ mode => '0444',
+ require => Package['miredo'],
+ source => 'puppet:///modules/miredo/files/miredo.conf',
+ }
+
+ service { 'miredo':
+ ensure => running,
+ enable => true,
+ hasstatus => false,
+ require => Package['miredo'],
+ subscribe => File['/etc/miredo.conf'],
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/87186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c0eac593a143b00e72a47d443cfe9d64c627af0
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <matanya.mo...@gmail.com>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
