0
@@ -1,7 +1,7 @@
0
 require 'rubygems'
0
 require 'echoe'
0
 
0
-Echoe.new('nginx_config_generator', '1.2') do |p|
0
+Echoe.new('nginx_config_generator', '1.3') do |p|
0
   p.rubyforge_name = 'err'
0
   p.author = 'Chris Wanstrath'
0
   p.email = 'chris@ozmm.org'

0
@@ -60,6 +60,7 @@ ssl_sites:
0
       - 127.0.0.1:8000
0
       - 127.0.0.1:8001
0
     no_www: true
0
+    server_name: errtheblog.com
0
     # Just strings that get spit out as rewrites
0
     rewrites:
0
       - ^/feed/feedburner http://feeds.feedburner.com/errtheblog

0
@@ -53,18 +53,18 @@ http {
0
   # this is where you define your mongrel clusters. 
0
   # you need one of these blocks for each cluster
0
   # and each one needs its own name to refer to it later.
0
-<% config['sites'].each do |name, site| %>
0
-<% next unless site['upstream'] %>
0
+<% Array(config['sites']).each do |name, site| %>
0
+  <% next unless site['upstream'] %>
0
   upstream <%= name %> {
0
-<% Array(site['upstream'] || site['upstreams']).each do |server| %>
0
+  <% Array(site['upstream'] || site['upstreams']).each do |server| %>
0
     server <%= server %>;
0
-<% end %>
0
+  <% end %>
0
   }
0
 <% end %>
0
 
0
 <% %w(sites ssl_sites).each do |site_type| %>
0
   
0
-<% config[site_type].each do |name, site| %>
0
+<% Array(config[site_type]).each do |name, site| %>
0
   # the server directive is nginx's virtual host directive.
0
   server {
0
     

0
@@ -14,14 +14,14 @@ env_out = ENV['NGINX_CONFIG_FILE']
0
 
0
 error "Usage: generate_nginx_config [config file] [out file]" if ARGV.empty? && !env_in
0
 
0
-overwrite = !(%w(-y -o -f --force --overwrite) & ARGV).empty?
0
+overwrite = %w(-y -o -f --force --overwrite).any? { |f| ARGV.delete(f) }
0
 
0
-config   = YAML.load(ERB.new(env_in || ARGV.shift || 'config.yml').result)
0
+config   = YAML.load_file(ERB.new(env_in || ARGV.shift || 'config.yml').result)
0
 template = file:'nginx.erb'
0
 
0
 if File.exists?(out_file = env_out || ARGV.shift || 'nginx.conf') && !overwrite
0
   error "=> #{out_file} already exists, won't overwrite it.  Quitting."
0
 else
0
-  open(out_file, 'w+').write(ERB.new(File.read(template), nil, '>').result)
0
+  open(out_file, 'w+').write(ERB.new(File.read(template), nil, '>').result(binding))
0
   error "=> Wrote #{out_file} successfully."
0
 end