from-scratch 0.1.0 → 0.1.1

data/cookbooks/postgresql/recipes/yum_pgdg_postgresql.rb

@@ -0,0 +1,45 @@
+#
+# Cookbook Name:: postgresql
+# Recipe::yum_pgdg_postgresql
+#
+# 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.
+#
+
+#######
+# Load the pgdgrepo_rpm_info method from libraries/default.rb
+::Chef::Recipe.send(:include, Opscode::PostgresqlHelpers)
+
+######################################
+# Install the "PostgreSQL RPM Building Project - Yum Repository" through
+# the repo_rpm_url determined with pgdgrepo_rpm_info method from
+# libraries/default.rb. The /etc/yum.repos.d/pgdg-*.repo
+# will provide postgresql9X packages, but you may need to exclude
+# postgresql packages from the repository of the distro in order to use
+# PGDG repository properly. Conflicts will arise if postgresql9X does
+# appear in your distro's repo and you want a more recent patch level.
+
+repo_rpm_url, repo_rpm_filename, repo_rpm_package = pgdgrepo_rpm_info
+
+# Download the PGDG repository RPM as a local file
+remote_file "#{Chef::Config[:file_cache_path]}/#{repo_rpm_filename}" do
+  source repo_rpm_url
+  mode "0644"
+end
+
+# Install the PGDG repository RPM from the local file
+# E.g., /etc/yum.repos.d/pgdg-91-centos.repo
+package repo_rpm_package do
+  provider Chef::Provider::Package::Rpm
+  source "#{Chef::Config[:file_cache_path]}/#{repo_rpm_filename}"
+  action :install
+end

data/cookbooks/postgresql/templates/default/pg_hba.conf.erb

@@ -0,0 +1,35 @@
+# This file was automatically generated and dropped off by Chef!
+
+# PostgreSQL Client Authentication Configuration File
+# ===================================================
+#
+# Refer to the "Client Authentication" section in the PostgreSQL
+# documentation for a complete description of this file.
+
+<% if node['postgresql']['version'].to_f < 9.1 -%>
+# TYPE  DATABASE        USER            CIDR-ADDRESS            METHOD
+<% elsif node['postgresql']['version'].to_f >= 9.1 -%>
+# TYPE  DATABASE        USER            ADDRESS                 METHOD
+<% end -%>
+
+###########
+# Other authentication configurations taken from chef node defaults:
+###########
+<% node['postgresql']['pg_hba'].each do |auth| -%>
+
+<%   if auth[:comment] %>
+<%= auth[:comment] %>
+<%   end %>
+<%   if auth[:addr] %>
+<%= auth[:type].ljust(7) %> <%= auth[:db].ljust(15) %> <%= auth[:user].ljust(15) %> <%= auth[:addr].ljust(23) %> <%= auth[:method] %>
+<%   else %>
+<%= auth[:type].ljust(7) %> <%= auth[:db].ljust(15) %> <%= auth[:user].ljust(15) %>                         <%= auth[:method] %>
+<%   end %>
+<% end %>
+
+# "local" is for Unix domain socket connections only
+<% if node['postgresql']['version'].to_f < 9.1 -%>
+local   all             all                                     ident
+<% elsif node['postgresql']['version'].to_f >= 9.1 -%>
+local   all             all                                     peer
+<% end -%>

data/cookbooks/postgresql/templates/default/pgsql.sysconfig.erb

@@ -0,0 +1,4 @@
+PGDATA=<%= node['postgresql']['dir'] %>
+<% if node['postgresql']['config'].attribute?("port") -%>
+PGPORT=<%= node['postgresql']['config']['port'] %>
+<% end -%>

data/cookbooks/postgresql/templates/default/postgresql.conf.erb

@@ -0,0 +1,21 @@
+# PostgreSQL configuration file
+# This file was automatically generated and dropped off by chef!
+# Please refer to the PostgreSQL documentation for details on
+# configuration settings.
+
+<% node['postgresql']['config'].sort.each do |key, value| %>
+<% next if value.nil? -%>
+<% next if node['postgresql']['version'].to_f < 9.2 && /ssl_.*._file/.match(key) -%>
+<%= key %> = <%=
+  case value
+  when String
+    "'#{value}'"
+  when TrueClass
+    'on'
+  when FalseClass
+    'off'
+  else
+    value
+  end
+%>
+<% end %>

data/cookbooks/scratchify/.chef/knife.rb

@@ -1,9 +1,6 @@
 cookbook_path    "cookbooks"
-node_path        "nodes"
-role_path        "roles"
-environment_path "environments"
-data_bag_path    "data_bags"
-#encrypted_data_bag_secret "data_bag_key"
+node_path        "tmp/nodes"
+data_bag_path    "tmp/data_bags"
 
 knife[:berkshelf_path] = "cookbooks"
 Chef::Config[:ssl_verify_mode] = :verify_peer if defined? ::Chef

data/cookbooks/scratchify/Berksfile

@@ -7,7 +7,8 @@ metadata
 
 cookbook 'user'
 cookbook 'rvm', github: 'fnichol/chef-rvm'
-# cookbook 'apt'
+cookbook 'postgresql'
+
 # cookbook 'dpkg_packages', git: "https://gitlab.acid.cl/acidlabs/chef-dpkg-packages.git"
 # cookbook 'nginx',         git: "https://gitlab.acid.cl/acidlabs/chef-nginx.git"
 # cookbook 'postgresql',    git: "https://github.com/phlipper/chef-postgresql.git"

data/cookbooks/scratchify/Berksfile.lock

@@ -1,4 +1,5 @@
 DEPENDENCIES
+  postgresql
   rvm
     git: git://github.com/fnichol/chef-rvm.git
     revision: 08ec265f277e112a5a2e4b201bd32ddfe1bb968c
@@ -8,12 +9,22 @@ DEPENDENCIES
   user
 
 GRAPH
+  apt (2.9.2)
+  build-essential (2.2.4)
+  chef-sugar (3.1.1)
   chef_gem (0.1.0)
   java (1.35.0)
+  openssl (4.0.0)
+    chef-sugar (>= 0.0.0)
+  postgresql (3.4.20)
+    apt (>= 1.9.0)
+    build-essential (>= 0.0.0)
+    openssl (~> 4.0.0)
   rvm (0.10.1)
     chef_gem (>= 0.0.0)
     java (>= 0.0.0)
   scratchify (0.1.0)
+    postgresql (>= 0.0.0)
     rvm (>= 0.0.0)
     user (>= 0.0.0)
   user (0.4.2)

data/cookbooks/scratchify/README.md

@@ -1,39 +1,56 @@
 # FromScratch
 
-I'm sick and tired of thousands of articles "How to setup Rails app". Here is your last command to do that.
+I'm sick and tired of thousands of articles "How to setup Rails app server". Here is your last command to do that.
 
-## Installation
+No configs, no questions. Just ~~one ring to rule them all~~ one command to get fully functional server with best security practices ready for first `cap production deploy`.
 
-Gemfile:
+## Usage
+
+    $ gem install from-scratch
+    $ scratchify your_app_name your.host.com
+
+And everything is done. Then add following to your `config/deploy.rb` or `config/deploy/production.rb` for Capistrano:
 
 ```ruby
-gem 'from-scratch', group: :development
+server 'your.host.com', user: 'deploy', roles: %w(app db web)
+set :deploy_to, "/home/deploy/your_app_name"
 ```
 
-Then
+## Supports
 
-    $ bundle
+OS:
 
-## Usage
+  - APT-based Linux (Ubuntu, Debian)
+  - YUM-based Linux (RedHat, CentOS)
 
-    $ bundle exec scratchify
+## It's a kind of magic!
 
-## Supports
+Not actully. Just preconfigured [Chef](https://www.chef.io/). Here are the things done with the command:
 
-![Ubuntu](http://design.ubuntu.com/wp-content/uploads/ubuntu-logo32.png)
-![RVM](https://rvm.io/images/logo.png)
-![MySQL](https://www.mysql.com/common/logos/logo-mysql-170x115.png)
+  - Install system-wide RVM with latest MRI (2.2.3)
+  - Install PostgreSQL, create database with user, pg_tune a little
+  - Add _deploy_ non-admin user to system specially for your app, upload your SSH pub key to it
+  - Install nginx and replace it's default site config with one prepared for rails app
+  - Generate app folder inside _deploy_'s home and generate `database.yml` and `secrets.yml`
 
-## Development
+## Things you need to know
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Nginx config is set up to connect to unix socket placed at `/home/deploy/your_app_name/shared/tmp/sockets/application.sock`. Change it manually or config your favorite app server (Puma, Unicorn, Thin etc) to place it's socket there.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+You can just `ssh deploy@your.host.com` because your SSH pub key is already there.
 
-## Contributing
+Both `postgres` and `your_app_name` DB users get (different) randomly generated passwords. You can see app-user password inside `config/database.yml`, but `postgres` password is not saved anywhere. If you need admin access to your PostgreSQL, then you should SSH as root and:
+
+    # su - postgres
+    $ psql
+
+## Development
+
+TODO
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/from-scratch.
+## Contributing
 
+TODO
 
 ## License
 

data/cookbooks/scratchify/bin/scratchify

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "from/scratch"
+require "from-scratch"
 
 FromScratch.run!

data/cookbooks/scratchify/chefignore

@@ -94,6 +94,7 @@ Vagrantfile
 .travis.yml
 
 # Gem files #
+#############
 Gemfile
 Gemfile.lock
 Rakefile

data/cookbooks/scratchify/from-scratch.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'from/scratch/version'
+require 'from-scratch/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "from-scratch"
@@ -20,12 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'rspec', "~> 3.3.0"
   spec.add_development_dependency 'pry'
 
-  spec.add_dependency 'sshkit', '>= 1.7.1'
-  spec.add_dependency 'colorize'
-  spec.add_dependency 'activesupport', '>= 3.2.1'
   spec.add_dependency 'knife-solo'
   spec.add_dependency 'knife-solo_data_bag'
   spec.add_dependency 'chef'

data/cookbooks/scratchify/lib/from-scratch.rb

@@ -0,0 +1,25 @@
+require 'securerandom'
+require 'erb'
+require 'fileutils'
+
+module FromScratch
+  def self.run!
+    app_name, host = ARGV
+    ssh_pub_key = `cat ~/.ssh/id_rsa.pub`.strip
+    postgresql_admin_password = `echo -n '#{SecureRandom.hex(64)}''postgres' | openssl md5 | sed -e 's/.* /md5/'`.strip
+
+    { node: ['nodes', host], user: ['data_bags/users', 'deploy'] }.each do |from, to|
+      FileUtils.mkdir_p File.expand_path("../../tmp/#{to[0]}", __FILE__)
+      File.open(File.expand_path("../../tmp/#{to.join('/')}.json", __FILE__), 'w') do |f|
+        f.write ERB.new(File.open(File.expand_path("../../templates/#{from}.json.erb", __FILE__)).read).result(binding)
+      end
+    end
+
+    Dir.chdir(File.expand_path('../..', __FILE__)) do
+      system "knife solo bootstrap root@#{host}"
+      system "knife solo clean root@#{host}"
+    end
+
+    FileUtils.rm_rf [File.expand_path('../../tmp', __FILE__)]
+  end
+end

data/cookbooks/scratchify/lib/{from/scratch → from-scratch}/version.rb

@@ -1,3 +1,3 @@
 module FromScratch
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/cookbooks/scratchify/metadata.json

@@ -11,7 +11,8 @@
   },
   "dependencies": {
     "user": ">= 0.0.0",
-    "rvm": ">= 0.0.0"
+    "rvm": ">= 0.0.0",
+    "postgresql": ">= 0.0.0"
   },
   "recommendations": {
   },

data/cookbooks/scratchify/templates/node.json.erb

@@ -0,0 +1,34 @@
+{
+  "run_list": [
+    "recipe[rvm::system]",
+    "recipe[postgresql::server]",
+    "recipe[postgresql::config_pgtune]",
+    "recipe[user::data_bag]",
+    "recipe[scratchify]"
+  ],
+
+  "users": ["deploy"],
+
+  "rvm": {
+    "default_ruby": "2.2.3",
+    "rubies": ["2.2.3"],
+    "install_rubies": true,
+    "gpg": {}
+  },
+
+  "postgresql": {
+    "version": "9.4",
+    "enable_pgdg_yum": true,
+    "enable_pgdg_apt": true,
+    "password": {
+      "postgres": "<%= postgresql_admin_password %>"
+    },
+    "config_pgtune": {
+      "db_type": "web"
+    }
+  },
+
+  "automatic": {
+    "ipaddress": "<%= host %>"
+  }
+}

data/cookbooks/scratchify/templates/user.json.erb

@@ -0,0 +1,6 @@
+{
+  "id": "deploy",
+  "name": "deploy",
+  "groups": ["deploy"],
+  "ssh_keys": ["<%= ssh_pub_key %>"]
+}

data/lib/from-scratch.rb

@@ -6,7 +6,7 @@ module FromScratch
   def self.run!
     app_name, host = ARGV
     ssh_pub_key = `cat ~/.ssh/id_rsa.pub`.strip
-    postgresql_admin_password = `echo -n '#{SecureRandom.hex(64)}''postgres' | openssl md5 | sed -e 's/.* /md5/'`
+    postgresql_admin_password = `echo -n '#{SecureRandom.hex(64)}''postgres' | openssl md5 | sed -e 's/.* /md5/'`.strip
 
     { node: ['nodes', host], user: ['data_bags/users', 'deploy'] }.each do |from, to|
       FileUtils.mkdir_p File.expand_path("../../tmp/#{to[0]}", __FILE__)
@@ -15,7 +15,7 @@ module FromScratch
       end
     end
 
-    Dir.chdir(File.expand_path('..', __FILE__)) do
+    Dir.chdir(File.expand_path('../..', __FILE__)) do
       system "knife solo bootstrap root@#{host}"
       system "knife solo clean root@#{host}"
     end

data/lib/from-scratch/version.rb

@@ -1,3 +1,3 @@
 module FromScratch
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/templates/node.json.erb

@@ -1,8 +1,8 @@
 {
   "run_list": [
     "recipe[rvm::system]",
-    "recipe[posgresql::server]",
-    "recipe[posgresql::config_pgtune]",
+    "recipe[postgresql::server]",
+    "recipe[postgresql::config_pgtune]",
     "recipe[user::data_bag]",
     "recipe[scratchify]"
   ],
@@ -10,7 +10,10 @@
   "users": ["deploy"],
 
   "rvm": {
-    "default_ruby": "2.2.3"
+    "default_ruby": "2.2.3",
+    "rubies": ["2.2.3"],
+    "install_rubies": true,
+    "gpg": {}
   },
 
   "postgresql": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: from-scratch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Shaydurov
@@ -143,6 +143,52 @@ files:
 - Thorfile
 - bin/scratchify
 - chefignore
+- cookbooks/apt/CHANGELOG.md
+- cookbooks/apt/README.md
+- cookbooks/apt/attributes/default.rb
+- cookbooks/apt/files/default/15update-stamp
+- cookbooks/apt/files/default/apt-proxy-v2.conf
+- cookbooks/apt/libraries/helpers.rb
+- cookbooks/apt/libraries/matchers.rb
+- cookbooks/apt/libraries/network.rb
+- cookbooks/apt/metadata.json
+- cookbooks/apt/providers/preference.rb
+- cookbooks/apt/providers/repository.rb
+- cookbooks/apt/recipes/cacher-client.rb
+- cookbooks/apt/recipes/cacher-ng.rb
+- cookbooks/apt/recipes/default.rb
+- cookbooks/apt/recipes/unattended-upgrades.rb
+- cookbooks/apt/resources/preference.rb
+- cookbooks/apt/resources/repository.rb
+- cookbooks/apt/templates/debian-6.0/acng.conf.erb
+- cookbooks/apt/templates/default/01proxy.erb
+- cookbooks/apt/templates/default/10recommends.erb
+- cookbooks/apt/templates/default/20auto-upgrades.erb
+- cookbooks/apt/templates/default/50unattended-upgrades.erb
+- cookbooks/apt/templates/default/acng.conf.erb
+- cookbooks/apt/templates/default/unattended-upgrades.seed.erb
+- cookbooks/apt/templates/ubuntu-10.04/acng.conf.erb
+- cookbooks/build-essential/CHANGELOG.md
+- cookbooks/build-essential/README.md
+- cookbooks/build-essential/attributes/default.rb
+- cookbooks/build-essential/libraries/matchers.rb
+- cookbooks/build-essential/libraries/timing.rb
+- cookbooks/build-essential/libraries/xcode_command_line_tools.rb
+- cookbooks/build-essential/metadata.json
+- cookbooks/build-essential/recipes/_debian.rb
+- cookbooks/build-essential/recipes/_fedora.rb
+- cookbooks/build-essential/recipes/_freebsd.rb
+- cookbooks/build-essential/recipes/_mac_os_x.rb
+- cookbooks/build-essential/recipes/_omnios.rb
+- cookbooks/build-essential/recipes/_rhel.rb
+- cookbooks/build-essential/recipes/_smartos.rb
+- cookbooks/build-essential/recipes/_solaris2.rb
+- cookbooks/build-essential/recipes/_suse.rb
+- cookbooks/build-essential/recipes/default.rb
+- cookbooks/chef-sugar/CHANGELOG.md
+- cookbooks/chef-sugar/README.md
+- cookbooks/chef-sugar/metadata.json
+- cookbooks/chef-sugar/recipes/default.rb
 - cookbooks/chef_gem/CHANGELOG.md
 - cookbooks/chef_gem/README.md
 - cookbooks/chef_gem/libraries/chef_gem.rb
@@ -185,6 +231,40 @@ files:
 - cookbooks/java/resources/ark.rb
 - cookbooks/java/templates/default/ibm_jdk.installer.properties.erb
 - cookbooks/java/templates/default/oracle.jinfo.erb
+- cookbooks/openssl/CHANGELOG.md
+- cookbooks/openssl/README.md
+- cookbooks/openssl/attributes/default.rb
+- cookbooks/openssl/libraries/secure_password.rb
+- cookbooks/openssl/metadata.json
+- cookbooks/openssl/providers/x509.rb
+- cookbooks/openssl/recipes/default.rb
+- cookbooks/openssl/recipes/upgrade.rb
+- cookbooks/openssl/resources/x509.rb
+- cookbooks/postgresql/CHANGELOG.md
+- cookbooks/postgresql/README.md
+- cookbooks/postgresql/attributes/default.rb
+- cookbooks/postgresql/files/default/tests/minitest/apt_pgdg_postgresql_test.rb
+- cookbooks/postgresql/files/default/tests/minitest/default_test.rb
+- cookbooks/postgresql/files/default/tests/minitest/ruby_test.rb
+- cookbooks/postgresql/files/default/tests/minitest/server_test.rb
+- cookbooks/postgresql/files/default/tests/minitest/support/helpers.rb
+- cookbooks/postgresql/libraries/default.rb
+- cookbooks/postgresql/metadata.json
+- cookbooks/postgresql/recipes/apt_pgdg_postgresql.rb
+- cookbooks/postgresql/recipes/client.rb
+- cookbooks/postgresql/recipes/config_initdb.rb
+- cookbooks/postgresql/recipes/config_pgtune.rb
+- cookbooks/postgresql/recipes/contrib.rb
+- cookbooks/postgresql/recipes/default.rb
+- cookbooks/postgresql/recipes/ruby.rb
+- cookbooks/postgresql/recipes/server.rb
+- cookbooks/postgresql/recipes/server_conf.rb
+- cookbooks/postgresql/recipes/server_debian.rb
+- cookbooks/postgresql/recipes/server_redhat.rb
+- cookbooks/postgresql/recipes/yum_pgdg_postgresql.rb
+- cookbooks/postgresql/templates/default/pg_hba.conf.erb
+- cookbooks/postgresql/templates/default/pgsql.sysconfig.erb
+- cookbooks/postgresql/templates/default/postgresql.conf.erb
 - cookbooks/rvm/.foodcritic
 - cookbooks/rvm/.gitignore
 - cookbooks/rvm/.kitchen.yml
@@ -263,22 +343,17 @@ files:
 - cookbooks/scratchify/LICENSE.txt
 - cookbooks/scratchify/README.md
 - cookbooks/scratchify/Thorfile
-- cookbooks/scratchify/bin/console
 - cookbooks/scratchify/bin/scratchify
-- cookbooks/scratchify/bin/setup
 - cookbooks/scratchify/chefignore
-- cookbooks/scratchify/data_bags/users/deploy.json
-- cookbooks/scratchify/environments/.gitkeep
 - cookbooks/scratchify/from-scratch.gemspec
-- cookbooks/scratchify/lib/from/scratch.rb
-- cookbooks/scratchify/lib/from/scratch/interviewer.rb
-- cookbooks/scratchify/lib/from/scratch/version.rb
+- cookbooks/scratchify/lib/from-scratch.rb
+- cookbooks/scratchify/lib/from-scratch/version.rb
 - cookbooks/scratchify/metadata.json
-- cookbooks/scratchify/nodes/normfood.ru.json
 - cookbooks/scratchify/recipes/default.rb
-- cookbooks/scratchify/roles/.gitkeep
 - cookbooks/scratchify/spec/from/scratch_spec.rb
 - cookbooks/scratchify/spec/spec_helper.rb
+- cookbooks/scratchify/templates/node.json.erb
+- cookbooks/scratchify/templates/user.json.erb
 - cookbooks/user/.gitignore
 - cookbooks/user/.kitchen.yml
 - cookbooks/user/.travis.yml