Index: Rakefile =================================================================== --- Rakefile (revision 293) +++ Rakefile (working copy) @@ -1,7 +1,7 @@ require 'rubygems' require 'echoe' -Echoe.new('nginx_config_generator', '1.2') do |p| +Echoe.new('nginx_config_generator', '3rd-times-the-charm!') do |p| p.rubyforge_name = 'err' p.author = 'Chris Wanstrath' p.email = 'chris@ozmm.org' Index: lib/config.yml.example =================================================================== --- lib/config.yml.example (revision 293) +++ lib/config.yml.example (working copy) @@ -47,6 +47,11 @@ auth_file: /home/builder/conf/htpasswd root: /home/builder/site + test: + server_name: www.test.famupdate.com + always_www: true + root: /home/builder/site + ssl_sites: errtheblog: # ssl configuration @@ -60,10 +65,10 @@ - 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 - ^/feed/atom.xml http://feeds.feedburner.com/errtheblog # Which root to use. You can add a custom one here, too. root: rails - Index: lib/nginx_config_generator.rb =================================================================== --- lib/nginx_config_generator.rb (revision 293) +++ lib/nginx_config_generator.rb (working copy) @@ -16,7 +16,11 @@ overwrite = !(%w(-y -o -f --force --overwrite) & ARGV).empty? -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