Merge pull request #1 from boxen/switch-to-dev

WIP: Switch to dev.elasticsearch
boxen · Jan 21, 2013 · 7eb7b22 · 7eb7b22
2 parents 8401396 + 3fe08ab
commit 7eb7b22
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -23,13 +23,13 @@
   file { $configfile:
     content => template('elasticsearch/elasticsearch.yml.erb'),
     require => File[$configdir],
-    notify  => Service['com.boxen.elasticsearch'],
+    notify  => Service['dev.elasticsearch'],
   }
 
-  file { '/Library/LaunchDaemons/com.boxen.elasticsearch.plist':
-    content => template('elasticsearch/com.boxen.elasticsearch.plist.erb'),
+  file { '/Library/LaunchDaemons/dev.elasticsearch.plist':
+    content => template('elasticsearch/dev.elasticsearch.plist.erb'),
     group   => 'wheel',
-    notify  => Service['com.boxen.elasticsearch'],
+    notify  => Service['dev.elasticsearch'],
     owner   => 'root'
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -9,14 +9,18 @@
 
   package { 'boxen/brews/elasticsearch':
     ensure => '0.19.9-boxen1',
-    notify => Service['com.boxen.elasticsearch']
+    notify => Service['dev.elasticsearch']
   }
 
-  service { 'com.boxen.elasticsearch':
+  service { 'dev.elasticsearch':
     ensure  => running,
     require => Package['boxen/brews/elasticsearch']
   }
 
+  service { 'com.boxen.elasticsearch': # replaced by dev.elasticsearch
+    before => Service['dev.elasticsearch'],
+    enable => false
+  }
 
   file { "${boxen::config::envdir}/elasticsearch.sh":
     content => template('elasticsearch/env.sh.erb'),

diff --git a/spec/classes/elasticsearch_config_spec.rb b/spec/classes/elasticsearch_config_spec.rb
@@ -24,15 +24,15 @@
     should contain_file("#{configdir}/elasticsearch.yml").with({
       :content => File.read('spec/fixtures/elasticsearch.yml'),
       :require => "File[#{configdir}]",
-      :notify  => 'Service[com.boxen.elasticsearch]',
+      :notify  => 'Service[dev.elasticsearch]',
     })
   end
 
   it do
-    should contain_file('/Library/LaunchDaemons/com.boxen.elasticsearch.plist').with({
-      :content => File.read('spec/fixtures/com.boxen.elasticsearch.plist'),
+    should contain_file('/Library/LaunchDaemons/dev.elasticsearch.plist').with({
+      :content => File.read('spec/fixtures/dev.elasticsearch.plist'),
       :group   => 'wheel',
-      :notify  => 'Service[com.boxen.elasticsearch]',
+      :notify  => 'Service[dev.elasticsearch]',
       :owner   => 'root',
     })
   end

diff --git a/spec/classes/elasticsearch_spec.rb b/spec/classes/elasticsearch_spec.rb
@@ -13,12 +13,12 @@
   it do
     should contain_package('boxen/brews/elasticsearch').with({
       :ensure => '0.19.9-boxen1',
-      :notify => 'Service[com.boxen.elasticsearch]',
+      :notify => 'Service[dev.elasticsearch]',
     })
   end
 
   it do
-    should contain_service('com.boxen.elasticsearch').with({
+    should contain_service('dev.elasticsearch').with({
       :ensure  => 'running',
       :require => 'Package[boxen/brews/elasticsearch]',
     })

diff --git a/spec/fixtures/com.boxen.elasticsearch.plist → spec/fixtures/dev.elasticsearch.plist b/spec/fixtures/com.boxen.elasticsearch.plist → spec/fixtures/dev.elasticsearch.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
   <dict>
     <key>Label</key>
-    <string>com.boxen.elasticsearch</string>
+    <string>dev.elasticsearch</string>
 
     <key>Boxen</key>
     <dict>

diff --git a/templates/com.boxen.elasticsearch.plist.erb → templates/dev.elasticsearch.plist.erb b/templates/com.boxen.elasticsearch.plist.erb → templates/dev.elasticsearch.plist.erb
@@ -3,7 +3,7 @@
 <plist version="1.0">
   <dict>
     <key>Label</key>
-    <string>com.boxen.elasticsearch</string>
+    <string>dev.elasticsearch</string>
 
     <key>Boxen</key>
     <dict>