move data under data

algrs · Oct 15, 2010 · 52edb7f · 52edb7f
1 parent 8446528
commit 52edb7f
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 2 deletions.
diff --git a/example/Procfile → data/example/Procfile b/example/Procfile → data/example/Procfile
diff --git a/example/error → data/example/error b/example/error → data/example/error
diff --git a/data/example/log/neverdie.log b/data/example/log/neverdie.log
@@ -0,0 +1,4 @@
+tick
+tick
+./never_die:6:in `sleep': Interrupt
+	from ./never_die:6
diff --git a/example/ticker → data/example/ticker b/example/ticker → data/example/ticker
diff --git a/export/upstart/master.conf.erb → data/export/upstart/master.conf.erb b/export/upstart/master.conf.erb → data/export/upstart/master.conf.erb
diff --git a/export/upstart/process.conf.erb → data/export/upstart/process.conf.erb b/export/upstart/process.conf.erb → data/export/upstart/process.conf.erb
diff --git a/export/upstart/process_master.conf.erb → data/export/upstart/process_master.conf.erb b/export/upstart/process_master.conf.erb → data/export/upstart/process_master.conf.erb
diff --git a/foreman.gemspec b/foreman.gemspec
@@ -9,5 +9,4 @@ Parka::Specification.new do |gem|
 
   gem.executables  = "foreman"
   gem.files       << "man/foreman.1"
-  gem.files       << Dir["export/**/*"]
 end
diff --git a/lib/foreman/export/base.rb b/lib/foreman/export/base.rb
@@ -24,7 +24,7 @@ def say(message)
   end
 
   def export_template(name)
-    File.read(File.expand_path("../../../../export/#{name}", __FILE__))
+    File.read(File.expand_path("../../../../data/export/#{name}", __FILE__))
   end
 
   def write_file(filename, contents)