deployinator 0.1.1 → 0.1.2

data/lib/deployinator/check.rb

@@ -32,7 +32,7 @@ namespace :deploy do
     end
 
     desc 'Ensure all deployinator specific settings are set, and warn and raise if not.'
-    task :settings do
+    before 'deploy:check', :settings do
       {
         (File.dirname(__FILE__) + "/examples/config/deploy.rb") => 'config/deploy.rb',
         (File.dirname(__FILE__) + "/examples/config/deploy/staging.rb") => "config/deploy/#{fetch(:stage)}.rb"

data/lib/deployinator/deploy.rb

@@ -22,10 +22,12 @@ namespace :deploy do
       task :precompile => ['deployinator:deployment_user'] do
         on roles(fetch(:assets_roles)) do
           execute(
-            "docker", "run", "--rm", "--tty", "--user", fetch(:deployment_user_id),
+            "docker", "run", "--rm", "--tty", "--user", fetch(:webserver_username),
             "-w", release_path,
             "--link", "#{fetch(:postgres_container_name)}:postgres",
             "--entrypoint", "/bin/bash",
+            "--volume", "/etc/passwd:/etc/passwd:ro",
+            "--volume", "/etc/group:/etc/group:ro",
             "--volume", "#{fetch(:deploy_to)}:#{fetch(:deploy_to)}:rw",
             fetch(:ruby_image_name), "-c",
             "\"umask", "0007", "&&", "#{shared_path.join('bundle', 'bin', 'rake')}",

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

@@ -7,6 +7,7 @@ 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 :webserver_owned_dirs,        [shared_path.join('tmp', 'cache'), shared_path.join('public', 'assets')]
 set :webserver_writeable_dirs,    [shared_path.join('run'), shared_path.join("tmp"), shared_path.join("log")]
 set :webserver_executable_dirs,   [shared_path.join("bundle", "bin")]
 set :ignore_permissions_dirs,     [shared_path.join("postgres"), shared_path.join("nginx")]

data/lib/deployinator/helpers.rb

@@ -58,8 +58,20 @@ namespace :deployinator do
           ["-not", "-path", "\"#{dir}\"", "-not", "-path", "\"#{dir}/*\""]
         end
 
+        chown_ignore_options = fetch(:webserver_owned_dirs).collect do |dir|
+          ["-not", "-path", "\"#{dir}\"", "-not", "-path", "\"#{dir}/*\""]
+        end
+
+        # chown webserver owned
+        fetch(:webserver_owned_dirs).each do |dir|
+          if directory_exists?(dir)
+            execute "find", dir, ignore_options,
+              "-exec", "chown", "#{fetch(:webserver_user_id)}:#{fetch(:webserver_user_id)}", "{}", "+"
+          end
+        end
+
         # chown
-        execute "find", fetch(:deploy_to), ignore_options,
+        execute "find", fetch(:deploy_to), ignore_options, chown_ignore_options,
           "-exec", "chown", "#{fetch(:deployment_user_id)}:#{fetch(:webserver_user_id)}", "{}", "+"
 
         # chmod executable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deployinator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano