From 2b19d3657216262cb179d2aa5609f207f03bd768 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 5 Apr 2013 23:08:33 -0300
Subject: Wiping conf.d folder

---
 files/conf.d/infinoted.conf    | 10 ----------
 files/conf.d/infinoted.service |  9 ---------
 files/infinoted.conf           | 10 ++++++++++
 files/infinoted.service        |  9 +++++++++
 manifests/init.pp              |  6 +++---
 5 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 files/conf.d/infinoted.conf
 delete mode 100644 files/conf.d/infinoted.service
 create mode 100644 files/infinoted.conf
 create mode 100644 files/infinoted.service

diff --git a/files/conf.d/infinoted.conf b/files/conf.d/infinoted.conf
deleted file mode 100644
index 065d063..0000000
--- a/files/conf.d/infinoted.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[program:infinoted]
-command=infinoted
-autostart=true
-autorestart=true
-redirect_stderr=True
-stderr_logfile=/dev/null
-stdout_logfile=/var/log/supervisor/infinoted.log
-user=infinoted
-directory=/var/lib/infinoted
-environment=
diff --git a/files/conf.d/infinoted.service b/files/conf.d/infinoted.service
deleted file mode 100644
index 94d2d9c..0000000
--- a/files/conf.d/infinoted.service
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone='no'?>
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
-  <name replace-wildcards="yes">Infinoted/Gobby server on %h</name>
-  <service>
-    <type>_lobby._tcp</type>
-    <port>6523</port>
-  </service>
-</service-group>
diff --git a/files/infinoted.conf b/files/infinoted.conf
new file mode 100644
index 0000000..065d063
--- /dev/null
+++ b/files/infinoted.conf
@@ -0,0 +1,10 @@
+[program:infinoted]
+command=infinoted
+autostart=true
+autorestart=true
+redirect_stderr=True
+stderr_logfile=/dev/null
+stdout_logfile=/var/log/supervisor/infinoted.log
+user=infinoted
+directory=/var/lib/infinoted
+environment=
diff --git a/files/infinoted.service b/files/infinoted.service
new file mode 100644
index 0000000..94d2d9c
--- /dev/null
+++ b/files/infinoted.service
@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone='no'?>
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+  <name replace-wildcards="yes">Infinoted/Gobby server on %h</name>
+  <service>
+    <type>_lobby._tcp</type>
+    <port>6523</port>
+  </service>
+</service-group>
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'],
   }
 }
-- 
cgit v1.2.3