views/nginx/app.erb views/nginx/simple.erb @@ -21,10 +21,10 @@ lib/archangel/nginx_builder.rb lib/archangel/site.rb lib/archangel/site_builder.rb lib/archangel/version.rb -log/debug.log script/destroy script/generate setup.rb +spec/archangel/configuration_builder_spec.rb spec/archangel/configuration_spec.rb spec/archangel/mongrel_spec.rb spec/archangel/site_builder_spec.rb @@ -36,6 +36,7 @@ tasks/environment.rake tasks/rspec.rake tasks/website.rake views/archangel.god +views/nginx/app.erb views/nginx/main.erb -views/nginx/server.erb +views/nginx/simple.erb views/nginx/upstream.erb Manifest.txt @@ -5,7 +5,7 @@ module Archangel def initialize(configuration) @configuration = configuration end - attr_writer :base_path, :default_root, :mime_types, :pid_file, :error_log, :access_log + attr_writer :base_path, :port, :default_root, :mime_types, :pid_file, :error_log, :access_log attr_accessor :uid, :gid def file(key) @@ -24,6 +24,10 @@ module Archangel raise IndexError, "#{key.inspect} not found" end end + + def port + @port || 80 + end def base_path @base_path || "" @@ -57,9 +61,7 @@ module Archangel views = {} views["nginx.conf"] = @configuration.render_with('nginx/main', render_attributes) @configuration.sites_running_on(:nginx).each do |site| - attributes = render_attributes.merge(:site => site) - views["servers/#{site.name}.conf"] = @configuration.render_with('nginx/server', attributes) - views["upstreams/#{site.name}.conf"] = @configuration.render_with('nginx/upstream', attributes) + views.merge!(site.render(render_attributes)) end views end @@ -127,4 +129,4 @@ module Archangel end end end -end \ No newline at end of file +end lib/archangel/nginx.rb @@ -11,6 +11,10 @@ module Archangel def gid(gid) @nginx.gid = gid end + + def port(number) + @nginx.port = number + end def base_path(base_path) @nginx.base_path = base_path @@ -36,4 +40,4 @@ module Archangel @nginx.access_log = access_log end end -end \ No newline at end of file +end lib/archangel/nginx_builder.rb @@ -6,7 +6,7 @@ module Archangel end attr_reader :name, :options, :configuration attr_accessor :hostnames, :aliases, :profile_name, :fair - attr_writer :port, :path + attr_writer :port, :template, :path def watch upstreams.each do |upstream| @@ -27,6 +27,10 @@ module Archangel def profile @profile ||= configuration.profile_for(profile_name) end + + def template + @template || "app" + end def path @path || name @@ -81,5 +85,13 @@ module Archangel def fair? fair end + + def render(render_attributes) + views = {} + attributes = render_attributes.merge(:site => self) + views["servers/#{name}.conf"] = @configuration.render_with("nginx/#{template}", attributes) + views["upstreams/#{name}.conf"] = @configuration.render_with("nginx/upstream", attributes) + views + end end -end \ No newline at end of file +end lib/archangel/site.rb @@ -23,6 +23,10 @@ module Archangel def profile(name) @site.profile_name = name end + + def template(name) + @site.template = name + end def fair @site.fair = true @@ -41,4 +45,4 @@ module Archangel end end end -end \ No newline at end of file +end lib/archangel/site_builder.rb @@ -33,7 +33,7 @@ http { application/xml application/xml+rss text/javascript; server { - listen 80; + listen <%= nginx.port %>; client_max_body_size 50M; @@ -45,4 +45,5 @@ http { include <%= nginx.base_path %>/upstreams/*.conf; include <%= nginx.base_path %>/servers/*.conf; + include <%= nginx.base_path %>/custom/*.conf; } views/nginx/main.erb @@ -1,3 +1,4 @@ +<% if site.upstreams.any? %> upstream <%= site.name %> { <% if site.fair? %> fair; @@ -5,4 +6,5 @@ upstream <%= site.name %> { <% site.upstreams.each do |upstream| %> server <%= upstream.host_port %>; <% end %> -} \ No newline at end of file +} +<% end %> views/nginx/upstream.erb views/nginx/server.erb af5ab590234569ad60e60fb8246e781d762d5710 Tim Carey-Smith tim@spork.in http://github.com/halorgium/archangel/commit/f842d1238152f71bc7c55af6cc6223350d4dec3b f842d1238152f71bc7c55af6cc6223350d4dec3b 2008-02-19T19:48:10-08:00 2008-02-19T19:48:10-08:00 Update the nginx to support non-rails vhosts 5a5330667b9067e88699511bb7d139fedaa36e9a Tim Carey-Smith tim@spork.in