Major overhaul, current Errbit master, systemd + Puma

.gitignore

@@ -9,3 +9,4 @@ Gemfile.lock
 *.un~
 /cookbooks
 .chef
+/.kitchen

.kitchen.yml

@@ -0,0 +1,22 @@
+---
+driver:
+  name: vagrant
+  customize:
+    memory: 768
+  network:
+    - ['forwarded_port', {guest: 80,  host: 8080, auto_correct: true}]
+
+provisioner:
+  name: chef_zero
+
+platforms:
+  - name: centos-7.3
+  - name: ubuntu-12.04
+
+suites:
+  - name: default
+    run_list:
+      - recipe[mongodb]
+      - recipe[chef_nginx]
+      - recipe[errbit::default]
+      - recipe[errbit::bootstrap]

Berksfile

@@ -1,3 +1,2 @@
-site :opscode
-
+source 'https://api.berkshelf.com'
 metadata

README.md

@@ -1,20 +1,22 @@
 # Description
 
 This cookbook is designed to be able to run [Errbit](http://github.com/errbit/errbit).
-Its github is at [chef-errbit](https://github.com/millisami/chef-errbit)
+Its github is at [chef-errbit](https://github.com/klamontagne/chef-errbit)
 
 # Requirements
 
 Developed using chef 10.14.0 and it should work with higher versions. But not tested against chef 11 family.
 
 The following Opscode cookbooks are dependencies:
 
-* mongodb
 * git
-* unicorn
 * apt
 * nginx
 
+You also need a MongoDB installation, such as with the [mongodb cookbook](https://github.com/edelight/chef-mongodb).
+
+If you have other installations of rbenv on the node, you need to edit the node's user_installs as described in [chef-rbenv's documentation](https://github.com/fnichol/chef-rbenv#-rbenv-installed-for-a-specific-user-with-rubies).
+
 # Usage
 
 Just to install the Errbit app, include the following in your wrapper cookbook's recipe

Vagrantfile

@@ -46,8 +46,7 @@ Vagrant.configure("2") do |config|
     }
 
     chef.run_list = [
-      'recipe[errbit::install_ruby]',
-      'recipe[nginx]',
+      'recipe[chef_nginx]',
       'recipe[errbit::default]',
       'recipe[errbit::bootstrap]'
     ]

attributes/default.rb

@@ -4,45 +4,81 @@
 #
 # Copyright (C) 2013 Millisami
 #
-# All rights reserved - Do Not Redistribute
+# 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.
 #
 
 default['errbit']['name']         = "errbit"
-default['errbit']['user']         = "deployer"
-default['errbit']['password']     = "$1$qqO27xay$dtmwY9NMmJiSa47xhUZm0." #errbit
+default['errbit']['user']         = "errbit"
 default['errbit']['group']        = node['errbit']['user']
-default['errbit']['deploy_to']    = "/home/#{default['errbit']['user']}/#{node['errbit']['name']}"
+default['errbit']['deploy_to']    = "/home/#{node['errbit']['user']}/#{node['errbit']['name']}"
 default['errbit']['repo_url']     = "git://github.com/errbit/errbit.git"
 default['errbit']['revision']     = "master"
-default['errbit']['environment']  = "production"
-
-# errbit config.yml
-default['errbit']['config']['host']                               = "errbit.example.com"
-default['errbit']['config']['enforce_ssl']                        = false
-default['errbit']['config']['email_from']                         = "[email protected]"
-default['errbit']['config']['per_app_email_at_notices']           = false
-default['errbit']['config']['email_at_notices']                   = [1, 10, 100]
-default['errbit']['config']['confirm_resolve_err']                = true
-default['errbit']['config']['user_has_username']                  = false
-default['errbit']['config']['allow_comments_with_issue_tracker']  = true
-default['errbit']['config']['use_gravatar']                       = true
-default['errbit']['config']['gravatar_default']                   = "identicon"
 
-# errbit github integration
-default['errbit']['config']['github_authentication']  = false
-default['errbit']['config']['github_client_id']       = "github_client_id"
-default['errbit']['config']['github_secret']          = "github_secret"
-default['errbit']['config']['github_access_scope']    = ['repo']
+# Local ruby to install via rbenv
+default['errbit']['install_ruby'] = '2.2.4'
 
-# mongodb creds
-default['errbit']['db']['host']      = "localhost"
-default['errbit']['db']['port']      = "27017"
-default['errbit']['db']['database']  = "errbit"
-default['errbit']['db']['username']  = ""
-default['errbit']['db']['password']  = ""
-
-# app server (Optional: More info in README)
-default['errbit']['server'] = "unicorn" # or use others like puma
+# dotenv file variables
+#
+## Errbit
+default['errbit']['config']['errbit_host']                       = 'errbit.example.com' # Don't default to FQDN, it might fail e-mail validation.
+default['errbit']['config']['errbit_protocol']                   = 'http'
+default['errbit']['config']['errbit_port']                       = 80
+default['errbit']['config']['errbit_enforce_ssl']                = false
+default['errbit']['config']['errbit_confirm_err_actions']        = true
+default['errbit']['config']['errbit_user_has_username']          = true
+default['errbit']['config']['errbit_use_gravatar']               = true
+default['errbit']['config']['errbit_gravatar_default']           = 'identicon'
+default['errbit']['config']['errbit_email_from']                 = '[email protected]'
+default['errbit']['config']['errbit_email_at_notices']           = [1, 10, 100]
+default['errbit']['config']['errbit_per_app_email_at_notices']   = false
+default['errbit']['config']['errbit_notify_at_notices']          = [0]
+default['errbit']['config']['errbit_per_app_notify_at_notices']  = false
+#
+## GitHub
+default['errbit']['config']['github_url']                        = 'https://github.com'
+default['errbit']['config']['github_authentication']             = false
+default['errbit']['config']['github_client_id']                  = nil
+default['errbit']['config']['github_secret']                     = nil
+default['errbit']['config']['github_org_id']                     = nil
+default['errbit']['config']['github_access_scope']               = ['repo']
+#
+## SMTP
+default['errbit']['config']['smtp_server']                       = nil
+default['errbit']['config']['smtp_port']                         = nil
+default['errbit']['config']['smtp_authentication']               = nil
+default['errbit']['config']['smtp_username']                     = nil
+default['errbit']['config']['smtp_password']                     = nil
+default['errbit']['config']['smtp_domain']                       = nil
+#
+## Sendmail
+default['errbit']['config']['sendmail_location']                 = nil
+default['errbit']['config']['sendmail_arguments']                = nil
+#
+## Misc
+default['errbit']['config']['devise_modules']                    = %w( database_authenticatable recoverable rememberable trackable validatable omniauthable )
+default['errbit']['config']['email_delivery_method']             = 'smtp'
+default['errbit']['config']['mongo_url']                         = 'mongodb://localhost/errbit'
+default['errbit']['config']['rails_env']                         = 'production'
+default['errbit']['config']['secret_key_base']                   = nil
+default['errbit']['config']['serve_static_assets']               = true
 
-default['errbit']['secret_token'] = 'b9e131c733a2672c79af5699f26e0bc5fba23a40ec51d76c9271c00097f35aa4c0993e1150f08048f0b66bd141cbcb58ab28814e35eb281c3cb2374aac160203'
+# The cookbook currently only supports Puma on systemd and Unicorn on SysVinit.
+default['errbit']['server']['name'] = node['init_package'] == 'systemd' ? 'puma' : 'unicorn'
 
+default['errbit']['server']['backlog']     = 100
+default['errbit']['server']['port']        = node['errbit']['config']['errbit_port']
+default['errbit']['server']['preload_app'] = false
+default['errbit']['server']['tcp_nodelay'] = true
+default['errbit']['server']['tcp_nopush']  = true
+default['errbit']['server']['timeout']     = 60
+default['errbit']['server']['workers']     = 2

chefignore

@@ -94,3 +94,8 @@ Vagrantfile
 # Travis #
 ##########
 .travis.yml
+
+# Kitchen #
+###########
+.kitchen/*
+.kitchen.yml

metadata.rb

@@ -1,16 +1,19 @@
 name             "errbit"
 maintainer       "Sachin Sagar Rai"
 maintainer_email "[email protected]"
-license          "All rights reserved"
+license          "Apache 2.0"
 description      "Installs/Configures errbit"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version          "0.4.0"
 
-depends          "mongodb"
 depends          "git"
-depends          "unicorn"
+depends          "ruby_rbenv", ">= 2.0"
 depends          "apt"
-depends          "nginx"
+depends          "chef_nginx"
 depends          "build-essential"
+depends          "selinux_policy"
 
+recommends       "mongodb"
+
+supports         "centos"
 supports         "ubuntu"

recipes/bootstrap.rb

@@ -1,14 +1,40 @@
+#
+# Author:: Sachin Sagar Rai <[email protected]>
+# Cookbook Name:: errbit
+# Recipe:: setup
+#
+# Copyright (C) 2013 Millisami
+#
+# 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.
+#
 
+home_dir = "/home/#{node['errbit']['user']}"
+current_dir = "#{node['errbit']['deploy_to']}/current"
 
-Chef::Log.info "-" * 70
-Chef::Log.info "Checking to bootstrap the admin user"
-execute "check whether to bootstrap admin user" do
-  command "bundle exec rake db:seed -t"
-  cwd "#{node['errbit']['deploy_to']}/current"
-  environment ({'RAILS_ENV' => 'production'})
-  # not_if "bundle exec rails runner 'p User.where(admin: true).first'"
-  notifies :create, "ruby_block[remove_bootstrap]", :immediately
-  # notifies :restart, "service[unicorn_#{app['id']}]"
+rbenv_script 'rake db:seed' do
+  code 'bundle exec rake db:seed RAILS_ENV=' + node['errbit']['config']['rails_env']
+  cwd current_dir
+  user node['errbit']['user']
+  rbenv_version node['errbit']['install_ruby']
+
+  not_if "#{home_dir}/.rbenv/bin/rbenv exec bundle exec rails runner 'exit User.where(:admin => true).exists?'", {
+    :cwd => current_dir,
+    :user => node['errbit']['user'],
+    :group => node['errbit']['group'],
+    :environment => { 'HOME' => home_dir }
+  }
+
+  notifies :run, "ruby_block[remove_bootstrap]", :immediately
 end
 
 ruby_block "remove_bootstrap" do

recipes/default.rb

@@ -19,6 +19,10 @@
 #
 
 include_recipe 'errbit::setup'
-server = node['errbit']['server']
+include_recipe 'errbit::' + node['errbit']['server']['name']
 
-include_recipe "errbit::#{server}"
+# Hack to work around systemd creating the socket with the wrong
+# context and selinux_policy cookbook only running restorecon once.
+execute "restorecon -R #{node['errbit']['deploy_to']}" do
+  only_if 'which restorecon'
+end

recipes/puma.rb

@@ -1,15 +1,50 @@
 #
+# Author:: Sachin Sagar Rai <[email protected]>
 # Cookbook Name:: errbit
-# Recipe:: default
+# Recipe:: puma
 #
 # Copyright (C) 2013 Millisami
 #
-# All rights reserved - Do Not Redistribute
+# 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.
+#
+
+template "#{node['errbit']['deploy_to']}/shared/config/puma.rb" do
+  source 'puma.rb.erb'
+  owner node['errbit']['user']
+  group node['errbit']['group']
+  mode 0644
+end
+
+['socket', 'service'].each do |unit|
+  template "/lib/systemd/system/puma-#{node['errbit']['name']}.#{unit}" do
+    source "puma.#{unit}.erb"
+    owner 'root'
+    group 'root'
+    mode 0644
+  end
+end
+
+service "puma-#{node['errbit']['name']}" do
+  supports [:reload, :restart, :status]
+  action :nothing
+
+  subscribes :reload, "template[/lib/systemd/system/puma-#{node['errbit']['name']}.service]"
+  subscribes :reload, "template[#{node['errbit']['deploy_to']}/shared/config/puma.rb]"
+  subscribes :reload, "file[#{node['errbit']['deploy_to']}/shared/config/env]"
+  subscribes :reload, "deploy_revision[#{node['errbit']['deploy_to']}]"
+end
 
-execute "puma app server" do
-  cwd "#{node['errbit']['deploy_to']}/current"
-  command "bundle exec puma -D"
-  # creates "/tmp/something"
-  action :run
+service "puma-#{node['errbit']['name']}.socket" do
+  supports [:restart, :status]
+  action [:enable, :start]
 end