Merge pull request #24 from castiron/bugfix/inconsistent-service-name

Fix inconsistent service name
boxen · Dec 14, 2017 · d341482 · d341482
2 parents 858a354 + 1ded17c
commit d341482
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -16,9 +16,7 @@
 ) {
   require homebrew
 
-  if ! $service_name {
-    $service = "${tld}.dnsmasq"
-  }
+  $service = 'dev.dnsmasq'
 
   file { [$configdir, $logdir, $datadir]:
     ensure => directory,

diff --git a/spec/classes/dnsmasq_spec.rb b/spec/classes/dnsmasq_spec.rb
@@ -67,7 +67,7 @@
 
   context 'given a different tld' do
     let(:tld)         { "vagrant" }
-    let(:service_name) { "#{tld}.dnsmasq" }
+    let(:service_name) { "dev.dnsmasq" }
     let(:params) {{
       'host'       => "127.0.0.1",
       'tld'        => tld,
@@ -84,7 +84,7 @@
         :require => "File[#{configdir}]",
       }).with_content(%r{\naddress=/vagrant/127.0.0.1\nlisten-address=127.0.0.1\n})
 
-      should contain_file('/Library/LaunchDaemons/vagrant.dnsmasq.plist').with({
+      should contain_file('/Library/LaunchDaemons/dev.dnsmasq.plist').with({
         :group   => 'wheel',
         :notify  => "Service[#{service_name}]",
         :owner   => 'root',