matross 0.5.4 → 0.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTAzNWJkYmUwZGJjY2Y5N2I3ZjU5NDBhYmJjY2IwOWJiZDRlMmYwYQ==
+    MjA3ODRjMThlMzYzOTgxZGE5OTg0NTQ4NDNjZjcyODQxYjNlMmU1Nw==
   data.tar.gz: !binary |-
-    NjZiMDIyM2RhZGIzMTZjZDI1MTlkYjI3ZWM4MTcxMjEwZDg2YjdmMQ==
+    OWUzYWRkYmFjOGU2ZmE3OGQwMTVmNjUwY2MwZDcyMDU5OGFjZDkzMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmZmMGE5MTUwZWJlYWRlYWMxNTAyNjQwZTlmMTgyMWE0NmM1MWU5YmNmNzEz
-    ZDZkOWY1ZDE1OWE3MTgzYzM0Y2VmMzMxZjFhNTQzMDAwYTlmM2IwNWYyYjQ2
-    ZmZiYzBiMGVjZWRhYTZjZWFkMjNhZGU0NjU4Nzc3YjliNTc5NmM=
+    ZDJiNjU2M2U1ZTg5ZmQwNDUwODgxZjU1ZDNhY2VjNmQ4YjU2Y2U2MmRiYjgx
+    M2ZmMzY0ODNjYTVlOGU5ODY4MWUxNTlkODQ5OTEwNWFlN2JkNWY0ZmQ5N2E3
+    ODFmN2I3ZWE3MDcyNzI3ZTg5YzVhYWIxNTU5NmVlYTIwOTJmOTE=
   data.tar.gz: !binary |-
-    MzFlZTRjYjk4YWJhZmFlZTUyNTcwMGQ2OTcyZGM3MTI3NjM0YzI0ODc2ZjQw
-    OWI5MGY4MWZkZDQ4YzRjZTBlOWNlNGYzZWE2MmIyMDMxZjVmYzRkMGQxZTVm
-    Y2EyOTI2YTc4ZTUzYjYyNmZiZjQ4Njc3MDYxYTIwYWFmNzA5ZWE=
+    MzA1MjBkNDdiMDE3ODExNDA5YzY3ZDU0ZWVjNjhhOTVjNDExZjg0ZGVlN2Yx
+    MjRkNDM5YjA0M2I5YTVkMGYxNTJkODhhOTM4M2Y1YmU4ZWVlNDM3ZWRkN2Zj
+    N2Q4MmM2NDU1YjJhNDQyMGQ1NzQ4OTI0YWRlNjFmYThlNWRlYmM=

data/README.md

@@ -114,6 +114,8 @@ Procfile task: `web: bundle exec unicorn -c <%= unicorn_config %> -E <%= rails_e
 
 This recipes creates and configures the virtual_host for the application. [This virtual host] has some sane defaults, suitable for most of our deployments (non-SSL). The file is created at `/etc/nginx/sites-available` and symlinked to `/etc/nginx/sites-enabled`. These are the defaults for the Nginx installation in Ubuntu. You can take a look at [our general `nginx.conf`](https://github.com/innvent/parcelles/blob/puppet/puppet/modules/nginx/files/nginx.conf).
 
+Overwritable template: [`nginx_virtual_host_conf.erb`](lib/matross/templates/nginx/nginx_virtual_host_conf.erb)
+
 > Variables
 
 | Variable                | Default value | Description                                           |
@@ -121,8 +123,6 @@ This recipes creates and configures the virtual_host for the application. [This
 | `:htpasswd`             | None          | `htpasswd` user:password format                       |
 | `:nginx_default_server` | `false`       | Sets the vhost for the specified stage as the default |
 
-
-
 > Tasks
 
 | Task           | Description                                       |

data/lib/matross/nginx.rb

@@ -5,7 +5,7 @@ namespace :nginx do
   desc "Setup application in nginx"
   task :setup, :roles => :web do
     template "nginx/nginx_virtual_host_conf.erb", "/tmp/nginx_virtual_host_conf"
-    run "#{sudo} mv /nginx_virtual_host_conf /etc/nginx/sites-available/#{application}"
+    run "#{sudo} mv /tmp/nginx_virtual_host_conf /etc/nginx/sites-available/#{application}"
     run "#{sudo} ln -fs /etc/nginx/sites-available/#{application} /etc/nginx/sites-enabled/#{application}"
   end
   after "deploy:setup", "nginx:setup"

data/lib/matross/version.rb

@@ -1,3 +1,3 @@
 module Matross
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matross
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Artur Rodrigues
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler