From 576aa6fa7452023a2b993f90f1708f0f2ac04834 Mon Sep 17 00:00:00 2001 From: jtimberman Date: Mon, 5 Oct 2009 15:37:14 -0600 Subject: [PATCH] cook-189, use 'set_unless' for compatibility, but may switch to 'default' later --- bootstrap/attributes/bootstrap.rb | 38 +++++++++--------- chef/attributes/chef.rb | 48 +++++++++++------------ djbdns/attributes/djbdns.rb | 12 +++--- dynomite/attributes/dynomite.rb | 18 ++++----- ec2/attributes/ec2_recipe_options.rb | 10 ++--- erlang/attributes/erlang.rb | 2 +- gems/attributes/mirror.rb | 6 +-- gems/attributes/server.rb | 6 +-- jira/attributes/jira.rb | 18 ++++----- kickstart/attributes/kickstart.rb | 4 +- maradns/attributes/maradns.rb | 2 +- memcached/attributes/memcached.rb | 6 +-- mysql/attributes/server.rb | 24 ++++++------ nginx/attributes/nginx.rb | 20 +++++----- ntp/attributes/ntp.rb | 8 ++-- openldap/attributes/openldap.rb | 18 ++++----- openvpn/attributes/openvpn.rb | 10 ++--- packages/attributes/packages.rb | 2 +- passenger_apache2/attributes/passenger.rb | 2 +- postfix/attributes/postfix.rb | 26 ++++++------ radiant/attributes/radiant.rb | 12 +++--- rails/attributes/rails.rb | 6 +-- redmine/attributes/redmine.rb | 12 +++--- resolver/attributes/resolver.rb | 4 +- rsyslog/attributes/rsyslog.rb | 6 +-- solr/attributes/solr.rb | 8 ++-- 26 files changed, 164 insertions(+), 164 deletions(-) diff --git a/bootstrap/attributes/bootstrap.rb b/bootstrap/attributes/bootstrap.rb index e5d17be03..17568e848 100644 --- a/bootstrap/attributes/bootstrap.rb +++ b/bootstrap/attributes/bootstrap.rb @@ -21,29 +21,29 @@ chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a 20.times { |i| validation_token << chars[rand(chars.size-1)] } -default[:bootstrap][:chef][:url_type] = "http" -default[:bootstrap][:chef][:init_style] = "runit" -default[:bootstrap][:chef][:path] = "/srv/chef" -default[:bootstrap][:chef][:run_path] = "/var/run/chef" -default[:bootstrap][:chef][:cache_path] = "/#{bootstrap[:chef][:path]}/cache" -default[:bootstrap][:chef][:serve_path] = "/srv/chef" +set_unless[:bootstrap][:chef][:url_type] = "http" +set_unless[:bootstrap][:chef][:init_style] = "runit" +set_unless[:bootstrap][:chef][:path] = "/srv/chef" +set_unless[:bootstrap][:chef][:run_path] = "/var/run/chef" +set_unless[:bootstrap][:chef][:cache_path] = "/#{bootstrap[:chef][:path]}/cache" +set_unless[:bootstrap][:chef][:serve_path] = "/srv/chef" -default[:bootstrap][:chef][:server_version] = "0.7.10" -default[:bootstrap][:chef][:client_version] = "0.7.10" -default[:bootstrap][:chef][:client_interval] = "1800" -default[:bootstrap][:chef][:client_splay] = "20" -default[:bootstrap][:chef][:log_dir] = "/var/log/chef" +set_unless[:bootstrap][:chef][:server_version] = "0.7.10" +set_unless[:bootstrap][:chef][:client_version] = "0.7.10" +set_unless[:bootstrap][:chef][:client_interval] = "1800" +set_unless[:bootstrap][:chef][:client_splay] = "20" +set_unless[:bootstrap][:chef][:log_dir] = "/var/log/chef" case bootstrap[:chef][:init_style] when "runit" - default[:bootstrap][:chef][:client_log] = "STDOUT" - default[:bootstrap][:chef][:server_log] = "STDOUT" - default[:bootstrap][:chef][:indexer_log] = "STDOUT" + set_unless[:bootstrap][:chef][:client_log] = "STDOUT" + set_unless[:bootstrap][:chef][:server_log] = "STDOUT" + set_unless[:bootstrap][:chef][:indexer_log] = "STDOUT" else - default[:bootstrap][:chef][:client_log] = "#{bootstrap[:chef][:log_dir]}/client.log" - default[:bootstrap][:chef][:server_log] = "#{bootstrap[:chef][:log_dir]}/server.log" - default[:bootstrap][:chef][:indexer_log] = "#{bootstrap[:chef][:log_dir]}/indexer.log" + set_unless[:bootstrap][:chef][:client_log] = "#{bootstrap[:chef][:log_dir]}/client.log" + set_unless[:bootstrap][:chef][:server_log] = "#{bootstrap[:chef][:log_dir]}/server.log" + set_unless[:bootstrap][:chef][:indexer_log] = "#{bootstrap[:chef][:log_dir]}/indexer.log" end -default[:bootstrap][:chef][:server_fqdn] = domain ? "chef.#{domain}" : "chef" -default[:bootstrap][:chef][:server_token] = validation_token +set_unless[:bootstrap][:chef][:server_fqdn] = domain ? "chef.#{domain}" : "chef" +set_unless[:bootstrap][:chef][:server_token] = validation_token diff --git a/chef/attributes/chef.rb b/chef/attributes/chef.rb index d16b582f4..e91edd91f 100644 --- a/chef/attributes/chef.rb +++ b/chef/attributes/chef.rb @@ -21,40 +21,40 @@ chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a 20.times { |i| validation_token << chars[rand(chars.size-1)] } -default[:chef][:url_type] = "http" -default[:chef][:init_style] = "runit" +set_unless[:chef][:url_type] = "http" +set_unless[:chef][:init_style] = "runit" case platform when "openbsd","freebsd" - default[:chef][:path] = "/var/chef" - default[:chef][:run_path] = "/var/run" - default[:chef][:cache_path] = "/var/chef/cache" - default[:chef][:serve_path] = "/var/chef" + set_unless[:chef][:path] = "/var/chef" + set_unless[:chef][:run_path] = "/var/run" + set_unless[:chef][:cache_path] = "/var/chef/cache" + set_unless[:chef][:serve_path] = "/var/chef" else - default[:chef][:path] = "/srv/chef" - default[:chef][:run_path] = "/var/run/chef" - default[:chef][:cache_path] = "#{chef[:path]}/cache" - default[:chef][:serve_path] = "/srv/chef" + set_unless[:chef][:path] = "/srv/chef" + set_unless[:chef][:run_path] = "/var/run/chef" + set_unless[:chef][:cache_path] = "#{chef[:path]}/cache" + set_unless[:chef][:serve_path] = "/srv/chef" end -default[:chef][:server_version] = "0.7.10" -default[:chef][:client_version] = "0.7.10" -default[:chef][:client_interval] = "1800" -default[:chef][:client_splay] = "20" -default[:chef][:log_dir] = "/var/log/chef" +set_unless[:chef][:server_version] = "0.7.10" +set_unless[:chef][:client_version] = "0.7.10" +set_unless[:chef][:client_interval] = "1800" +set_unless[:chef][:client_splay] = "20" +set_unless[:chef][:log_dir] = "/var/log/chef" case chef[:init_style] when "runit" - default[:chef][:client_log] = "STDOUT" - default[:chef][:indexer_log] = "STDOUT" - default[:chef][:server_log] = "STDOUT" + set_unless[:chef][:client_log] = "STDOUT" + set_unless[:chef][:indexer_log] = "STDOUT" + set_unless[:chef][:server_log] = "STDOUT" else - default[:chef][:client_log] = "#{chef[:log_dir]}/client.log" - default[:chef][:indexer_log] = "#{chef[:log_dir]}/indexer.log" - default[:chef][:server_log] = "#{chef[:log_dir]}/server.log" + set_unless[:chef][:client_log] = "#{chef[:log_dir]}/client.log" + set_unless[:chef][:indexer_log] = "#{chef[:log_dir]}/indexer.log" + set_unless[:chef][:server_log] = "#{chef[:log_dir]}/server.log" end -default[:chef][:server_fqdn] = domain ? "chef.#{domain}" : "chef" -default[:chef][:server_token] = validation_token -default[:chef][:server_ssl_req] = "/C=US/ST=Several/L=Locality/O=Example/OU=Operations/" + +set_unless[:chef][:server_fqdn] = domain ? "chef.#{domain}" : "chef" +set_unless[:chef][:server_token] = validation_token +set_unless[:chef][:server_ssl_req] = "/C=US/ST=Several/L=Locality/O=Example/OU=Operations/" + "CN=#{chef[:server_fqdn]}/emailAddress=ops@#{domain}" diff --git a/djbdns/attributes/djbdns.rb b/djbdns/attributes/djbdns.rb index 752b69457..68f2fb775 100644 --- a/djbdns/attributes/djbdns.rb +++ b/djbdns/attributes/djbdns.rb @@ -19,13 +19,13 @@ # limitations under the License. # -default[:djbdns][:tinydns_ipaddress] = "127.0.0.1" -default[:djbdns][:tinydns_internal_ipaddress] = "127.0.0.1" -default[:djbdns][:public_dnscache_ipaddress] = ipaddress -default[:djbdns][:axfrdns_ipaddress] = "127.0.0.1" +set_unless[:djbdns][:tinydns_ipaddress] = "127.0.0.1" +set_unless[:djbdns][:tinydns_internal_ipaddress] = "127.0.0.1" +set_unless[:djbdns][:public_dnscache_ipaddress] = ipaddress +set_unless[:djbdns][:axfrdns_ipaddress] = "127.0.0.1" -default[:djbdns][:public_dnscache_allowed_networks] = [ipaddress.split(".")[0,2].join(".")] -default[:djbdns][:tinydns_internal_resolved_domain] = domain +set_unless[:djbdns][:public_dnscache_allowed_networks] = [ipaddress.split(".")[0,2].join(".")] +set_unless[:djbdns][:tinydns_internal_resolved_domain] = domain case platform when "ubuntu" diff --git a/dynomite/attributes/dynomite.rb b/dynomite/attributes/dynomite.rb index 4a32be591..a72682b95 100644 --- a/dynomite/attributes/dynomite.rb +++ b/dynomite/attributes/dynomite.rb @@ -17,15 +17,15 @@ # limitations under the License. # -default[:dynomite][:master] = false -default[:dynomite][:cluster_name] = "dynomite" -default[:dynomite][:data_dir] = "/var/db/dynomite" -default[:dynomite][:num_nodes] = 1 -default[:dynomite][:node_name] = hostname -default[:dynomite][:ascii_port] = 11221 -default[:dynomite][:thrift_port] = 11222 -default[:dynomite][:web_port] = 1180 +set_unless[:dynomite][:master] = false +set_unless[:dynomite][:cluster_name] = "dynomite" +set_unless[:dynomite][:data_dir] = "/var/db/dynomite" +set_unless[:dynomite][:num_nodes] = 1 +set_unless[:dynomite][:node_name] = hostname +set_unless[:dynomite][:ascii_port] = 11221 +set_unless[:dynomite][:thrift_port] = 11222 +set_unless[:dynomite][:web_port] = 1180 master_node = search(:node, "dynomite_master:true", "fqdn").first -default[:dynomite][:join_node] = master_node +set_unless[:dynomite][:join_node] = master_node diff --git a/ec2/attributes/ec2_recipe_options.rb b/ec2/attributes/ec2_recipe_options.rb index 1f3bf9553..77b23ce72 100644 --- a/ec2/attributes/ec2_recipe_options.rb +++ b/ec2/attributes/ec2_recipe_options.rb @@ -17,11 +17,11 @@ # limitations under the License. # -default[:ec2opts][:lvm][:use_ephemeral] = true -default[:ec2opts][:lvm][:ephemeral_mountpoint] = "/mnt" -default[:ec2opts][:lvm][:ephemeral_volume_group] = "ephemeral" -default[:ec2opts][:lvm][:ephemeral_logical_volume] = "store" -default[:ec2opts][:lvm][:ephemeral_devices] = { +set_unless[:ec2opts][:lvm][:use_ephemeral] = true +set_unless[:ec2opts][:lvm][:ephemeral_mountpoint] = "/mnt" +set_unless[:ec2opts][:lvm][:ephemeral_volume_group] = "ephemeral" +set_unless[:ec2opts][:lvm][:ephemeral_logical_volume] = "store" +set_unless[:ec2opts][:lvm][:ephemeral_devices] = { "m1.small" => [ "/dev/sda2" ], "m1.large" => [ "/dev/sdb", "/dev/sdc" ], "m1.xlarge" => [ "/dev/sdb", "/dev/sdc", "/dev/sdd", "/dev/sde" ], diff --git a/erlang/attributes/erlang.rb b/erlang/attributes/erlang.rb index f084f8ce5..cf9c694a5 100644 --- a/erlang/attributes/erlang.rb +++ b/erlang/attributes/erlang.rb @@ -1 +1 @@ -default[:erlang][:gui_tools] = false +set_unless[:erlang][:gui_tools] = false diff --git a/gems/attributes/mirror.rb b/gems/attributes/mirror.rb index 3f2f2bf4c..0ca122687 100644 --- a/gems/attributes/mirror.rb +++ b/gems/attributes/mirror.rb @@ -1,3 +1,3 @@ -default[:gem_server][:rf_virtual_host_name] = "rubyforge.#{domain}" -default[:gem_server][:rf_virtual_host_alias] = "rubyforge" -default[:gem_server][:rf_directory] = "/srv/rubyforge" +set_unless[:gem_server][:rf_virtual_host_name] = "rubyforge.#{domain}" +set_unless[:gem_server][:rf_virtual_host_alias] = "rubyforge" +set_unless[:gem_server][:rf_directory] = "/srv/rubyforge" diff --git a/gems/attributes/server.rb b/gems/attributes/server.rb index d877461f9..e4e192b76 100644 --- a/gems/attributes/server.rb +++ b/gems/attributes/server.rb @@ -1,3 +1,3 @@ -default[:gem_server][:virtual_host_name] = "gems.#{domain}" -default[:gem_server][:virtual_host_alias] = "gems" -default[:gem_server][:directory] = "/srv/gems" +set_unless[:gem_server][:virtual_host_name] = "gems.#{domain}" +set_unless[:gem_server][:virtual_host_alias] = "gems" +set_unless[:gem_server][:directory] = "/srv/gems" diff --git a/jira/attributes/jira.rb b/jira/attributes/jira.rb index 76e2e9715..7e86b26f3 100644 --- a/jira/attributes/jira.rb +++ b/jira/attributes/jira.rb @@ -17,13 +17,13 @@ # limitations under the License. # -default[:jira][:virtual_host_name] = "jira.#{domain}" -default[:jira][:virtual_host_alias] = "jira.#{domain}" +set_unless[:jira][:virtual_host_name] = "jira.#{domain}" +set_unless[:jira][:virtual_host_alias] = "jira.#{domain}" # type-version-standalone -default[:jira][:version] = "enterprise-3.13.1" -default[:jira][:install_path] = "/srv/jira" -default[:jira][:run_user] = "www-data" -default[:jira][:database] = "mysql" -default[:jira][:database_host] = "localhost" -default[:jira][:database_user] = "jira" -default[:jira][:database_password] = "change_me" +set_unless[:jira][:version] = "enterprise-3.13.1" +set_unless[:jira][:install_path] = "/srv/jira" +set_unless[:jira][:run_user] = "www-data" +set_unless[:jira][:database] = "mysql" +set_unless[:jira][:database_host] = "localhost" +set_unless[:jira][:database_user] = "jira" +set_unless[:jira][:database_password] = "change_me" diff --git a/kickstart/attributes/kickstart.rb b/kickstart/attributes/kickstart.rb index c8422b04c..fa654dbb7 100644 --- a/kickstart/attributes/kickstart.rb +++ b/kickstart/attributes/kickstart.rb @@ -1,2 +1,2 @@ -default[:kickstart][:rootpw] = nil -default[:kickstart][:virtual_host_name] = "build.#{domain}" +set_unless[:kickstart][:rootpw] = nil +set_unless[:kickstart][:virtual_host_name] = "build.#{domain}" diff --git a/maradns/attributes/maradns.rb b/maradns/attributes/maradns.rb index f40c466dd..28d3cdd6f 100644 --- a/maradns/attributes/maradns.rb +++ b/maradns/attributes/maradns.rb @@ -1 +1 @@ -default[:maradns][:recursive_acl] = "" +set_unless[:maradns][:recursive_acl] = "" diff --git a/memcached/attributes/memcached.rb b/memcached/attributes/memcached.rb index 1518e48ad..61623eff5 100644 --- a/memcached/attributes/memcached.rb +++ b/memcached/attributes/memcached.rb @@ -1,3 +1,3 @@ -default[:memcached][:memory] = 64 -default[:memcached][:port] = 11211 -default[:memcached][:user] = "nobody" +set_unless[:memcached][:memory] = 64 +set_unless[:memcached][:port] = 11211 +set_unless[:memcached][:user] = "nobody" diff --git a/mysql/attributes/server.rb b/mysql/attributes/server.rb index d75450b2c..a865d3954 100644 --- a/mysql/attributes/server.rb +++ b/mysql/attributes/server.rb @@ -20,17 +20,17 @@ chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a 20.times { |i| db_password << chars[rand(chars.size-1)] } -default[:mysql][:server_root_password] = db_password -default[:mysql][:bind_address] = ipaddress -default[:mysql][:datadir] = "/var/lib/mysql" -default[:mysql][:ec2_path] = "/mnt/mysql" +set_unless[:mysql][:server_root_password] = db_password +set_unless[:mysql][:bind_address] = ipaddress +set_unless[:mysql][:datadir] = "/var/lib/mysql" +set_unless[:mysql][:ec2_path] = "/mnt/mysql" # Tunables -default[:mysql][:tunable][:key_buffer] = "250M" -default[:mysql][:tunable][:max_connections] = "800" -default[:mysql][:tunable][:wait_timeout] = "180" -default[:mysql][:tunable][:net_read_timeout] = "30" -default[:mysql][:tunable][:net_write_timeout] = "30" -default[:mysql][:tunable][:back_log] = "128" -default[:mysql][:tunable][:table_cache] = "128" -default[:mysql][:tunable][:max_heap_table_size] = "32M" +set_unless[:mysql][:tunable][:key_buffer] = "250M" +set_unless[:mysql][:tunable][:max_connections] = "800" +set_unless[:mysql][:tunable][:wait_timeout] = "180" +set_unless[:mysql][:tunable][:net_read_timeout] = "30" +set_unless[:mysql][:tunable][:net_write_timeout] = "30" +set_unless[:mysql][:tunable][:back_log] = "128" +set_unless[:mysql][:tunable][:table_cache] = "128" +set_unless[:mysql][:tunable][:max_heap_table_size] = "32M" diff --git a/nginx/attributes/nginx.rb b/nginx/attributes/nginx.rb index 2ab096ad0..2e878ad2b 100644 --- a/nginx/attributes/nginx.rb +++ b/nginx/attributes/nginx.rb @@ -11,11 +11,11 @@ set[:nginx][:binary] = "/usr/sbin/nginx" end -default[:nginx][:gzip] = "on" -default[:nginx][:gzip_http_version] = "1.0" -default[:nginx][:gzip_comp_level] = "2" -default[:nginx][:gzip_proxied] = "any" -default[:nginx][:gzip_types] = [ +set_unless[:nginx][:gzip] = "on" +set_unless[:nginx][:gzip_http_version] = "1.0" +set_unless[:nginx][:gzip_comp_level] = "2" +set_unless[:nginx][:gzip_proxied] = "any" +set_unless[:nginx][:gzip_types] = [ "text/plain", "text/html", "text/css", @@ -26,8 +26,8 @@ "text/javascript" ] -default[:nginx][:keepalive] = "on" -default[:nginx][:keepalive_timeout] = 65 -default[:nginx][:worker_processes] = 1 -default[:nginx][:worker_connections] = 1024 -default[:nginx][:server_names_hash_bucket_size] = 64 +set_unless[:nginx][:keepalive] = "on" +set_unless[:nginx][:keepalive_timeout] = 65 +set_unless[:nginx][:worker_processes] = 1 +set_unless[:nginx][:worker_connections] = 1024 +set_unless[:nginx][:server_names_hash_bucket_size] = 64 diff --git a/ntp/attributes/ntp.rb b/ntp/attributes/ntp.rb index dd1331e0e..0c632aaa9 100644 --- a/ntp/attributes/ntp.rb +++ b/ntp/attributes/ntp.rb @@ -1,9 +1,9 @@ case platform when "ubuntu","debian" - default[:ntp][:service] = "ntp" + set_unless[:ntp][:service] = "ntp" when "redhat","centos","fedora" - default[:ntp][:service] = "ntpd" + set_unless[:ntp][:service] = "ntpd" end -default[:ntp][:is_server] = false -default[:ntp][:servers] = ["0.us.pool.ntp.org", "1.us.pool.ntp.org"] +set_unless[:ntp][:is_server] = false +set_unless[:ntp][:servers] = ["0.us.pool.ntp.org", "1.us.pool.ntp.org"] diff --git a/openldap/attributes/openldap.rb b/openldap/attributes/openldap.rb index 4d8585ea5..cc2febf4c 100644 --- a/openldap/attributes/openldap.rb +++ b/openldap/attributes/openldap.rb @@ -17,8 +17,8 @@ # if domain.length > 0 - default[:openldap][:basedn] = "dc=#{domain.split('.').join(",dc=")}" - default[:openldap][:server] = "ldap.#{domain}" + set_unless[:openldap][:basedn] = "dc=#{domain.split('.').join(",dc=")}" + set_unless[:openldap][:server] = "ldap.#{domain}" end openldap[:rootpw] = nil @@ -47,15 +47,15 @@ if openldap[:slapd_type] == "slave" master = search(:nodes, 'openldap_slapd_type:master') - default[:openldap][:slapd_master] = master - default[:openldap][:slapd_replpw] = nil - default[:openldap][:slapd_rid] = 102 + set_unless[:openldap][:slapd_master] = master + set_unless[:openldap][:slapd_replpw] = nil + set_unless[:openldap][:slapd_rid] = 102 end # Auth settings for Apache. if openldap[:basedn] && openldap[:server] - default[:openldap][:auth_type] = "openldap" - default[:openldap][:auth_binddn] = "ou=people,#{openldap[:basedn]}" - default[:openldap][:auth_bindpw] = nil - default[:openldap][:auth_url] = "ldap://#{openldap[:server]}/#{openldap[:auth_binddn]}?uid?sub?(objecctClass=*)" + set_unless[:openldap][:auth_type] = "openldap" + set_unless[:openldap][:auth_binddn] = "ou=people,#{openldap[:basedn]}" + set_unless[:openldap][:auth_bindpw] = nil + set_unless[:openldap][:auth_url] = "ldap://#{openldap[:server]}/#{openldap[:auth_binddn]}?uid?sub?(objecctClass=*)" end diff --git a/openvpn/attributes/openvpn.rb b/openvpn/attributes/openvpn.rb index dffb7d410..5b942ae18 100644 --- a/openvpn/attributes/openvpn.rb +++ b/openvpn/attributes/openvpn.rb @@ -17,8 +17,8 @@ # limitations under the License. # -default[:openvpn][:local] = ipaddress -default[:openvpn][:proto] = "udp" -default[:openvpn][:type] = "server" -default[:openvpn][:subnet] = "10.8.0.0" -default[:openvpn][:netmask] = "255.255.0.0" +set_unless[:openvpn][:local] = ipaddress +set_unless[:openvpn][:proto] = "udp" +set_unless[:openvpn][:type] = "server" +set_unless[:openvpn][:subnet] = "10.8.0.0" +set_unless[:openvpn][:netmask] = "255.255.0.0" diff --git a/packages/attributes/packages.rb b/packages/attributes/packages.rb index 94158afef..662eb7cf3 100644 --- a/packages/attributes/packages.rb +++ b/packages/attributes/packages.rb @@ -1,3 +1,3 @@ # Toggle for recipes to determine if we should rely on distribution packages # or gems. -default[:packages][:dist_only] = false +set_unless[:packages][:dist_only] = false diff --git a/passenger_apache2/attributes/passenger.rb b/passenger_apache2/attributes/passenger.rb index 023bd17ed..72f2116c5 100644 --- a/passenger_apache2/attributes/passenger.rb +++ b/passenger_apache2/attributes/passenger.rb @@ -1,3 +1,3 @@ -default[:passenger][:version] = "2.2.5" +set_unless[:passenger][:version] = "2.2.5" set[:passenger][:root_path] = "#{languages[:ruby][:gems_dir]}/gems/passenger-#{passenger[:version]}" set[:passenger][:module_path] = "#{passenger[:root_path]}/ext/apache2/mod_passenger.so" diff --git a/postfix/attributes/postfix.rb b/postfix/attributes/postfix.rb index d9ff0e332..afdeb7cc0 100644 --- a/postfix/attributes/postfix.rb +++ b/postfix/attributes/postfix.rb @@ -1,17 +1,17 @@ -default[:postfix][:mail_type] = "client" -default[:postfix][:myhostname] = fqdn -default[:postfix][:mydomain] = domain -default[:postfix][:myorigin] = "$myhostname" -default[:postfix][:relayhost] = "" -default[:postfix][:mail_relay_networks] = "127.0.0.0/8" +set_unless[:postfix][:mail_type] = "client" +set_unless[:postfix][:myhostname] = fqdn +set_unless[:postfix][:mydomain] = domain +set_unless[:postfix][:myorigin] = "$myhostname" +set_unless[:postfix][:relayhost] = "" +set_unless[:postfix][:mail_relay_networks] = "127.0.0.0/8" -default[:postfix][:smtp_sasl_auth_enable] = "no" +set_unless[:postfix][:smtp_sasl_auth_enable] = "no" if postfix[:smtp_sasl_auth_enable] == "yes" - default[:postfix][:smtp_sasl_password_maps] = "hash:/etc/postfix/sasl_passwd" - default[:postfix][:smtp_sasl_security_options] = "noanonymous" - default[:postfix][:smtp_tls_cafile] = "/etc/postfix/cacert.pem" - default[:postfix][:smtp_use_tls] = "yes" - default[:postfix][:smtp_sasl_user_name] = "" - default[:postfix][:smtp_sasl_passwd] = "" + set_unless[:postfix][:smtp_sasl_password_maps] = "hash:/etc/postfix/sasl_passwd" + set_unless[:postfix][:smtp_sasl_security_options] = "noanonymous" + set_unless[:postfix][:smtp_tls_cafile] = "/etc/postfix/cacert.pem" + set_unless[:postfix][:smtp_use_tls] = "yes" + set_unless[:postfix][:smtp_sasl_user_name] = "" + set_unless[:postfix][:smtp_sasl_passwd] = "" end diff --git a/radiant/attributes/radiant.rb b/radiant/attributes/radiant.rb index 0c0fcc699..c0aa6296a 100644 --- a/radiant/attributes/radiant.rb +++ b/radiant/attributes/radiant.rb @@ -17,9 +17,9 @@ # limitations under the License. # -default[:radiant][:branch] = "HEAD" -default[:radiant][:migrate] = false -default[:radiant][:migrate_command] = "rake db:migrate" -default[:radiant][:environment] = "production" -default[:radiant][:revision] = "HEAD" -default[:radiant][:action] = "nothing" +set_unless[:radiant][:branch] = "HEAD" +set_unless[:radiant][:migrate] = false +set_unless[:radiant][:migrate_command] = "rake db:migrate" +set_unless[:radiant][:environment] = "production" +set_unless[:radiant][:revision] = "HEAD" +set_unless[:radiant][:action] = "nothing" diff --git a/rails/attributes/rails.rb b/rails/attributes/rails.rb index 94870533c..f3122b76d 100644 --- a/rails/attributes/rails.rb +++ b/rails/attributes/rails.rb @@ -1,3 +1,3 @@ -default[:rails][:version] = false -default[:rails][:environment] = "production" -default[:rails][:max_pool_size] = 4 +set_unless[:rails][:version] = false +set_unless[:rails][:environment] = "production" +set_unless[:rails][:max_pool_size] = 4 diff --git a/redmine/attributes/redmine.rb b/redmine/attributes/redmine.rb index 7968a4dea..5260b6bb0 100644 --- a/redmine/attributes/redmine.rb +++ b/redmine/attributes/redmine.rb @@ -23,10 +23,10 @@ set[:redmine][:dir] = "/srv/redmine-#{redmine[:version]}" -default[:redmine][:dl_id] = "56909" -default[:redmine][:version] = "0.8.4" +set_unless[:redmine][:dl_id] = "56909" +set_unless[:redmine][:version] = "0.8.4" -default[:redmine][:db][:type] = "sqlite" -default[:redmine][:db][:user] = "redmine" -default[:redmine][:db][:password] = db_password -default[:redmine][:db][:hostname] = "localhost" +set_unless[:redmine][:db][:type] = "sqlite" +set_unless[:redmine][:db][:user] = "redmine" +set_unless[:redmine][:db][:password] = db_password +set_unless[:redmine][:db][:hostname] = "localhost" diff --git a/resolver/attributes/resolver.rb b/resolver/attributes/resolver.rb index 17d71c3da..86dbae46e 100644 --- a/resolver/attributes/resolver.rb +++ b/resolver/attributes/resolver.rb @@ -1,2 +1,2 @@ -default[:resolver][:search] = domain -default[:resolver][:nameservers] = [ "" ] +set_unless[:resolver][:search] = domain +set_unless[:resolver][:nameservers] = [ "" ] diff --git a/rsyslog/attributes/rsyslog.rb b/rsyslog/attributes/rsyslog.rb index da58e0d4e..c79897c24 100644 --- a/rsyslog/attributes/rsyslog.rb +++ b/rsyslog/attributes/rsyslog.rb @@ -17,6 +17,6 @@ # limitations under the License. # -default[:rsyslog][:log_dir] = "/srv/rsyslog" -default[:rsyslog][:server] = false -default[:rsyslog][:protocol] = "tcp" +set_unless[:rsyslog][:log_dir] = "/srv/rsyslog" +set_unless[:rsyslog][:server] = false +set_unless[:rsyslog][:protocol] = "tcp" diff --git a/solr/attributes/solr.rb b/solr/attributes/solr.rb index 3927c9844..21b165054 100644 --- a/solr/attributes/solr.rb +++ b/solr/attributes/solr.rb @@ -17,7 +17,7 @@ # limitations under the License. # -default[:solr][:user] = 'solr' -default[:solr][:uid] = 551 -default[:solr][:group] = 'solr' -default[:solr][:gid] = 551 +set_unless[:solr][:user] = 'solr' +set_unless[:solr][:uid] = 551 +set_unless[:solr][:group] = 'solr' +set_unless[:solr][:gid] = 551