Skip to content

Commit

Permalink
Merge branch 'COOK-83'
Browse files Browse the repository at this point in the history
  • Loading branch information
jtimberman committed Aug 27, 2010
2 parents 2564008 + 4b41ed6 commit 7340768
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 69 deletions.
4 changes: 3 additions & 1 deletion memcached/definitions/memcached_instance.rb
Expand Up @@ -19,8 +19,10 @@

define :memcached_instance do
include_recipe "memcached"

runit_service "memcached-#{params[:name]}" do
template_name "memcached"
cookbook "memcached"
options({
:memory => node[:memcached][:memory],
:port => node[:memcached][:port],
Expand Down
134 changes: 67 additions & 67 deletions memcached/metadata.json
@@ -1,81 +1,81 @@
{
"providing": {
},
"attributes": {
"memcached/memory": {
"required": "optional",
"calculated": false,
"choice": [

],
"default": "64",
"type": "string",
"recipes": [
"name": "memcached",
"description": "Installs memcached and provides a define to set up an instance of memcache via runit",
"long_description": "= DESCRIPTION:\n\nInstalls memcached and provides a define to set up an instance of memcache via runit.\n\n= REQUIREMENTS:\n\n== Platform:\n\nTested on Ubuntu 8.10-9.10. Uses the memcached init script by default. A runit service can be set up for instances using the included define.\n\n== Cookbooks:\n\nOpscode cookbooks, http://github.com/opscode/cookbooks/tree/master:\n\n* runit\n\n= ATTRIBUTES: \n\nThe following are node attributes passed to the template for the runit service.\n\n* memcached[:memory] - maximum memory for memcached instances.\n* memcached[:user] - user to run memcached as.\n* memcached[:port] - port for memcached to listen on.\n\n= USAGE:\n\nSimply set the attributes and it will configure the /etc/memcached.conf file. If you want to use multiple memcached instances, you'll need to modify the recipe to disable the startup script and the template in the default recipe.\n\nUse the define, memcached_instance, to set up a runit service for the named memcached instance.\n\n memcached_instance \"myproj\" \n\n= LICENSE and AUTHOR:\n\nAuthor:: Joshua Timberman (<joshua@opscode.com>)\nAuthor:: Joshua Sierles (<joshua@37signals.com>)\n\nCopyright:: 2009, Opscode, Inc\nCopyright:: 2009, 37signals\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
"maintainer": "Opscode, Inc.",
"maintainer_email": "cookbooks@opscode.com",
"license": "Apache 2.0",
"platforms": {
"ubuntu": [

],
"description": "Memory allocated for memcached instance",
"display_name": "Memcached Memory"
},
"memcached/user": {
"required": "optional",
"calculated": false,
"choice": [
],
"debian": [

],
"default": "nobody",
"type": "string",
"recipes": [
]
},
"dependencies": {
"runit": [

],
"description": "User to run memcached instance as",
"display_name": "Memcached User"
},
"memcached/port": {
"required": "optional",
"calculated": false,
"choice": [
]
},
"recommendations": {
},
"suggestions": {
},
"conflicting": {
},
"providing": {
},
"replacing": {
},
"attributes": {
"memcached/memory": {
"display_name": "Memcached Memory",
"description": "Memory allocated for memcached instance",
"default": "64",
"choice": [

],
"default": "11211",
"type": "string",
"recipes": [
],
"calculated": false,
"type": "string",
"required": "optional",
"recipes": [

],
"description": "Port to use for memcached instance",
"display_name": "Memcached Port"
}
},
"replacing": {
]
},
"dependencies": {
"runit": [
"memcached/port": {
"display_name": "Memcached Port",
"description": "Port to use for memcached instance",
"default": "11211",
"choice": [

],
"calculated": false,
"type": "string",
"required": "optional",
"recipes": [

]
},
"groupings": {
},
"recommendations": {
},
"platforms": {
"debian": [
"memcached/user": {
"display_name": "Memcached User",
"description": "User to run memcached instance as",
"default": "nobody",
"choice": [

],
"ubuntu": [
"calculated": false,
"type": "string",
"required": "optional",
"recipes": [

]
},
"license": "Apache 2.0",
"version": "0.10.2",
"maintainer": "Opscode, Inc.",
"suggestions": {
},
"recipes": {
"memcached": "Installs and configures memcached"
},
"maintainer_email": "cookbooks@opscode.com",
"name": "memcached",
"conflicting": {
},
"description": "Installs memcached and provides a define to set up an instance of memcache via runit",
"long_description": "= DESCRIPTION:\n\nInstalls memcached and provides a define to set up an instance of memcache via runit.\n\n= REQUIREMENTS:\n\n== Platform:\n\nTested on Ubuntu 8.10-9.10. Uses the memcached init script by default. A runit service can be set up for instances using the included define.\n\n== Cookbooks:\n\nOpscode cookbooks, http://github.com/opscode/cookbooks/tree/master:\n\n* runit\n\n= ATTRIBUTES: \n\nThe following are node attributes passed to the template for the runit service.\n\n* memcached[:memory] - maximum memory for memcached instances.\n* memcached[:user] - user to run memcached as.\n* memcached[:port] - port for memcached to listen on.\n\n= USAGE:\n\nSimply set the attributes and it will configure the /etc/memcached.conf file. If you want to use multiple memcached instances, you'll need to modify the recipe to disable the startup script and the template in the default recipe.\n\nUse the define, memcached_instance, to set up a runit service for the named memcached instance.\n\n memcached_instance \"myproj\" \n\n= LICENSE and AUTHOR:\n\nAuthor:: Joshua Timberman (<joshua@opscode.com>)\nAuthor:: Joshua Sierles (<joshua@37signals.com>)\n\nCopyright:: 2009, Opscode, Inc\nCopyright:: 2009, 37signals\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n"
}
}
},
"groupings": {
},
"recipes": {
"memcached": "Installs and configures memcached"
},
"version": "0.10.3"
}
2 changes: 1 addition & 1 deletion memcached/metadata.rb
Expand Up @@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs memcached and provides a define to set up an instance of memcache via runit"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
version "0.10.2"
version "0.10.3"
depends "runit"

recipe "memcached", "Installs and configures memcached"
Expand Down

0 comments on commit 7340768

Please sign in to comment.