add smtp attributes, make redmine download idempotent, cleanup recipe

Author: Wouter Westenbrink

attributes/default.rb

@@ -6,9 +6,22 @@
 default[:redmine][:ruby_version] = '1.9.3-p484'
 default[:redmine][:create_db]    = true
 
+# database
 default_unless[:redmine][:db]     = {}
 default[:redmine][:db][:type]     = 'sqlite'
 default[:redmine][:db][:hostname] = 'localhost'
 default[:redmine][:db][:dbname]   = 'redmine'
 default[:redmine][:db][:username] = 'redmine'
 default[:redmine][:db][:password] = 'redmine'
+
+# smtp
+default["redmine"]["smtp"]["enabled"] = false
+default["redmine"]["smtp"]["delivery_method"] = "smtp"
+default["redmine"]["smtp"]["tls"] = nil
+default["redmine"]["smtp"]["enable_starttls_auto"] = true
+default["redmine"]["smtp"]["address"] = "smtp.gmail.com"
+default["redmine"]["smtp"]["domain"] = nil
+default["redmine"]["smtp"]["port"] = "587"
+default["redmine"]["smtp"]["authentication"] = "login"
+default["redmine"]["smtp"]["user_name"] = "[email protected]"
+default["redmine"]["smtp"]["password"] = "your_password"

recipes/default.rb

@@ -32,40 +32,30 @@
   mode '0755'
 end
 
-# # Install ruby with rbenv
-# node.default['rbenv']['user_installs'] = [
-#     {
-#         user: node[:redmine][:user],
-#         rubies: [node[:redmine][:ruby_version]],
-#         global: node[:redmine][:ruby_version],
-#         gems: {
-#             node[:redmine][:ruby_version] => [
-#                 { name: 'bundler' },
-#                 { name: 'rake' }
-#             ]
-#         }
-#     }
-# ]
-#
-# include_recipe 'ruby_build'
-# include_recipe 'rbenv::user'
-
 # Download archive with source code
-bash 'install_redmine' do
+bash "downloading redmine #{node[:redmine][:version]}" do
   cwd node[:redmine][:home]
   user node[:redmine][:user]
   code <<-EOH
     wget -O redmine-#{node[:redmine][:version]}.tar.gz https://github.com/redmine/redmine/archive/#{node[:redmine][:version]}.tar.gz;
+  EOH
+  not_if { ::File.exists?("#{node[:redmine][:home]}/redmine-#{node[:redmine][:version]}.tar.gz") }
+end
+
+bash "installing redmine #{node[:redmine][:version]}" do
+  cwd node[:redmine][:home]
+  user node[:redmine][:user]
+  code <<-EOH
     tar -xzf redmine-#{node[:redmine][:version]}.tar.gz
   EOH
-  not_if { ::File.exists?("#{node[:redmine][:home]}/redmine-#{node[:redmine][:version]}/Rakefile") }
+  not_if { ::File.exists?("#{node[:redmine][:home]}/redmine-#{node[:redmine][:version]}") }
 end
 
 link "#{node[:redmine][:home]}/redmine" do
   to "#{node[:redmine][:home]}/redmine-#{node[:redmine][:version]}"
 end
 
-# Create database
+# setup database
 case node[:redmine][:db][:type]
   when 'sqlite'
     include_recipe 'redmine2::sqlite'

templates/default/configuration.yml.erb

@@ -1,5 +1,32 @@
-
 production:
   email_delivery:
+<% if node["redmine"]["smtp"]["delivery_method"] == "sendmail" -%>
     delivery_method: :sendmail
-
+  <% else -%>
+    delivery_method: :<%= node["redmine"]["smtp"]["delivery_method"] %>
+    smtp_settings:
+      <% if !node["redmine"]["smtp"]["tls"].nil? -%>
+      tls: <%= node["redmine"]["smtp"]["tls"].to_s %>
+      <% end -%>
+      <% if !node["redmine"]["smtp"]["enable_starttls_auto"].nil? -%>
+      enable_starttls_auto: <%= node["redmine"]["smtp"]["enable_starttls_auto"].to_s %>
+      <% end -%>
+      <% if !node["redmine"]["smtp"]["address"].nil? -%>
+      address: <%= node["redmine"]["smtp"]["address"] %>
+      <% end -%>
+      <% if !node["redmine"]["smtp"]["port"].nil? -%>
+      port: <%= node["redmine"]["smtp"]["port"] %>
+      <% end -%>
+      <% if !node["redmine"]["smtp"]["domain"].nil? -%>
+      domain: <%= node["redmine"]["smtp"]["domain"] %>
+      <% end -%>
+      <% if !node["redmine"]["smtp"]["authentication"].nil? -%>
+      authentication: :<%= node["redmine"]["smtp"]["authentication"] %>
+      <% end -%>
+      <% if !node["redmine"]["smtp"]["user_name"].nil? -%>
+      user_name: "<%= node["redmine"]["smtp"]["user_name"] %>"
+      <% end -%>
+      <% if !node["redmine"]["smtp"]["password"].nil? -%>
+      password: "<%= node["redmine"]["smtp"]["password"] %>"
+      <% end -%>
+  <% end -%>