deployinator 0.1.6 → 0.1.7

data/lib/deployinator/built-in.rb

@@ -71,7 +71,6 @@ def deploy_run_bluepill(host)
   warn "Starting a new container named #{fetch(:ruby_container_name)} on #{host}"
   execute(
     "docker", "run", "--tty", "--detach",
-    # "--user", fetch(:webserver_username), TODO find out of this can run as the deployer user instead of root, if so, set the user, if not, fix rails console to su to www-data first
     "--name", fetch(:ruby_container_name),
     "-e", "APP_STAGE=#{fetch(:stage)}",
     "-e", "RAILS_ROOT=#{current_path}",
@@ -136,13 +135,11 @@ def deploy_run_cadvisor(host)
     "google/cadvisor:latest"
   )
 end
-# TODO change these both to run as webserver_username
-#   also offer Rails 2.X versions
 def deploy_rails_console(host)
   [
     "ssh", "-t", "#{host}", "\"docker", "exec", "--interactive", "--tty",
     fetch(:ruby_container_name),
-    # "sudo", "-u", fetch(:webserver_username), TODO, find out if running bluepill as www-data works, otherwise add this line
+    # "sudo", "-u", fetch(:webserver_username), TODO, make sure it works to add this line
     "bash", "-c", "'cd", current_path, "&&",
     shared_path.join('bundle', 'bin', 'rails'),
     "console", "#{fetch(:rails_env)}'\""

data/lib/deployinator/config.rb

@@ -13,7 +13,6 @@ end
 
 namespace :deployinator do
   task :load_settings do
-    load "./config/deploy.rb"
     SSHKit.config.output_verbosity = fetch(:log_level)
   end
 
@@ -108,7 +107,11 @@ namespace :deployinator do
   task :file_permissions => [:load_settings, :deployment_user, :webserver_user] do
     on roles(:app) do
       as :root do
-        setup_file_permissions
+        if ENV["skip_perms"] == "true"
+          warn "Skipping file_permissions task"
+        else
+          setup_file_permissions
+        end
       end
     end
   end

data/lib/deployinator/examples/config/deploy.rb

@@ -8,9 +8,9 @@ set :application,                   'my_app_name'
 set :preexisting_ssh_user,          ENV['USER']
 set :deployment_username,           "deployer" # user with SSH access and passwordless sudo rights
 set :webserver_username,            "www-data" # less trusted web server user with limited write permissions
-set :database_name,                 "db_name"
-set :database_username,             "db_username"
-set :database_password,             "db_password"
+set :database_name,                 "db_name"     # for templates/deploy/database.yml
+set :database_username,             "db_username" # for templates/deploy/database.yml
+set :database_password,             "db_password" # for templates/deploy/database.yml
 # All permissions changes are recursive, and unless overridden below,
 #   all folders will be "deployer www-data drwxr-s---",
 #   all files will be   "deployer www-data -rw-r-----"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deployinator
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano