capistrano-exts 1.1.2 → 1.1.3

data/examples/php_fpm/deploy/development.rb

@@ -23,10 +23,30 @@ set :branch, "master"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -149,5 +169,19 @@ set :php_fpm_port, '9000'
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/examples/php_fpm/deploy/production.rb

@@ -23,10 +23,30 @@ set :branch, "production"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -149,5 +169,19 @@ set :php_fpm_port, '9000'
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/examples/php_fpm/deploy/staging.rb

@@ -23,10 +23,30 @@ set :branch, "staging"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -149,5 +169,19 @@ set :php_fpm_port, '9000'
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/examples/rails_passenger/deploy/development.rb

@@ -23,10 +23,30 @@ set :branch, "master"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -149,5 +169,19 @@ set :web_server_mode, :passenger
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/examples/rails_passenger/deploy/production.rb

@@ -23,10 +23,30 @@ set :branch, "production"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -149,5 +169,19 @@ set :web_server_mode, :passenger
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/examples/rails_passenger/deploy/staging.rb

@@ -23,10 +23,30 @@ set :branch, "staging"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -149,5 +169,19 @@ set :web_server_mode, :passenger
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -23,10 +23,30 @@ set :branch, "master"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -149,5 +169,19 @@ set :web_server_mode, :reverse_proxy
 # => What is the path to the socket file
 set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -23,10 +23,30 @@ set :branch, "production"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -149,5 +169,19 @@ set :web_server_mode, :reverse_proxy
 # => What is the path to the socket file
 set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -23,10 +23,29 @@ set :branch, "staging"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -149,5 +168,19 @@ set :web_server_mode, :reverse_proxy
 # => What is the path to the socket file
 set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/lib/capistrano-exts/receipts/contao.rb

@@ -8,6 +8,9 @@ unless Capistrano::Configuration.respond_to?(:instance)
 end
 
 Capistrano::Configuration.instance(:must_exist).load do
+  # Prevent capistrano from creating log, system and pids folders.
+  set :shared_children, Array.new
+
   namespace :deploy do
     desc "Empty task, overriden by #{__FILE__}"
     task :finalize_update do
@@ -19,18 +22,19 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "[internal] Setup contao shared contents"
     task :setup, :roles => :app, :except => { :no_release => true } do
       run <<-CMD
-        #{try_sudo} mkdir -p #{shared_path}/log &&
-        #{try_sudo} mkdir -p #{shared_path}/contenu &&
-        #{try_sudo} mkdir -p #{shared_path}/contenu/images &&
-        #{try_sudo} mkdir -p #{shared_path}/contenu/videos &&
-        #{try_sudo} mkdir -p #{shared_path}/contenu/son &&
-        #{try_sudo} mkdir -p #{shared_path}/contenu/pdfs
+        #{try_sudo} mkdir -p #{shared_path}/logs &&
+        #{try_sudo} mkdir -p #{shared_path}/config &&
+        #{try_sudo} mkdir -p #{shared_path}/contents &&
+        #{try_sudo} mkdir -p #{shared_path}/contents/image &&
+        #{try_sudo} mkdir -p #{shared_path}/contents/video &&
+        #{try_sudo} mkdir -p #{shared_path}/contents/audio &&
+        #{try_sudo} mkdir -p #{shared_path}/contents/pdf
       CMD
     end
 
     desc "[internal] Setup contao's localconfig"
     task :setup_localconfig, :roles => :app, :except => { :no_release => true } do
-      on_rollback { run "rm -f #{shared_path}/localconfig.php" }
+      on_rollback { run "rm -f #{shared_path}/config/localconfig.php" }
 
       localconfig = File.read("public/system/config/localconfig.php.sample")
       mysql_credentials = fetch :mysql_credentials
@@ -48,17 +52,46 @@ Capistrano::Configuration.instance(:must_exist).load do
         localconfig.gsub!(/#DB_NAME#/, mysql_db_name)
       end
 
-      put localconfig, "#{shared_path}/localconfig.php"
+      put localconfig, "#{shared_path}/config/localconfig.php"
+    end
+
+    desc "[internal] Setup .htaccess"
+    task :setup_htaccess do
+      unless remote_file_exists?("#{fetch :shared_path}/config/htaccess.txt")
+        begin
+          run <<-CMD
+            #{try_sudo} cp #{fetch :latest_release}/public/.htaccess.default #{fetch :shared_path}/config/htaccess.txt
+          CMD
+        rescue
+          run <<-CMD
+            #{try_sudo} touch #{fetch :shared_path}/config/htaccess.txt
+          CMD
+        end
+      end
     end
 
+    desc "[internal] Fix contao's symlinks to the shared path"
     task :fix_links, :roles => :app, :except => { :no_release => true } do
+      contents_path = fetch :contents_path, "#{fetch :public_path}/tl_files/contents"
+
+      # Remove files
+      run <<-CMD
+        #{try_sudo} rm -f #{contents_path} &&
+        #{try_sudo} rm -rf #{fetch :latest_release}/public/system/logs &&
+        #{try_sudo} rm -f #{fetch :latest_release}/public/system/config/localconfig.php &&
+        #{try_sudo} rm -f #{fetch :latest_release}/public/.htaccess
+      CMD
+
+      run <<-CMD
+        mkdir -p #{File.dirname(contents_path)}
+      CMD
+
+      # Create symlinks
       run <<-CMD
-        #{try_sudo} rm -rf #{fetch :latest_release}/public/tl_files/durable/contenu &&
-        #{try_sudo} rm -rf #{fetch :latest_release}/log &&
-        #{try_sudo} ln -nsf #{fetch :shared_path}/contenu #{fetch :latest_release}/public/tl_files/durable/contenu &&
-        #{try_sudo} ln -nsf #{fetch :shared_path}/htaccess.txt #{fetch :latest_release}/public/.htaccess &&
-        #{try_sudo} ln -nsf #{fetch :shared_path}/localconfig.php #{fetch :latest_release}/public/system/config/localconfig.php &&
-        #{try_sudo} ln -nsf #{fetch :shared_path}/log #{fetch :latest_release}/log
+        #{try_sudo} ln -nsf #{fetch :shared_path}/contents #{contents_path} &&
+        #{try_sudo} ln -nsf #{fetch :shared_path}/config/htaccess.txt #{fetch :latest_release}/public/.htaccess &&
+        #{try_sudo} ln -nsf #{fetch :shared_path}/config/localconfig.php #{fetch :latest_release}/public/system/config/localconfig.php &&
+        #{try_sudo} ln -nsf #{fetch :shared_path}/logs #{fetch :latest_release}/public/system/logs
       CMD
     end
   end
@@ -67,6 +100,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   after "deploy:setup", "contao:setup"
   after "contao:setup", "contao:setup_localconfig"
   after "deploy:finalize_update", "contao:fix_links"
+  before "contao:fix_links", "contao:setup_htaccess"
   after "contao:fix_links", "deploy:cleanup"
   after "deploy:restart", "deploy:fix_permissions"
 

data/lib/capistrano-exts/templates/multistage.rb

@@ -20,10 +20,30 @@ set :branch, "master"
 set :use_sudo, false
 
 # Define deployments options
-set :deploy_to,   "/home/vhosts/#{application}"
+# NOTE: Do not use current_path here but use latest_release instead.
+set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
+set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
+set :public_path, -> { "#{fetch :latest_release}/public" }
+
+# How should we deploy?
+# Valid options:
+# => checkout: this deployment strategy does an SCM checkout on each target
+#              host. This is the default deployment strategy for Capistrano.
+#
+# => copy: this deployment strategy work by preparing the source code locally,
+#          compressing it, copying the file to each target host, and
+#          uncompressing it to the deployment directory.
+#          NOTE: This strategy has more options you can configure, please refer
+#                to capistrano/recipes/deploy/strategy/copy.rb (in capistrano)
+#                source or documentation for more information
+#
+# => export: this deployment strategy does an SCM export on each target host.
+#
+# => remote_cache: this deployment strategy keeps a cached checkout of the
+#                  source code on each remote server. Each deploy simply updates
+#                  the cached checkout, and then does a copy from the cached
+#                  copy to the final deployment location.
 set :deploy_via,  :remote_cache
-set :logs_path,   "#{deploy_to}/logs"
-set :public_path, -> { "#{current_path}/public" }
 
 # Keep only the last 5 releases
 set :keep_releases, 5
@@ -90,7 +110,7 @@ set :web_server_app, :nginx
 # Absolute path to this application's web server configuration
 # This gem suppose that you are already including files from the folder you're placing
 # the config file in, if not the application won't be up after deployment
-set :web_conf_file, -> { "/etc/nginx/#{fetch(:stage).to_s}/#{fetch :application}.conf" }
+set :web_conf_file, -> { "/etc/nginx/#{fetch :stage}/#{fetch :application}.conf" }
 
 # Which port does the server runs on ?
 set :web_server_listen_port, 80
@@ -109,7 +129,7 @@ set :web_server_indexes, %w(index.php index.html)
 # web_server_auth_credentials is an array of user/password hashes, you can use
 # gen_pass(length) in a Proc to generate a new password as shown below
 #
-# set :web_server_auth_file,        -> { "/etc/nginx/htpasswds/#{fetch :application}.crypt" }
+# set :web_server_auth_file,        -> { "/etc/nginx/#{fetch :stage}/htpasswds/#{fetch :application}.crypt" }
 # set :web_server_auth_credentials, [
 #                                     {user: 'user1', password: 'pass1'},
 #                                     {user: 'user2', password: -> { gen_pass(8) } },
@@ -147,5 +167,20 @@ set :web_server_mode, :reverse_proxy
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
+#
+#
+#############
+
+#############
+# Contao
+#
+
+# Where do you store contao contents ?
+# The contents are stored in the shared path because they are uploaded from
+# contao's admin section
+# Uncomment if necessary (default to public_path/tl_files/contents)
+# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
+
+#
 #
 #############

data/lib/capistrano-exts/version.rb

@@ -3,7 +3,7 @@ module Capistrano
     module Version #:nodoc:
       MAJOR = 1
       MINOR = 1
-      TINY = 2
+      TINY = 3
 
       ARRAY  = [MAJOR, MINOR, TINY]
       STRING = ARRAY.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2156449000 !ruby/object:Gem::Requirement
+  requirement: &2156618100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156449000
+  version_requirements: *2156618100
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2157203840 !ruby/object:Gem::Requirement
+  requirement: &2152375480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157203840
+  version_requirements: *2152375480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157203380 !ruby/object:Gem::Requirement
+  requirement: &2152372740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157203380
+  version_requirements: *2152372740
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2157202920 !ruby/object:Gem::Requirement
+  requirement: &2152370700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2157202920
+  version_requirements: *2152370700
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2157202460 !ruby/object:Gem::Requirement
+  requirement: &2156649860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2157202460
+  version_requirements: *2156649860
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2157202000 !ruby/object:Gem::Requirement
+  requirement: &2156649400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2157202000
+  version_requirements: *2156649400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157201540 !ruby/object:Gem::Requirement
+  requirement: &2156648940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157201540
+  version_requirements: *2156648940
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2157201080 !ruby/object:Gem::Requirement
+  requirement: &2156648480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.2.12
   type: :development
   prerelease: false
-  version_requirements: *2157201080
+  version_requirements: *2156648480
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2157200620 !ruby/object:Gem::Requirement
+  requirement: &2156648020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *2157200620
+  version_requirements: *2156648020
 - !ruby/object:Gem::Dependency
   name: faker19
-  requirement: &2157200160 !ruby/object:Gem::Requirement
+  requirement: &2156647560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *2157200160
+  version_requirements: *2156647560
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com