rails_pwnerer 0.7.0 → 0.7.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+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.
 
 v0.6.109. Allow .crt for SSL certificate chains.

data/lib/rails_pwnerer/app/config.rb

@@ -35,8 +35,10 @@ class RailsPwnerer::App::Config
     app_db[:dns_name] ||= ''
     # the environment to run the application in
     app_db[:environment] ||= 'production'
-    # a port for server-based filtering (multiple apps on the same box)
+    # main port where the application receives HTTP(S) outside connections
     app_db[:port] ||= 80
+    # HTTPS applications also accept HTTP connections here, unless 0
+    app_db[:non_ssl_port] ||= 80
     # the maximum request size (megabytes) to be accepted by an application
     app_db[:max_request_mb] ||= 48
     # comma-separated directories that should be writable by the application user
@@ -87,6 +89,7 @@ class RailsPwnerer::App::Config
         app_config[:ssl_cert] = ssl_cert
         app_config[:ssl_key] = ssl_key
         app_config[:port] = 443
+        app_config[:non_ssl_port] = 80
       end
 
       ["config/rails_pwnerer.yml", "config/rails_pwnerer/#{instance_name}.yml"].each do |fname|

data/lib/rails_pwnerer/app/nginx_config.rb

@@ -32,6 +32,7 @@ class RailsPwnerer::App::NginxConfig
       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]}" : "" }
     charset utf-8;
     #{app_config[:ssl_key] ? 'ssl on;' : ''}
     #{app_config[:ssl_key] ? "ssl_certificate #{app_config[:ssl_cert]};" : ''}

data/rails_pwnerer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rails_pwnerer"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_pwnerer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors: