Permalink
Browse files

[COOK-2385] - update for runit_service resource

* Add test cookbook for server configuration
* Set sv_templates false for runit_service
1 parent 2b603e9 commit e3e068b6afc6741683270ad3fc397e5db28b3f2e @jtimberman jtimberman committed Feb 10, 2013
View
1 .gitignore
@@ -2,3 +2,4 @@
.cache
.kitchen
bin
+Gemfile.lock
View
4 metadata.rb
@@ -4,7 +4,7 @@
license "Apache 2.0"
description "Installs git and/or sets up a Git server daemon"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "2.2.0"
+version "2.2.1"
recipe "git", "Installs git"
recipe "git::server", "Sets up a runit_service for git daemon"
recipe "git::source", "Installs git from source"
@@ -19,7 +19,7 @@
depends cookbook
end
-depends "runit", "<= 0.16.2"
+depends "runit", "~> 1.0"
attribute "git/server/base_path",
:display_name => "Git Daemon Base Path",
View
4 recipes/server.rb
@@ -34,7 +34,9 @@
package "git-daemon-run"
- runit_service "git-daemon"
+ runit_service "git-daemon" do
+ sv_templates false
+ end
when "rhel"
package "git-daemon"
View
3 test/kitchen/Kitchenfile
@@ -1,3 +1,4 @@
cookbook "git" do
-
+ configuration "default"
+ configuration "server"
end
View
1 test/kitchen/cookbooks/git_test/README.md
@@ -0,0 +1 @@
+This cookbook is used with test-kitchen to test the parent, git cookbok
View
6 test/kitchen/cookbooks/git_test/metadata.rb
@@ -0,0 +1,6 @@
+name "git"
+maintainer "Opscode, Inc."
+maintainer_email "cookbooks@opscode.com"
+license "Apache 2.0"
+description "This cookbook is used with test-kitchen to test the parent, git cookbok"
+version "1.0.0"
View
20 test/kitchen/cookbooks/git_test/recipes/default.rb
@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: git_test
+# Recipe:: default
+#
+# Copyright 2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe "git::default"
View
20 test/kitchen/cookbooks/git_test/recipes/server.rb
@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: git_test
+# Recipe:: server
+#
+# Copyright 2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe "git::server"

0 comments on commit e3e068b

Please sign in to comment.