Permalink
Browse files

Bugfix in the HTTPS / HTTP support.

  • Loading branch information...
1 parent e2a9c86 commit 63193a22120c0f1b6257d46964d8be4197053a22 @pwnall committed Dec 17, 2012
Showing with 3 additions and 1 deletion.
  1. +2 −0 CHANGELOG
  2. +1 −1 lib/rails_pwnerer/app/nginx_config.rb
View
@@ -1,3 +1,5 @@
+v0.7.2. Bugfix in the HTTP / HTTPS mixed support.
+
v0.7.1. Allow SSL apps to listen on non-SSL port as well.
v0.7.0. New config layout facilitates having per-host configs in separate repository.
@@ -32,7 +32,7 @@ def config_nginx(app_name, instance_name)
f << <<NGINX_CONFIG
server {
listen #{app_port}#{app_config[:ssl_key] ? ' ssl' : ''};
- #{(app_config[:ssl_key] && app_config[:non_ssl_port] != 0) ? "listen #{app_config[:non_ssl_port]}" : "" }
+ #{(app_config[:ssl_key] && app_config[:non_ssl_port] != 0) ? "listen #{app_config[:non_ssl_port]};" : "" }
charset utf-8;
#{app_config[:ssl_key] ? 'ssl on;' : ''}
#{app_config[:ssl_key] ? "ssl_certificate #{app_config[:ssl_cert]};" : ''}

0 comments on commit 63193a2

Please sign in to comment.