From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 6 Apr 2013 02:08:33 +0000 (-0300)
Subject: Wiping conf.d folder
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2b19d3657216262cb179d2aa5609f207f03bd768;p=puppet-infinoted.git

Wiping conf.d folder
---

diff --git a/files/conf.d/infinoted.conf b/files/infinoted.conf
similarity index 100%
rename from files/conf.d/infinoted.conf
rename to files/infinoted.conf
diff --git a/files/conf.d/infinoted.service b/files/infinoted.service
similarity index 100%
rename from files/conf.d/infinoted.service
rename to files/infinoted.service
diff --git a/manifests/init.pp b/manifests/init.pp
index 0c4b7aa..a9a8853 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -64,8 +64,8 @@ class infinoted(
   }
 
   supervisor::app { 'infinoted':
-    source  => [ 'puppet:///modules/site_infinoted/conf.d/infinoted.conf',
-                 'puppet:///modules/infinoted/conf.d/infinoted.conf' ],
+    source  => [ 'puppet:///modules/site_infinoted/infinoted.conf',
+                 'puppet:///modules/infinoted/infinoted.conf' ],
     require => [ File['/var/lib/infinoted/.config/infinoted.conf'], Exec['infinoted-gen-keys'] ],
   }
 
@@ -74,7 +74,7 @@ class infinoted(
     owner  => root,
     group  => root,
     mode   => 0644,
-    source => 'puppet:///modules/infinoted/conf.d/infinoted.service',
+    source => 'puppet:///modules/infinoted/infinoted.service',
     notify => Service['avahi-daemon'],
   }
 }