summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-05 23:08:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-05 23:08:33 -0300
commit2b19d3657216262cb179d2aa5609f207f03bd768 (patch)
treea51f5367e98fc3807f5f210d19ed70f8e5f16232
parentf977c05da72242179b4a20f0172a0e36b4e365ef (diff)
downloadpuppet-infinoted-2b19d3657216262cb179d2aa5609f207f03bd768.tar.gz
puppet-infinoted-2b19d3657216262cb179d2aa5609f207f03bd768.tar.bz2
Wiping conf.d folder
-rw-r--r--files/infinoted.conf (renamed from files/conf.d/infinoted.conf)0
-rw-r--r--files/infinoted.service (renamed from files/conf.d/infinoted.service)0
-rw-r--r--manifests/init.pp6
3 files changed, 3 insertions, 3 deletions
diff --git a/files/conf.d/infinoted.conf b/files/infinoted.conf
index 065d063..065d063 100644
--- a/files/conf.d/infinoted.conf
+++ b/files/infinoted.conf
diff --git a/files/conf.d/infinoted.service b/files/infinoted.service
index 94d2d9c..94d2d9c 100644
--- a/files/conf.d/infinoted.service
+++ b/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'],
}
}