Skip to content

Commit

Permalink
Bugfix in the HTTPS / HTTP support.
Browse files Browse the repository at this point in the history
  • Loading branch information
pwnall committed Dec 17, 2012
1 parent e2a9c86 commit 63193a2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/rails_pwnerer/app/nginx_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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]};" : ''}
Expand Down

0 comments on commit 63193a2

Please sign in to comment.