from-scratch 0.1.1 → 0.2.0

data/lib/from-scratch.rb

@@ -6,7 +6,11 @@ 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
+    postgresql_admin_password = `echo -n '#{SecureRandom.base64(16)}''postgres' | openssl md5 | sed -e 's/.* /md5/'`.strip
+
+    puts "Your PG #{app_name} password is:"
+    puts postgresql_user_password = SecureRandom.base64(16)
+    puts
 
     { node: ['nodes', host], user: ['data_bags/users', 'deploy'] }.each do |from, to|
       FileUtils.mkdir_p File.expand_path("../../tmp/#{to[0]}", __FILE__)
@@ -16,8 +20,8 @@ module FromScratch
     end
 
     Dir.chdir(File.expand_path('../..', __FILE__)) do
-      system "knife solo bootstrap root@#{host}"
-      system "knife solo clean root@#{host}"
+      system "knife solo bootstrap root@#{host} -c ./.chef/knife.rb"
+      system "knife solo clean root@#{host} -c ./.chef/knife.rb"
     end
 
     FileUtils.rm_rf [File.expand_path('../../tmp', __FILE__)]

data/lib/from-scratch/version.rb

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

data/templates/node.json.erb

@@ -3,6 +3,8 @@
     "recipe[rvm::system]",
     "recipe[postgresql::server]",
     "recipe[postgresql::config_pgtune]",
+    "recipe[postgresql::setup_users]",
+    "recipe[postgresql::setup_databases]",
     "recipe[user::data_bag]",
     "recipe[scratchify]"
   ],
@@ -23,6 +25,37 @@
     "password": {
       "postgres": "<%= postgresql_admin_password %>"
     },
+    "users": [
+      {
+        "username": "<%= app_name %>",
+        "superuser": false,
+        "createdb": false,
+        "login": true,
+        "password": "<%= postgresql_user_password %>"
+      }
+    ],
+    "databases": [
+      {
+        "name": "<%= app_name %>",
+        "owner": "<%= app_name %>"
+      }
+    ],
+    "pg_hba": [
+      {
+        "type": "host",
+        "db": "all",
+        "user": "all",
+        "addr": "127.0.0.1/32",
+        "method": "md5"
+      },
+      {
+        "type": "host",
+        "db": "all",
+        "user": "all",
+        "addr": "::1/128",
+        "method": "md5"
+      }
+    ],
     "config_pgtune": {
       "db_type": "web"
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: from-scratch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Shaydurov
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: knife-solo
   requirement: !ruby/object:Gem::Requirement
@@ -234,14 +234,30 @@ files:
 - cookbooks/openssl/CHANGELOG.md
 - cookbooks/openssl/README.md
 - cookbooks/openssl/attributes/default.rb
+- cookbooks/openssl/libraries/helpers.rb
+- cookbooks/openssl/libraries/matchers.rb
+- cookbooks/openssl/libraries/random_password.rb
 - cookbooks/openssl/libraries/secure_password.rb
 - cookbooks/openssl/metadata.json
+- cookbooks/openssl/providers/dhparam.rb
+- cookbooks/openssl/providers/rsa_key.rb
 - cookbooks/openssl/providers/x509.rb
 - cookbooks/openssl/recipes/default.rb
 - cookbooks/openssl/recipes/upgrade.rb
+- cookbooks/openssl/resources/dhparam.rb
+- cookbooks/openssl/resources/rsa_key.rb
 - cookbooks/openssl/resources/x509.rb
+- cookbooks/postgresql/.gitignore
+- cookbooks/postgresql/.kitchen.yml
+- cookbooks/postgresql/.rspec
 - cookbooks/postgresql/CHANGELOG.md
+- cookbooks/postgresql/CONTRIBUTING.md
+- cookbooks/postgresql/Cheffile
+- cookbooks/postgresql/Gemfile
+- cookbooks/postgresql/LICENSE
 - cookbooks/postgresql/README.md
+- cookbooks/postgresql/Rakefile
+- cookbooks/postgresql/TESTING.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
@@ -250,6 +266,8 @@ files:
 - cookbooks/postgresql/files/default/tests/minitest/support/helpers.rb
 - cookbooks/postgresql/libraries/default.rb
 - cookbooks/postgresql/metadata.json
+- cookbooks/postgresql/providers/database.rb
+- cookbooks/postgresql/providers/user.rb
 - cookbooks/postgresql/recipes/apt_pgdg_postgresql.rb
 - cookbooks/postgresql/recipes/client.rb
 - cookbooks/postgresql/recipes/config_initdb.rb
@@ -261,10 +279,18 @@ files:
 - cookbooks/postgresql/recipes/server_conf.rb
 - cookbooks/postgresql/recipes/server_debian.rb
 - cookbooks/postgresql/recipes/server_redhat.rb
+- cookbooks/postgresql/recipes/setup_databases.rb
+- cookbooks/postgresql/recipes/setup_users.rb
 - cookbooks/postgresql/recipes/yum_pgdg_postgresql.rb
+- cookbooks/postgresql/resources/database.rb
+- cookbooks/postgresql/resources/user.rb
 - cookbooks/postgresql/templates/default/pg_hba.conf.erb
 - cookbooks/postgresql/templates/default/pgsql.sysconfig.erb
 - cookbooks/postgresql/templates/default/postgresql.conf.erb
+- cookbooks/postgresql/test/unit/debian_server_spec.rb
+- cookbooks/postgresql/test/unit/default_spec.rb
+- cookbooks/postgresql/test/unit/server_spec.rb
+- cookbooks/postgresql/test/unit/spec_helper.rb
 - cookbooks/rvm/.foodcritic
 - cookbooks/rvm/.gitignore
 - cookbooks/rvm/.kitchen.yml