nginx_config_generator 1.2 → 1.3

data/Rakefile

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

data/lib/config.yml.example

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

data/lib/nginx.erb

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

data/lib/nginx_config_generator.rb

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

data/nginx_config_generator.gemspec

@@ -1,10 +1,10 @@
 
-# Gem::Specification for Nginx_config_generator-1.2
+# Gem::Specification for Nginx_config_generator-1.3
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{nginx_config_generator}
-  s.version = "1.2"
+  s.version = "1.3"
   s.date = %q{2007-08-23}
   s.summary = %q{}
   s.email = %q{chris@ozmm.org}
@@ -24,7 +24,7 @@ end
 # require 'rubygems'
 # require 'echoe'
 # 
-# Echoe.new('nginx_config_generator', '1.2') do |p|
+# Echoe.new('nginx_config_generator', '1.3') do |p|
 #   p.rubyforge_name = 'err'
 #   p.author = 'Chris Wanstrath'
 #   p.email = 'chris@ozmm.org'

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: nginx_config_generator
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 date: 2007-08-23 00:00:00 -07:00
 summary: ""
 require_paths: