Skip to content

Commit

Permalink
Merge branch 'COOK-363'
Browse files Browse the repository at this point in the history
  • Loading branch information
jtimberman committed Apr 15, 2011
2 parents aefe069 + b543615 commit 668a08e
Show file tree
Hide file tree
Showing 3 changed files with 181 additions and 170 deletions.
326 changes: 163 additions & 163 deletions rabbitmq/metadata.json
View file
@@ -1,177 +1,177 @@
{
"providing": {
},
"attributes": {
"rabbitmq/cluster": {
"required": "optional",
"calculated": false,
"choice": [

],
"default": "no",
"type": "string",
"recipes": [

],
"description": "Whether to activate clustering. The default is no.",
"display_name": "RabbitMQ clustering"
},
"rabbitmq/erlang_cookie": {
"required": "optional",
"calculated": false,
"choice": [

],
"type": "string",
"recipes": [

],
"description": "Access cookie for clustering nodes. There is no default.",
"display_name": "RabbitMQ Erlang cookie"
},
"rabbitmq/nodename": {
"required": "optional",
"calculated": false,
"choice": [

],
"default": "rabbit",
"type": "string",
"recipes": [

],
"description": "The Erlang node name for this server. The default is rabbit.",
"display_name": "RabbitMQ Erlang node name"
},
"rabbitmq/mnesiadir": {
"required": "optional",
"calculated": false,
"choice": [

],
"default": "/var/lib/rabbitmq/mnesia",
"type": "string",
"recipes": [

],
"description": "Path to the directory for Mnesia database files. The default is /var/lib/rabbitmq/mnesia.",
"display_name": "RabbitMQ Mnesia database directory"
},
"rabbitmq/cluster_config": {
"required": "optional",
"calculated": false,
"choice": [

],
"default": "/etc/rabbitmq/rabbitmq_cluster.config",
"type": "string",
"recipes": [

],
"description": "Path to the clustering configuration file, if cluster is yes. The default is /etc/rabbitmq/rabbitmq_cluster.config.",
"display_name": "RabbitMQ clustering configuration file"
},
"rabbitmq/logdir": {
"required": "optional",
"calculated": false,
"choice": [

],
"default": "/var/log/rabbitmq",
"type": "string",
"recipes": [

],
"description": "Path to the directory for log files. The default is /var/log/rabbitmq.",
"display_name": "RabbitMQ log directory"
},
"rabbitmq/cluster_disk_nodes": {
"required": "optional",
"calculated": false,
"choice": [

],
"default": [

],
"type": "array",
"recipes": [

],
"description": "Array of member Erlang nodenames for the disk-based storage nodes in the cluster. The default is [].",
"display_name": "RabbitMQ cluster disk nodes"
},
"rabbitmq/address": {
"required": "optional",
"calculated": false,
"choice": [

],
"default": "0.0.0.0",
"type": "string",
"recipes": [

],
"description": "IP address to bind. The default is any.",
"display_name": "RabbitMQ server IP address"
},
"rabbitmq/port": {
"required": "optional",
"calculated": false,
"choice": [

],
"default": "5672",
"type": "string",
"recipes": [

],
"description": "TCP port to bind. The default is 5672.",
"display_name": "RabbitMQ server port"
},
"rabbitmq": {
"required": "optional",
"calculated": false,
"choice": [

],
"type": "hash",
"recipes": [

],
"description": "Hash of RabbitMQ attributes",
"display_name": "RabbitMQ"
}
"name": "rabbitmq",
"description": "Installs and configures RabbitMQ server",
"long_description": "",
"maintainer": "Benjamin Black",
"maintainer_email": "b@b3k.us",
"license": "Apache 2.0",
"platforms": {
"ubuntu": [

],
"debian": [

]
},
"dependencies": {
},
"recommendations": {
},
"suggestions": {
},
"conflicting": {
},
"providing": {
},
"replacing": {
},
"attributes": {
"rabbitmq": {
"display_name": "RabbitMQ",
"description": "Hash of RabbitMQ attributes",
"type": "hash",
"choice": [

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

]
},
"replacing": {
"rabbitmq/nodename": {
"display_name": "RabbitMQ Erlang node name",
"description": "The Erlang node name for this server. The default is rabbit.",
"default": "rabbit",
"choice": [

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

]
},
"dependencies": {
"rabbitmq/address": {
"display_name": "RabbitMQ server IP address",
"description": "IP address to bind. The default is any.",
"default": "0.0.0.0",
"choice": [

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

]
},
"groupings": {
"rabbitmq/port": {
"display_name": "RabbitMQ server port",
"description": "TCP port to bind. The default is 5672.",
"default": "5672",
"choice": [

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

]
},
"recommendations": {
"rabbitmq/logdir": {
"display_name": "RabbitMQ log directory",
"description": "Path to the directory for log files. The default is /var/log/rabbitmq.",
"default": "/var/log/rabbitmq",
"choice": [

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

]
},
"platforms": {
"debian": [
"rabbitmq/mnesiadir": {
"display_name": "RabbitMQ Mnesia database directory",
"description": "Path to the directory for Mnesia database files. The default is /var/lib/rabbitmq/mnesia.",
"default": "/var/lib/rabbitmq/mnesia",
"choice": [

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

]
},
"license": "Apache 2.0",
"version": "0.2.2",
"maintainer": "Benjamin Black",
"suggestions": {
"rabbitmq/cluster": {
"display_name": "RabbitMQ clustering",
"description": "Whether to activate clustering. The default is no.",
"default": "no",
"choice": [

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

]
},
"recipes": {
"rabbitmq::cluster": "Set up RabbitMQ clustering.",
"rabbitmq": "Install and configure RabbitMQ"
"rabbitmq/cluster_config": {
"display_name": "RabbitMQ clustering configuration file",
"description": "Path to the clustering configuration file, if cluster is yes. The default is /etc/rabbitmq/rabbitmq_cluster.config.",
"default": "/etc/rabbitmq/rabbitmq_cluster.config",
"choice": [

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

]
},
"maintainer_email": "b@b3k.us",
"name": "rabbitmq",
"conflicting": {
"rabbitmq/cluster_disk_nodes": {
"display_name": "RabbitMQ cluster disk nodes",
"description": "Array of member Erlang nodenames for the disk-based storage nodes in the cluster. The default is [].",
"default": [

],
"type": "array",
"choice": [

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

]
},
"description": "Installs and configures RabbitMQ server",
"long_description": ""
}
"rabbitmq/erlang_cookie": {
"display_name": "RabbitMQ Erlang cookie",
"description": "Access cookie for clustering nodes. There is no default.",
"choice": [

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

]
}
},
"groupings": {
},
"recipes": {
"rabbitmq": "Install and configure RabbitMQ",
"rabbitmq::cluster": "Set up RabbitMQ clustering."
},
"version": "0.3.0"
}
2 changes: 1 addition & 1 deletion rabbitmq/metadata.rb
View file
Expand Up @@ -2,7 +2,7 @@
maintainer_email "b@b3k.us"
license "Apache 2.0"
description "Installs and configures RabbitMQ server"
version "0.2.2"
version "0.3"
recipe "rabbitmq", "Install and configure RabbitMQ"
recipe "rabbitmq::cluster", "Set up RabbitMQ clustering."

Expand Down
23 changes: 17 additions & 6 deletions rabbitmq/recipes/default.rb
View file
Expand Up @@ -26,10 +26,21 @@
action [ :enable, :start ]
end

template "/etc/rabbitmq/rabbitmq.config" do
source "rabbitmq.config.erb"
owner "root"
group "root"
mode 0644
notifies :restart, resources(:service => "rabbitmq-server")
case node[:platform]
when "ubuntu"
template "/etc/rabbitmq/rabbitmq.conf" do
source "rabbitmq.config.erb"
owner "root"
group "root"
mode 0644
notifies :restart, resources(:service => "rabbitmq-server")
end
else
template "/etc/rabbitmq/rabbitmq.config" do
source "rabbitmq.config.erb"
owner "root"
group "root"
mode 0644
notifies :restart, resources(:service => "rabbitmq-server")
end
end

0 comments on commit 668a08e

Please sign in to comment.