capistrano-exts 1.0.1 → 1.1.0

data/README.md

@@ -11,13 +11,13 @@ Installation
 Install the gem
 
 ```ruby
-gem install capistrano-ext
+gem install capistrano-exts
 ```
 
 or add it to your Gemfile
 
 ```ruby
-gem 'capistrano-ext', '>=1.0.0'
+gem 'capistrano-exts', '>=1.0.0'
 ```
 
 Setup

data/examples/php_fpm/deploy/development.rb

@@ -8,6 +8,12 @@ role :web, 'root@example_dev_web.com:22'
 role :app, 'root@example_dev_app.com:22'
 role :db, 'root@example_dev_db.com:22', primary: true
 
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -28,19 +34,45 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
@@ -92,8 +124,8 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #

data/examples/php_fpm/deploy/production.rb

@@ -8,6 +8,12 @@ role :web, 'root@example_prod_web.com:22'
 role :app, 'root@example_prod_app.com:22'
 role :db, 'root@example_prod_db.com:22', primary: true
 
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -28,19 +34,45 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
@@ -92,8 +124,8 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #

data/examples/php_fpm/deploy/staging.rb

@@ -8,6 +8,12 @@ role :web, 'root@example_staging_web.com:22'
 role :app, 'root@example_staging_app.com:22'
 role :db, 'root@example_staging_db.com:22', primary: true
 
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -28,19 +34,45 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
@@ -92,8 +124,8 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #

data/examples/rails_passenger/deploy/development.rb

@@ -8,6 +8,12 @@ role :web, 'root@example_dev_web.com:22'
 role :app, 'root@example_dev_app.com:22'
 role :db, 'root@example_dev_db.com:22', primary: true
 
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -28,19 +34,45 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
@@ -92,8 +124,8 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #

data/examples/rails_passenger/deploy/production.rb

@@ -8,6 +8,12 @@ role :web, 'root@example_prod_web.com:22'
 role :app, 'root@example_prod_app.com:22'
 role :db, 'root@example_prod_db.com:22', primary: true
 
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -28,19 +34,45 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
@@ -92,8 +124,8 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #

data/examples/rails_passenger/deploy/staging.rb

@@ -8,6 +8,12 @@ role :web, 'root@example_staging_web.com:22'
 role :app, 'root@example_staging_app.com:22'
 role :db, 'root@example_staging_db.com:22', primary: true
 
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -28,19 +34,45 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
@@ -92,8 +124,8 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -8,6 +8,12 @@ role :web, 'root@example_dev_web.com:22'
 role :app, 'root@example_dev_app.com:22'
 role :db, 'root@example_dev_db.com:22', primary: true
 
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -28,19 +34,45 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
@@ -92,14 +124,14 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache
 # =>
-set :web_server_mode, :rails_reverse_proxy
+set :web_server_mode, :reverse_proxy
 
 # Server mode specific configurations
 # Uncomment and edit the one depending on the enabled mode

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -8,6 +8,12 @@ role :web, 'root@example_prod_web.com:22'
 role :app, 'root@example_prod_app.com:22'
 role :db, 'root@example_prod_db.com:22', primary: true
 
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -28,19 +34,45 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
@@ -92,14 +124,14 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache
 # =>
-set :web_server_mode, :rails_reverse_proxy
+set :web_server_mode, :reverse_proxy
 
 # Server mode specific configurations
 # Uncomment and edit the one depending on the enabled mode

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -8,6 +8,12 @@ role :web, 'root@example_staging_web.com:22'
 role :app, 'root@example_staging_app.com:22'
 role :db, 'root@example_staging_db.com:22', primary: true
 
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -28,19 +34,45 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
@@ -92,14 +124,14 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache
 # =>
-set :web_server_mode, :rails_reverse_proxy
+set :web_server_mode, :reverse_proxy
 
 # Server mode specific configurations
 # Uncomment and edit the one depending on the enabled mode

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

@@ -30,8 +30,11 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     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" }
+
       localconfig = File.read("public/system/config/localconfig.php.sample")
       mysql_credentials = fetch :mysql_credentials
+      mysql_db_name = fetch :mysql_db_name
 
       # localconfig
       if mysql_credentials.blank?
@@ -63,7 +66,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   # Dependencies
   after "deploy:setup", "contao:setup"
   after "contao:setup", "contao:setup_localconfig"
-  after "contao:setup_localconfig", "mysql:create_db"
   after "deploy:finalize_update", "contao:fix_links"
   after "contao:fix_links", "deploy:cleanup"
   after "deploy:restart", "deploy:fix_permissions"

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

@@ -21,7 +21,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       unless exists?(:app_owner) or exists?(:app_group)
         run <<-CMD
           #{try_sudo} chown -R \
-            #{fetch :app_owner}:#{fetch :app_group} \
+            #{fetch :app_owner, 'www-data'}:#{fetch :app_group, 'www-data'} \
             #{fetch :deploy_to}/releases \
             #{fetch :deploy_to}/shared
         CMD

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

@@ -1,4 +1,5 @@
 require 'capistrano'
+require 'digest/sha1'
 require 'highline'
 
 # Verify that Capistrano is version 2
@@ -48,8 +49,26 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
-  def mysql_db_name(local_branch = nil)
-    local_branch ||= fetch :branch
-    "#{fetch :application}_co_#{local_branch}"
+  def mysql_db_hosts
+    # TODO: Do some real work here, we shouldn't be allowing all hosts but only all db/web/app hosts.
+    ['%']
+  end
+
+  def random_tmp_file(data = nil)
+    if data.present?
+      data_hash = Digest::SHA1.hexdigest data
+      "/tmp/#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}_#{data_hash}"
+    else
+      "/tmp/#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}"
+    end
+  end
+
+  # Helper for some mysql tasks
+  def mysql_credentials
+    return <<-EOS
+      hostname: localhost
+      username: #{mysql_db_user}
+      password: #{fetch :mysql_db_pass}
+    EOS
   end
 end

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

@@ -11,8 +11,11 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Backup database"
     task :backup_db, :roles => :db, :except => { :no_release => true } do
       mysql_credentials = fetch :mysql_credentials
+      mysql_db_name = fetch :mysql_db_name
       MYSQL_DB_BACKUP_PATH = "#{deploy_to}/backups/#{mysql_db_name}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}.sql"
 
+      on_rollback { run "rm -f #{MYSQL_DB_BACKUP_PATH}" }
+
       if exists?(:mysql_credentials)
         begin
           run <<-CMD
@@ -39,6 +42,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "drop database"
     task :drop_db, :roles => :db, :except => { :no_release => true } do
       mysql_credentials = fetch :mysql_credentials
+      mysql_db_name = fetch :mysql_db_name
 
       unless mysql_credentials.blank?
         begin
@@ -56,9 +60,69 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
+    desc "create database user"
+    task :create_db_user, :roles => :db, :except => { :no_release => true } do
+      mysql_root_credentials = fetch :mysql_root_credentials
+      mysql_db_user = fetch :mysql_db_user
+      random_file = random_tmp_file mysql_root_credentials[:pass]
+
+      unless mysql_root_credentials.blank?
+        set :mysql_db_pass, -> { gen_pass(8) }
+        mysql_create = ""
+
+        mysql_db_hosts.each do |host|
+          mysql_create << <<-EOS
+            CREATE USER '#{mysql_db_user}'@'#{host}' IDENTIFIED BY '#{fetch :mysql_db_pass}';
+            GRANT ALL ON `#{fetch :application}\_%`.* TO '#{mysql_db_user}'@'#{host}';
+            FLUSH PRIVILEGES;
+          EOS
+        end
+
+        put mysql_create, random_file
+
+        begin
+          run <<-CMD
+            mysql \
+              --host='#{mysql_root_credentials[:host]}' \
+              --user='#{mysql_root_credentials[:user]}' \
+              --password='#{mysql_root_credentials[:pass]}' \
+              --default-character-set=utf8 < \
+              #{random_file}
+          CMD
+
+          run <<-CMD
+            rm -f #{random_file}
+          CMD
+
+          find_and_execute_task("mysql:write_db_credentials")
+        rescue
+          puts "WARNING: The user #{application} already exists."
+          find_and_execute_task("mysql:print_db_credentials")
+        end
+      end
+    end
+
+    desc "write database credentials"
+    task :write_db_credentials do
+      mysql_credentials_file = fetch :mysql_credentials_file
+      unless exists?(:mysql_credentials_file) and remote_file_exists?(mysql_credentials_file)
+          put mysql_credentials, mysql_credentials_file
+      end
+    end
+
+    desc "print database credentials"
+    task :print_db_credentials do
+      mysql_credentials_file = fetch :mysql_credentials_file
+      unless exists?(:mysql_credentials_file) and remote_file_exists?(mysql_credentials_file)
+        puts "WARNING: mysql_credentials_file is not defined in config.rb you have to manually copy the following info into a credential file and define it"
+        puts mysql_credentials
+      end
+    end
+
     desc "create database"
     task :create_db, :roles => :db, :except => { :no_release => true } do
       mysql_credentials = fetch :mysql_credentials
+      mysql_db_name = fetch :mysql_db_name
 
       unless mysql_credentials.blank?
         begin
@@ -77,7 +141,10 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Import a database dump"
     task :import_db_dump, :roles => :db, :except => { :no_release => true } do
+      on_rollback { run "rm -f /tmp/#{mysql_db_name}_dump.sql" }
+
       mysql_credentials = fetch :mysql_credentials
+      mysql_db_name = fetch :mysql_db_name
 
       unless ARGV.size >=2 and File.exists?(ARGV[1])
         puts "ERROR: please run 'cap mysql:import_db_dump <sql dump>'"
@@ -112,6 +179,8 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Export a database dump"
     task :export_db_dump, :roles => :db, :except => { :no_release => true } do
+      on_rollback { run "rm -f /tmp/#{File.basename MYSQL_DB_BACKUP_PATH}{,.bz2" }
+
       mysql_credentials = fetch :mysql_credentials
 
       unless ARGV.size >=2 or File.exists?(ARGV[1])
@@ -152,12 +221,20 @@ Capistrano::Configuration.instance(:must_exist).load do
             set :mysql_credentials, false
           end
 
-         if exists?(:mysql_credentials_file_contents)
-            set :mysql_credentials, {
-              host: mysql_credentials_file_contents.match(mysql_credentials_host_regex)[mysql_credentials_host_regex_match].chomp,
-              user: mysql_credentials_file_contents.match(mysql_credentials_user_regex)[mysql_credentials_user_regex_match].chomp,
-              pass: mysql_credentials_file_contents.match(mysql_credentials_pass_regex)[mysql_credentials_pass_regex_match].chomp,
-            }
+          if exists?(:mysql_credentials_file_contents)
+            mysql_credentials_file_contents = fetch :mysql_credentials_file_contents
+
+            unless mysql_credentials_file_contents.blank?
+              mysql_credentials = {
+                host: mysql_credentials_file_contents.match(mysql_credentials_host_regex).try(:[], mysql_credentials_host_regex_match).try(:chomp),
+                user: mysql_credentials_file_contents.match(mysql_credentials_user_regex).try(:[], mysql_credentials_user_regex_match).try(:chomp),
+                pass: mysql_credentials_file_contents.match(mysql_credentials_pass_regex).try(:[], mysql_credentials_pass_regex_match).try(:chomp),
+              }
+
+              if mysql_credentials[:user].present? and mysql_credentials[:pass].present?
+                set :mysql_credentials, mysql_credentials
+              end
+            end
           end
         end
 
@@ -185,12 +262,19 @@ Capistrano::Configuration.instance(:must_exist).load do
             set :mysql_root_credentials, false
           end
 
-         if exists?(:mysql_root_credentials_file_contents)
-            set :mysql_root_credentials, {
-              host: mysql_root_credentials_file_contents.match(mysql_root_credentials_host_regex)[mysql_root_credentials_host_regex_match].chomp,
-              user: mysql_root_credentials_file_contents.match(mysql_root_credentials_user_regex)[mysql_root_credentials_user_regex_match].chomp,
-              pass: mysql_root_credentials_file_contents.match(mysql_root_credentials_pass_regex)[mysql_root_credentials_pass_regex_match].chomp,
-            }
+          if exists?(:mysql_root_credentials_file_contents)
+            mysql_root_credentials_file_contents = fetch :mysql_root_credentials_file_contents
+            unless mysql_root_credentials_file_contents.blank?
+              mysql_root_credentials = {
+                host: mysql_root_credentials_file_contents.match(mysql_root_credentials_host_regex).try(:[], mysql_root_credentials_host_regex_match).try(:chomp),
+                user: mysql_root_credentials_file_contents.match(mysql_root_credentials_user_regex).try(:[], mysql_root_credentials_user_regex_match).try(:chomp),
+                pass: mysql_root_credentials_file_contents.match(mysql_root_credentials_pass_regex).try(:[], mysql_root_credentials_pass_regex_match).try(:chomp),
+              }
+
+              if mysql_root_credentials[:user].present? and mysql_root_credentials[:pass].present?
+                set :mysql_root_credentials, mysql_root_credentials
+              end
+            end
           end
         end
 
@@ -211,4 +295,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   before "mysql:create_db", "mysql:credentials"
   before "mysql:import_db_dump", "mysql:backup_db"
   before "mysql:export_db_dump", "mysql:backup_db"
+  before "mysql:create_db_user", "mysql:root_credentials"
+  after  "mysql:create_db_user", "mysql:create_db"
 end

data/lib/capistrano-exts/receipts/servers/db_server.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'capistrano-exts/receipts/mysql'
+
 # Verify that Capistrano is version 2
 unless Capistrano::Configuration.respond_to?(:instance)
   abort "This extension requires Capistrano 2"
@@ -9,11 +11,19 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deploy do
     namespace :server do
       namespace :db_server do
-        desc "Setup db server"
-        task :setup, :roles => :db do
+        desc "[internal] Prepare the database server"
+        task :prepare, :roles => :db do
+          # Empty task, server preparation goes into callbacks
+        end
+
+        desc "[internal] Finished preparing the database server"
+        task :finish, :roles => :db do
           # Empty task, server preparation goes into callbacks
         end
       end
     end
   end
+
+  before "deploy:server:db_server:prepare", "mysql:create_db_user"
+  after  "deploy:server:db_server:prepare", "deploy:server:db_server:finish"
 end

data/lib/capistrano-exts/receipts/servers/web_server.rb

@@ -15,8 +15,13 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deploy do
     namespace :server do
       namespace :web_server do
-        desc "Setup web server"
-        task :setup, :roles => :web do
+        desc "Prepare the web server"
+        task :prepare, :roles => :web do
+          # Empty task, server preparation goes into callbacks
+        end
+
+        desc "Finished preparing the web server"
+        task :finish do
           # Empty task, server preparation goes into callbacks
         end
 
@@ -65,7 +70,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           if exists?(:web_server_auth_file)
             web_server_auth_file = fetch :web_server_auth_file
             web_server_auth_file_contents = fetch :web_server_auth_file_contents
-            random_file = "/tmp/#{fetch :application}_#{Digest::SHA1.hexdigest web_server_auth_file_contents}"
+            random_file = random_tmp_file web_server_auth_file_contents
 
             run <<-CMD
               #{try_sudo} mkdir -p #{File.dirname web_server_auth_file}
@@ -96,16 +101,12 @@ Capistrano::Configuration.instance(:must_exist).load do
             CMD
           end
         end
-
-        task :finish do
-          # Empty task for callbacks
-        end
       end
     end
   end
 
-  before "deploy:server:web_server:setup", "deploy:server:web_server:generate_web_configuration"
-  after  "deploy:server:web_server:setup", "deploy:server:web_server:finish"
+  before "deploy:server:web_server:prepare", "deploy:server:web_server:generate_web_configuration"
+  after  "deploy:server:web_server:prepare", "deploy:server:web_server:finish"
   after "deploy:server:web_server:generate_web_configuration", "deploy:server:web_server:generate_authentification"
   after "deploy:server:web_server:generate_web_configuration", "deploy:server:web_server:write_web_conf_file"
   after "deploy:server:web_server:generate_authentification", "deploy:server:web_server:write_web_server_auth_file"

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

@@ -15,7 +15,7 @@ end
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :deploy do
     namespace :server do
-      namespace :setup do
+      namespace :prepare do
         desc "Prepare the server (database server, web server and folders)"
         task :default do
           # Empty task, server preparation goes into callbacks
@@ -43,9 +43,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   # Callbacks
-  before "deploy:server:setup", "deploy:server:setup:folders"
-  after  "deploy:server:setup", "deploy:server:setup:finish"
+  before "deploy:server:prepare", "deploy:server:prepare:folders"
+  after  "deploy:server:prepare", "deploy:server:prepare:finish"
 
-  after "deploy:server:setup:folders", "deploy:server:db_server:setup"
-  after "deploy:server:setup:folders", "deploy:server:web_server:setup"
+  after "deploy:server:prepare:folders", "deploy:server:db_server:prepare"
+  after "deploy:server:prepare:folders", "deploy:server:web_server:prepare"
 end

data/lib/capistrano-exts/servers/web_server/nginx.rb

@@ -5,7 +5,7 @@ module Capistrano
     module Server
       class Nginx < WebServer
 
-        AVAILABLE_MODES = [:passenger, :rails_reverse_proxy, :php_fpm]
+        AVAILABLE_MODES = [:passenger, :reverse_proxy, :php_fpm]
         NGINX_TEMPLATE_PATH = ROOT_PATH + '/capistrano-exts/templates/web_servers/nginx.conf.erb'
 
         def initialize(mode, template_path = NGINX_TEMPLATE_PATH)

data/lib/capistrano-exts/servers/web_server.rb

@@ -17,7 +17,7 @@ module Capistrano
           end
 
           def reverse_proxy?
-            @mode == :rails_reverse_proxy
+            @mode == :reverse_proxy
           end
 
           def mod_rewrite?

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

@@ -5,9 +5,11 @@ role :web, 'root@nasreddine.com:22'
 role :app, 'root@nasreddine.com:22'
 role :db, 'root@nasreddine.com:22', primary: true
 
-# Permissions (ownership)
-set :app_owner, 'www'
-set :app_group, 'www'
+# Permissions and ownership
+# Uncomment if necessary...
+# set :app_owner, 'www-data'
+# set :app_group, 'www-data'
+# set :group_writable, true
 
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
@@ -29,22 +31,49 @@ set :keep_releases, 5
 # Using RVM? Set this to the ruby version/gemset to use
 set :rvm_ruby_string, "1.9.2"
 
-# Mysql credentials
+#############
+# Mysql
+#
+
+# What is the database name for this project/stage ?
+set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
+
+# What is the database user ?
+# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+set :mysql_db_user,                           -> { "#{fetch :application}" }
+
+# Where the database credentials are stored on the server ?
 set :mysql_credentials_file,                  -> { "#{deploy_to}/.mysql_password"}
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_credentials_host_regex,            /hostname: (.*)$/o
 set :mysql_credentials_host_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_credentials_user_regex,            /username: (.*)$/o
 set :mysql_credentials_user_regex_match,      1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
