capistrano-uberspace 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9279b0a94cee432653c9d7ef20685975d517c9ff
-  data.tar.gz: 55d26b6a9feed82248028278cd33a8f647dfcfc9
+  metadata.gz: 782159336bca47dafaf38f1950a7910968388cbd
+  data.tar.gz: 888ea7900dfaa7568ec0cce8b8bf6bc61ee3325d
 SHA512:
-  metadata.gz: 8e060adbce9400163de29a59cedd3d02efda82c83beef2e657a872b45e24dd3816ade014d932983a908f8fe1ef94e2cd4263f6a4ee2c746380f80c554923d331
-  data.tar.gz: b970bdb307a3552f107f33ae4de19d164a642c2b7e8260e064fb6622762448c782d2f7090f2f71cc27f7707d0c00151a1211d2b858b8d4f2845ed62ad7e60af1
+  metadata.gz: 36f4875659761a55a46688e458a832abd205144ebf9d2be7206cac5e050451fac9163bb4c87ffc9d2fa27132e005adc3c7f9d2d1d6a411bf3c6d56ace3e68db6
+  data.tar.gz: 8a9b4e819c6936e634f7858a6859216fc8bed65a2f69fd44d4cd1270908914d37499abebbfa321b4a550ce7025c8e15698af47f7b006c41a12de8a6fc1581ab6

data/README.md

@@ -13,11 +13,17 @@ gem 'capistrano', '~> 3.4.0'
 gem 'capistrano-uberspace', github: 'tessi/capistrano-uberspace'
 ```
 
+If you do not install `capistrano-uberspace` in the `production`-group, then add `passenger` as a production dependency:
+
+```ruby
+gem 'passenger', group: :production
+```
+
 And then execute:
 
-    $ bundle
+    $ bundle install
 
-In your `deploy.rb` file specify some app properties:
+In your `config/deploy.rb` file specify some app properties:
 
 ```ruby
 set :application, 'MyGreatApp'
@@ -42,6 +48,15 @@ set :branch, :production
 set :domain, 'my-subdomain.example.tld'
 ```
 
+Optionally, you may specify HTTP BASIC AUTH authentication in your stage definition:
+
+```
+set :htaccess_username, "username"
+set :htaccess_password, "password"
+# instead of the :htaccess_password you may set the hashed password directly:
+# set :htaccess_password_hashed, "bi2wsSekmG6Yw"
+```
+
 Be sure to [setup the ssh-connection to your uberspace](https://wiki.uberspace.de/system:ssh#login_mit_ssh-schluessel1) and make sure that your uberspace is able to checkout your repository.
 
 Require the following parts in your `Capfile`:
@@ -61,7 +76,7 @@ Please bundle the appropriate database-gem in your `Gemfile`.
 
 ## Usage
 
-Execute `bundle exec cap deploy <stage>` to deploy to your uberspace.
+Execute `bundle exec cap <stage> deploy` to deploy to your uberspace.
 
 Configurable options:
 

data/capistrano-uberspace.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'capistrano-uberspace'
-  gem.version       = '1.0.2'
+  gem.version       = '1.1.0'
   gem.authors       = ['Philipp Tessenow']
   gem.email         = ['philipp@tessenow.org']
   gem.description   = %q{uberspace support for your rails app for Capistrano 3.x}

data/lib/capistrano/tasks/uberspace.rake

@@ -14,6 +14,18 @@ gem: --user-install --no-rdoc --no-ri
   end
   after :'uberspace:check', :'uberspace:setup_gemrc'
 
+  task :setup_npmrc do
+    npmrc = <<-EOF
+prefix = #{uberspace_home}
+umask = 077
+    EOF
+
+    on roles fetch(:uberspace_roles) do
+      upload! StringIO.new(npmrc), "#{uberspace_home}/.npmrc"
+    end
+  end
+  after :'uberspace:check', :'uberspace:setup_npmrc'
+
   task :install_bundler do
     on roles fetch(:uberspace_roles) do
       with fetch(:uberspace_env_variables, {}) do
@@ -94,14 +106,38 @@ exec multilog t ./main
 
   task :setup_apache_reverse_proxy do
     on roles fetch(:uberspace_roles) do
+      path = fetch(:domain) ? "/var/www/virtual/#{fetch :user}/#{fetch :domain}" : "/var/www/virtual/#{fetch :user}/html"
+      execute "mkdir -p #{path}"
+      basic_auth = ''
+
+      if fetch(:htaccess_username, false)
+        unless fetch(:htaccess_password_hashed, false)
+          password = fetch(:htaccess_password, -> { abort 'ERROR: Define either :htaccess_password or :htaccess_password_hashed'})
+          salt = [*'0'..'9',*'A'..'Z',*'a'..'z'].sample(2).join
+          set :htaccess_password_hashed, "#{password}".crypt(salt)
+        end
+
+        htpasswd = <<-EOF
+#{fetch :htaccess_username}:#{fetch :htaccess_password_hashed}
+        EOF
+        upload! StringIO.new(htpasswd), "#{path}/../.htpasswd"
+
+        basic_auth = <<-EOF
+AuthType Basic
+AuthName "Restricted"
+AuthUserFile #{File.join(path, '../.htpasswd')}
+Require valid-user
+        EOF
+      end
+      execute "chmod +r #{path}/../.htpasswd"
+
       htaccess = <<-EOF
+#{basic_auth}
 RewriteEngine On
 RewriteBase /
 RewriteRule ^(.*)$ http://localhost:#{passenger_port}/$1 [P]
       EOF
 
-      path = fetch(:domain) ? "/var/www/virtual/#{fetch :user}/#{fetch :domain}" : "/var/www/virtual/#{fetch :user}/html"
-      execute "mkdir -p #{path}"
       upload! StringIO.new(htaccess), "#{path}/.htaccess"
       execute "chmod +r #{path}/.htaccess"
 

data/lib/capistrano/uberspace/defaults.rb

@@ -31,7 +31,7 @@ set :ruby_path, -> { "/package/host/localhost/ruby-#{fetch :ruby_version}/bin" }
 
 set :uberspace_env_variables, lambda {
   {
-    'PATH' => "#{fetch :ruby_path}:#{fetch :gem_path}:$PATH"
+    'PATH' => "#{fetch :ruby_path}:#{fetch :gem_path}:/home/#{fetch :user}/bin:$PATH"
   }.merge(fetch :extra_env_variables)
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-uberspace
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Philipp Tessenow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano