nginx_config_generator 1.0 → 1.1

data/{Manifest.txt → Manifest}

@@ -1,5 +1,5 @@
 LICENSE
-Manifest.txt
+Manifest
 README
 Rakefile
 bin/generate_nginx_config

data/README

@@ -1,4 +1,7 @@
-A work in progress.  Check it: http://errtheblog.com/post/#
+A work in progress.  
+
+Check it: 
+  http://errtheblog.com/post/3908
 
 Use it: 
   $ generate_nginx_config nginx_config.yml /etc/nginx.conf

data/Rakefile

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

data/lib/config.yml.example

@@ -46,3 +46,24 @@ sites:
     server_name: qa.famupdate.com
     auth_file: /home/builder/conf/htpasswd
     root: /home/builder/site
+
+ssl_sites:
+  errtheblog:
+    # ssl configuration
+    ssl:
+      key: /path/to/err.key
+      cert: /path/to/err.crt	
+    # SSL only allows one vhost per IP this can be solved if you have multiple IPs.
+    listen: 10.10.10.1:443
+    # Two upstream servers to proxy balance.
+    upstream:
+      - 127.0.0.1:8000
+      - 127.0.0.1:8001
+    no_www: true
+    # 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
+

data/lib/nginx.erb

@@ -34,7 +34,7 @@ http {
 
 	# main error log
 	error_log  logs/error.log debug;
-  #error_log logs/error.log debug_http;
+	#error_log logs/error.log debug_http;
 
 	# no sendfile on OSX 
 	sendfile        on;
@@ -62,15 +62,37 @@ http {
   }
 <% end %>
 
-<% config['sites'].each do |name, site| %>
+<% %w(sites ssl_sites).each do |site_type| %>
+	
+<% config[site_type].each do |name, site| %>
   # the server directive is nginx's virtual host directive.
   server {
+    
+<% if site['ssl'] %>
+
+<% if site['listen'] %>
+    listen		<%= site['listen'] %>;
+<% else %>    
+    listen		443;
+<% end %>
+    ssl on;
+    
+	# path to your certificate
+	ssl_certificate <%= site['ssl']['cert'] %>;
+  	
+	# path to your ssl key
+	ssl_certificate_key <%= site['ssl']['key'] %>;
+  	
+<% else %>
+	
     # port to listen on. Can also be set to an IP:PORT
     listen       80;
 
     # sets the domain[s] that this vhost server requests for
     server_name  <%= site['server_name'] %>;
-
+    
+<% end %>
+    
     # doc root
     root <%= (config['root'][ site['root'] || 'default' ] || site['root']) % name %>;
 
@@ -90,7 +112,14 @@ http {
 
 <% if site['no_www'] %>
     if ($host ~* "www") {
-      rewrite ^(.*)$ http://<%= site['server_name'].split.first %>$1 redirect;
+      rewrite ^(.*)$ http://<%= site['server_name'].split.first %>$1 permanent;
+      break;
+    }
+<% end %>
+
+<% if site['always_www'] %>
+    if ($host != "www.<%= site['server_name'].split.first %>") {
+      rewrite ^(.*)$ http://www.<%= site['server_name'].split.first %>$1 permanent;
       break;
     }
 <% end %>
@@ -113,6 +142,10 @@ http {
       proxy_set_header Host $http_host;
       proxy_redirect false;
       proxy_max_temp_file_size 0;
+<% if site['ssl'] %>
+      # set X-FORWARDED_PROTO so ssl_requirement plugin works
+      proxy_set_header X-FORWARDED_PROTO https;
+<% end %>
 
       # check for index.html for directory index
       # if its there on the filesystem then rewite 

data/lib/nginx_config_generator.rb

@@ -16,12 +16,12 @@ error "Usage: generate_nginx_config [config file] [out file]" if ARGV.empty? &&
 
 overwrite = !(%w(-y -o -f --force --overwrite) & ARGV).empty?
 
-config   = YAML.load_file(env_in || ARGV.shift || 'config.yml')
+config   = YAML.load(ERB.new(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(binding))
+  open(out_file, 'w+').write(ERB.new(File.read(template), nil, '>').result)
   error "=> Wrote #{out_file} successfully."
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: nginx_config_generator
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2007-04-28 00:00:00 -07:00
+  version: "1.1"
+date: 2007-08-17 00:00:00 -07:00
 summary: ""
 require_paths: 
 - lib
@@ -30,7 +30,7 @@ authors:
 - Chris Wanstrath
 files: 
 - LICENSE
-- Manifest.txt
+- Manifest
 - README
 - Rakefile
 - bin/generate_nginx_config