+
+# Where can we find root credentials ?
+# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the hostname
 set :mysql_root_credentials_host_regex,       /hostname: (.*)$/o
 set :mysql_root_credentials_host_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the username
 set :mysql_root_credentials_user_regex,       /username: (.*)$/o
 set :mysql_root_credentials_user_regex_match, 1
+
+# Define the regex / match that will be ran against the contents of the file above to fetch the password
 set :mysql_root_credentials_pass_regex,       /password: (.*)$/o
 set :mysql_root_credentials_pass_regex_match, 1
 
+
 #############
 # Web server
 #
@@ -93,14 +122,14 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :passenger, :php_fpm
-# => :rails_reverse_proxy is used for unicorn (Rack apps)
+# => :reverse_proxy, :passenger, :php_fpm
+# => :reverse_proxy is used for unicorn (Rack apps)
 # => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache
 # =>
-set :web_server_mode, :rails_reverse_proxy
+set :web_server_mode, :reverse_proxy
 
 # Server mode specific configurations
 # Uncomment and edit the one depending on the enabled mode

data/lib/capistrano-exts/version.rb

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

data/spec/requests/nginx_spec.rb

@@ -31,7 +31,7 @@ describe Nginx do
 
   end
 
-  describe ":rails_reverse_proxy" do
+  describe ":reverse_proxy" do
 
   end
 

data/spec/servers/web_server/nginx_spec.rb

@@ -83,8 +83,8 @@ describe Nginx do
       end
     end
 
-    describe ":rails_reverse_proxy" do
-      subject { Nginx.new :rails_reverse_proxy }
+    describe ":reverse_proxy" do
+      subject { Nginx.new :reverse_proxy }
 
       before(:each) do
         subject.application_url = %w{example.com www.example.com}
@@ -225,8 +225,8 @@ describe Nginx do
       end
     end
 
-    describe ":rails_reverse_proxy" do
-      subject { Nginx.new :rails_reverse_proxy }
+    describe ":reverse_proxy" do
+      subject { Nginx.new :reverse_proxy }
 
       before(:each) do
         subject.application_url = %w{example.com www.example.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   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: &2156371700 !ruby/object:Gem::Requirement
+  requirement: &2161009320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156371700
+  version_requirements: *2161009320
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156370900 !ruby/object:Gem::Requirement
+  requirement: &2161008820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156370900
+  version_requirements: *2161008820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156370320 !ruby/object:Gem::Requirement
+  requirement: &2152515960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156370320
+  version_requirements: *2152515960
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2156384460 !ruby/object:Gem::Requirement
+  requirement: &2152514760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2156384460
+  version_requirements: *2152514760
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2156382840 !ruby/object:Gem::Requirement
+  requirement: &2152512100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2156382840
+  version_requirements: *2152512100
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156382080 !ruby/object:Gem::Requirement
+  requirement: &2152509640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2156382080
+  version_requirements: *2152509640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156381120 !ruby/object:Gem::Requirement
+  requirement: &2152509160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156381120
+  version_requirements: *2152509160
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156380360 !ruby/object:Gem::Requirement
+  requirement: &2152508660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.2.12
   type: :development
   prerelease: false
-  version_requirements: *2156380360
+  version_requirements: *2152508660
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2156379840 !ruby/object:Gem::Requirement
+  requirement: &2161039720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *2156379840
+  version_requirements: *2161039720
 - !ruby/object:Gem::Dependency
   name: faker19
-  requirement: &2156379320 !ruby/object:Gem::Requirement
+  requirement: &2161039260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *2156379320
+  version_requirements: *2161039260
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com