foreman-export-nginx 0.0.20 → 0.0.21

data/README.md

@@ -28,6 +28,7 @@ There is one requied and several optional environment variables:
 * `SSL_CERT_PATH` path to the certificate to use for ssl. Optional if you've set up a wildcard cert.
 * `SSL_KEY_PATH` path to the certificate key. Required if you specified `SSL_CERT_PATH`.
 * `FORCE_SSL` true to force redirect to SSL
+* `FORCE_DOMAIN` redirect all requests to this domain
 
 ## Contributing
 

data/data/export/nginx/nginx.erb

@@ -22,10 +22,14 @@ server {
 
   <% if force_ssl %>
   if ($ssl_protocol = "") {
-     rewrite ^   https://$server_name$request_uri? permanent;
+     rewrite ^https://$server_name$request_uri? permanent;
   }
   <% end %>
-  
+
+  <% if force_domain %>
+  if ( $host != '<%= force_domain %>' ) {
+    rewrite ^http://<%= force_domain %>$request_uri? permanent;
+  }
   <% end %>
 
   root <%= engine.root %>/public;

data/foreman-export-nginx.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "foreman-export-nginx"
-  gem.version       = '0.0.20'
+  gem.version       = '0.0.21'
   gem.authors       = ["Pete Keen"]
   gem.email         = ["pete@bugsplat.info"]
   gem.description   = %q{Export Nginx configs using Foreman}

data/lib/foreman/export/nginx.rb

@@ -21,6 +21,7 @@ module Foreman
           ssl_cert_path = env_var('SSL_CERT_PATH')
           ssl_key_path  = env_var('SSL_KEY_PATH')
           force_ssl = !!env_var('FORCE_SSL')
+          force_domain = env_var('FORCE_DOMAIN')
 
           ports = []
           1.upto(engine.formation[name]) do |num|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-export-nginx
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -69,4 +69,3 @@ signing_key:
 specification_version: 3
 summary: Export Nginx confguration files using Foreman
 test_files: []
-has_rdoc: