vhost_generator 0.3.1 → 0.3.2

data/bin/foreman-export-vhost

@@ -221,7 +221,13 @@ class ForemanExportApplication
     end
 
     def service
-      config.generator # nginx
+      if config.generator == 'nginx'
+        'nginx'
+      elsif config.generator == 'apache'
+        'apache2'
+      else
+        raise RuntimeError, "Can't guess service for generator=#{config.generator}"
+      end
     end
 
     def target
@@ -229,13 +235,7 @@ class ForemanExportApplication
     end
 
     def vhost_dir
-      if config.generator == 'nginx'
-        '/etc/nginx/sites-enabled'
-      elsif config.generator == 'apache'
-        '/etc/apache2/sites-enabled'
-      else
-        raise RuntimeError, "Can't guess vhost_dir for generator=#{config.generator}"
-      end
+      "/etc/#{service}/sites-enabled"
     end
 
     def vhost_config

data/features/foreman-export-vhost.feature

@@ -34,20 +34,20 @@ Feature: Wrap "foreman export"
           -h, -H, --help                   Display this help message.
       """
 
-  Scenario: display source that will be executed
+  Scenario Outline: display source that will be executed with generator <generator>
     Given a file named "Procfile" with:
       """
       clock:  ....
       web:   bundle exec webserver -p $PORT
       """
-    When I run `bundle exec foreman-export-vhost upstart /etc/init -f Procfile -a MYAPP -u MYUSER -p 6000 -c clock=1,web=2 -L 80,81 -S localhost,myapp.com -K web -G nginx -O assets_expire_in=15d -N -R`
+    When I run `bundle exec foreman-export-vhost upstart /etc/init -f Procfile -a MYAPP -u MYUSER -p 6000 -c clock=1,web=2 -L 80,81 -S localhost,myapp.com -K web -G <generator> -O assets_expire_in=15d -N -R`
     Then the output should match:
       """
-      bundle exec vhost-generator -a MYAPP -f /.*/public -l 80,81 -s localhost,myapp.com -p 6100,6101 -g nginx -o assets_expire_in\\=15d \| sudo tee /etc/nginx/sites-enabled/vhost-MYAPP.conf
+      bundle exec vhost-generator -a MYAPP -f /.*/public -l 80,81 -s localhost,myapp.com -p 6100,6101 -g <generator> -o assets_expire_in\\=15d \| sudo tee <config_dir>/vhost-MYAPP.conf
       """
     And the output should contain:
       """
-      sudo service nginx reload
+      sudo service <service> reload
       sudo service MYAPP stop >/dev/null 2>&1 || true
       sudo rm -rf /etc/init/MYAPP-*.conf
       """
@@ -61,3 +61,8 @@ Feature: Wrap "foreman export"
       echo "Finished, now open your browser and see if everything works."
       # Now, try to run this script again without the --dry-run switch!
       """
+
+    Scenarios:
+      | generator | service | config_dir                 |
+      | nginx     | nginx   | /etc/nginx/sites-enabled   |
+      | apache    | apache2 | /etc/apache2/sites-enabled |

data/features/output-apache.feature

@@ -0,0 +1,213 @@
+Feature: Output apache configuration file
+
+  In order to run my application as an apache virtualhost
+  As a user of the library
+  I want to output a apache virtualhost configuration.
+
+  Scenario: using command-line options, multiple upstreams
+    When I run `bundle exec vhost-generator -g apache -o assets_expire_in=15d -a testapp -f html -l 80,81 -s localhost,my.server -p 5000,5001,5002 -r /myapp`
+    Then the output should match /FILE GENERATED BY.*EDIT AT YOUR OWN RISK/
+    And the output should contain:
+      """
+      <VirtualHost *:80 *:81>
+      """
+    And the output should contain:
+      """
+        ServerName localhost
+        ServerAlias my.server
+      """
+    And the output should match /DocumentRoot.*html/
+    And the output should contain:
+      """
+        AllowEncodedSlashes On
+      """
+    And the output should contain:
+      """
+        <Proxy balancer://testapp>
+          BalancerMember http://localhost:5000
+          BalancerMember http://localhost:5001
+          BalancerMember http://localhost:5002
+        </Proxy>
+      """
+    And the output should contain:
+      """
+        # Redirect all non-static requests to instances
+        RewriteEngine On
+        RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
+        RewriteRule ^/(.*)$ balancer://testapp%{REQUEST_URI} [P,QSA,L]
+      """
+    And the output should contain:
+      """
+        <Location /myapp/assets>
+          ExpiresActive On
+          Header unset ETag
+          FileETag None
+          ExpiresDefault "access plus 15 days"
+        </Location>
+      """
+    And the output should contain:
+      """
+        ErrorDocument 500 /500.html
+        ErrorDocument 502 /500.html
+        ErrorDocument 503 /500.html
+        ErrorDocument 504 /500.html
+        LimitRequestBody 2147483647
+        KeepAliveTimeout 10
+      </VirtualHost>
+      """
+
+  Scenario: using environment variables, multiple upstreams
+    When I set env variable "GENERATOR" to "apache"
+    And I set env variable "GENERATOR_OPTIONS" to "assets_expire_in=15d"
+    And I set env variable "APPLICATION" to "testapp"
+    And I set env variable "STATIC_FOLDER" to "html"
+    And I set env variable "SERVER_PORTS" to "80,81"
+    And I set env variable "SERVER_NAMES" to "localhost,my.server"
+    And I set env variable "INSTANCE_PORTS" to "5000,5001,5002"
+    And I set env variable "RAILS_RELATIVE_URL_ROOT" to "/myapp"
+    And I run `bundle exec vhost-generator`
+    Then the output should match /FILE GENERATED BY.*EDIT AT YOUR OWN RISK/
+    And the output should contain:
+      """
+      <VirtualHost *:80 *:81>
+      """
+    And the output should contain:
+      """
+        ServerName localhost
+        ServerAlias my.server
+      """
+    And the output should match /DocumentRoot.*html/
+    And the output should contain:
+      """
+        AllowEncodedSlashes On
+      """
+    And the output should contain:
+      """
+        <Proxy balancer://testapp>
+          BalancerMember http://localhost:5000
+          BalancerMember http://localhost:5001
+          BalancerMember http://localhost:5002
+        </Proxy>
+      """
+    And the output should contain:
+      """
+        # Redirect all non-static requests to instances
+        RewriteEngine On
+        RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
+        RewriteRule ^/(.*)$ balancer://testapp%{REQUEST_URI} [P,QSA,L]
+      """
+    And the output should contain:
+      """
+        <Location /myapp/assets>
+          ExpiresActive On
+          Header unset ETag
+          FileETag None
+          ExpiresDefault "access plus 15 days"
+        </Location>
+      """
+    And the output should contain:
+      """
+        ErrorDocument 500 /500.html
+        ErrorDocument 502 /500.html
+        ErrorDocument 503 /500.html
+        ErrorDocument 504 /500.html
+        LimitRequestBody 2147483647
+        KeepAliveTimeout 10
+      </VirtualHost>
+      """
+
+  Scenario: using command-line options, single upstream
+    When I run `bundle exec vhost-generator -g apache -o assets_expire_in=15d -a testapp -f html -l 80,81 -s localhost,my.server -p 5000 -r /myapp`
+    Then the output should match /FILE GENERATED BY.*EDIT AT YOUR OWN RISK/
+    And the output should contain:
+      """
+      <VirtualHost *:80 *:81>
+      """
+    And the output should contain:
+      """
+        ServerName localhost
+        ServerAlias my.server
+      """
+    And the output should match /DocumentRoot.*html/
+    And the output should contain:
+      """
+        AllowEncodedSlashes On
+      """
+    And the output should contain:
+      """
+        # Redirect all non-static requests to instances
+        RewriteEngine On
+        RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
+        RewriteRule ^/(.*)$ http://localhost:5000%{REQUEST_URI} [P,QSA,L]
+      """
+    And the output should contain:
+      """
+        <Location /myapp/assets>
+          ExpiresActive On
+          Header unset ETag
+          FileETag None
+          ExpiresDefault "access plus 15 days"
+        </Location>
+      """
+    And the output should contain:
+      """
+        ErrorDocument 500 /500.html
+        ErrorDocument 502 /500.html
+        ErrorDocument 503 /500.html
+        ErrorDocument 504 /500.html
+        LimitRequestBody 2147483647
+        KeepAliveTimeout 10
+      </VirtualHost>
+      """
+
+  Scenario: using environment variables, single upstream
+    When I set env variable "GENERATOR" to "apache"
+    And I set env variable "GENERATOR_OPTIONS" to "assets_expire_in=15d"
+    And I set env variable "APPLICATION" to "testapp"
+    And I set env variable "STATIC_FOLDER" to "html"
+    And I set env variable "SERVER_PORTS" to "80,81"
+    And I set env variable "SERVER_NAMES" to "localhost,my.server"
+    And I set env variable "INSTANCE_PORTS" to "5000"
+    And I set env variable "RAILS_RELATIVE_URL_ROOT" to "/myapp"
+    And I run `bundle exec vhost-generator`
+    Then the output should match /FILE GENERATED BY.*EDIT AT YOUR OWN RISK/
+    And the output should contain:
+      """
+      <VirtualHost *:80 *:81>
+      """
+    And the output should contain:
+      """
+        ServerName localhost
+        ServerAlias my.server
+      """
+    And the output should match /DocumentRoot.*html/
+    And the output should contain:
+      """
+        AllowEncodedSlashes On
+      """
+    And the output should contain:
+      """
+        # Redirect all non-static requests to instances
+        RewriteEngine On
+        RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
+        RewriteRule ^/(.*)$ http://localhost:5000%{REQUEST_URI} [P,QSA,L]
+      """
+    And the output should contain:
+      """
+        <Location /myapp/assets>
+          ExpiresActive On
+          Header unset ETag
+          FileETag None
+          ExpiresDefault "access plus 15 days"
+        </Location>
+      """
+    And the output should contain:
+      """
+        ErrorDocument 500 /500.html
+        ErrorDocument 502 /500.html
+        ErrorDocument 503 /500.html
+        ErrorDocument 504 /500.html
+        LimitRequestBody 2147483647
+        KeepAliveTimeout 10
+      </VirtualHost>
+      """

data/features/output-nginx.feature

@@ -4,7 +4,7 @@ Feature: Output nginx configuration file
   As a user of the library
   I want to output a nginx virtualhost configuration.
 
-  Scenario: using command-line options
+  Scenario: using command-line options, multiple upstreams
     When I run `bundle exec vhost-generator -g nginx -o assets_expire_in=15d -a testapp -f html -l 80,81 -s localhost,my.server -p 5000,5001,5002 -r /myapp`
     Then the output should match /FILE GENERATED BY.*EDIT AT YOUR OWN RISK/
     And the output should contain:
@@ -53,7 +53,7 @@ Feature: Output nginx configuration file
       }
       """
 
-  Scenario: using environment variables
+  Scenario: using environment variables, multiple upstreams
     When I set env variable "GENERATOR" to "nginx"
     And I set env variable "GENERATOR_OPTIONS" to "assets_expire_in=15d"
     And I set env variable "APPLICATION" to "testapp"
@@ -109,3 +109,93 @@ Feature: Output nginx configuration file
         keepalive_timeout 10;
       }
       """
+
+  Scenario: using command-line options, single upstream
+    When I run `bundle exec vhost-generator -g nginx -o assets_expire_in=15d -a testapp -f html -l 80,81 -s localhost,my.server -p 5000 -r /myapp`
+    Then the output should match /FILE GENERATED BY.*EDIT AT YOUR OWN RISK/
+    And the output should contain:
+      """
+      server {
+        listen 80;
+        listen 81;
+      """
+    And the output should contain:
+      """
+        server_name localhost, my.server;
+      """
+    And the output should match /root.*html;/
+    And the output should contain:
+      """
+        try_files $uri/index.html $uri @upstream;
+        location @upstream {
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+          proxy_set_header Host $http_host;
+          proxy_redirect off;
+          proxy_pass http://localhost:5000;
+        }
+      """
+    And the output should contain:
+      """
+        location /myapp/assets {
+          gzip_static on; # to serve pre-gzipped version
+          expires 15d;
+          add_header  Cache-Control public;
+        }
+      """
+    And the output should contain:
+      """
+        error_page 500 502 503 504 /500.html;
+        client_max_body_size 4G;
+        keepalive_timeout 10;
+      }
+      """
+
+  Scenario: using environment variables, single upstream
+    When I set env variable "GENERATOR" to "nginx"
+    And I set env variable "GENERATOR_OPTIONS" to "assets_expire_in=15d"
+    And I set env variable "APPLICATION" to "testapp"
+    And I set env variable "STATIC_FOLDER" to "html"
+    And I set env variable "SERVER_PORTS" to "80,81"
+    And I set env variable "SERVER_NAMES" to "localhost,my.server"
+    And I set env variable "INSTANCE_PORTS" to "5000"
+    And I set env variable "RAILS_RELATIVE_URL_ROOT" to "/myapp"
+    And I run `bundle exec vhost-generator`
+    Then the output should match /FILE GENERATED BY.*EDIT AT YOUR OWN RISK/
+    And the output should contain:
+      """
+      server {
+        listen 80;
+        listen 81;
+      """
+    And the output should contain:
+      """
+        server_name localhost, my.server;
+      """
+    And the output should match /root.*html;/
+    And the output should contain:
+      """
+        try_files $uri/index.html $uri @upstream;
+        location @upstream {
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+          proxy_set_header Host $http_host;
+          proxy_redirect off;
+          proxy_pass http://localhost:5000;
+        }
+      """
+    And the output should contain:
+      """
+        location /myapp/assets {
+          gzip_static on; # to serve pre-gzipped version
+          expires 15d;
+          add_header  Cache-Control public;
+        }
+      """
+    And the output should contain:
+      """
+        error_page 500 502 503 504 /500.html;
+        client_max_body_size 4G;
+        keepalive_timeout 10;
+      }
+      """

data/features/version.feature

@@ -8,5 +8,5 @@ Feature: Output program version
     When I run `bundle exec vhost-generator --version`
     Then it should pass with:
       """
-      vhost-generator, version 0.3.1
+      vhost-generator, version 0.3.2
       """

data/lib/vhost_generator/apache_generator.rb

@@ -0,0 +1,98 @@
+require 'ostruct'
+require 'erb'
+
+module VhostGenerator
+
+  # Apache VhostGenerator
+  #
+  class ApacheGenerator
+    attr_reader :cfg, :options
+    def initialize(cfg, options={})
+      @cfg = cfg
+      @options = OpenStruct.new(default_options.merge(options))
+      @options.upstream ||= cfg.application
+      @options.has_upstream = cfg.instance_ports.length > 1
+      @options.proxy_pass =
+          if @options.has_upstream
+            "balancer://#{@options.upstream}"
+          elsif cfg.instance_ports.length > 0
+            "http://localhost:#{cfg.instance_ports.first}"
+          else
+            raise ArgumentError, "Please specify at least 1 instance-port."
+          end
+      # by commodity, support same syntax as nginx: 15d, 2m, 1y
+      expires = {'d' => 'days', 'm' => 'months', 'y' => 'years'}
+      @options.assets_expire_in.gsub!(/\A(\d+)([dmy])\Z/) do |_|
+        [$~[1], expires.fetch($~[2])].join(' ') # s/15d/15 days/g
+      end
+      # by commodity, support same syntax as nginx: 2k, 2M, 2G
+      sizes = {'k' => 1024, 'M' => 1024**2, 'G' => 1024**3}
+      if @options.client_max_body_size =~ /\A(\d+)([kMG])\Z/
+        @options.client_max_body_size = Integer($~[1]) * sizes[$~[2]] - 1
+      else
+        @options.client_max_body_size = Integer(@options.client_max_body_size)
+      end
+      # apache does not support body sizes > 2G
+      if @options.client_max_body_size > (size_max = 2 * sizes['G'] - 1)
+        @options.client_max_body_size = size_max
+      end
+      @options.freeze
+    end
+
+    def render
+      template.result(binding)
+    end
+
+    protected
+
+    def default_options
+      Hash[ 'client_max_body_size' => '2G', # max for apache
+            'keepalive_timeout' => '10',
+            'assets_expire_in' => '60d' ].freeze
+    end
+
+    private
+
+    def template
+      @template ||= ERB.new <<EOF
+#### FILE GENERATED BY `<%= String(cfg.cmdline) %>`, EDIT AT YOUR OWN RISK ####
+#### Note: you may need to a2enmod the following modules: proxy_http, proxy_balancer, rewrite, headers, expires
+
+<VirtualHost <%= cfg.server_ports.map{ |p| "*:\#{p}" }.join(' ') %>>
+  <% unless cfg.server_names.empty? %>ServerName <%= cfg.server_names.first %><% end %>
+  <% if cfg.server_names.length >= 2 %>ServerAlias <%=
+       cfg.server_names[1..-1].join(' ') %><% end %>
+
+  DocumentRoot <%= cfg.static_folder %>;
+
+  AllowEncodedSlashes On
+
+  <% if options.has_upstream %>
+  <Proxy balancer://<%= options.upstream %>>
+  <% cfg.instance_ports.each do |p| %>  BalancerMember http://localhost:<%= p %>
+  <% end %></Proxy>
+  <% end %>
+
+  # Redirect all non-static requests to instances
+  RewriteEngine On
+  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
+  RewriteRule ^/(.*)$ <%= options.proxy_pass %>%{REQUEST_URI} [P,QSA,L]
+
+  <Location <%= cfg.relative_root %>assets>
+    ExpiresActive On
+    Header unset ETag
+    FileETag None
+    ExpiresDefault "access plus <%= options.assets_expire_in %>"
+  </Location>
+
+  ErrorDocument 500 /500.html
+  ErrorDocument 502 /500.html
+  ErrorDocument 503 /500.html
+  ErrorDocument 504 /500.html
+  LimitRequestBody <%= options.client_max_body_size %>
+  KeepAliveTimeout <%= options.keepalive_timeout %>
+</VirtualHost>
+EOF
+    end
+  end
+end

data/lib/vhost_generator/application.rb

@@ -131,7 +131,7 @@ module VhostGenerator
       rescue SystemExit => ex
         # Exit silently with current status
         raise
-      rescue OptionParser::InvalidOption => ex
+      rescue OptionParser::InvalidOption, ArgumentError => ex
         $stderr.puts ex.message
         exit(false)
       rescue Exception => ex

data/lib/vhost_generator/nginx_generator.rb

@@ -11,6 +11,15 @@ module VhostGenerator
       @cfg = cfg
       @options = OpenStruct.new(default_options.merge(options))
       @options.upstream ||= cfg.application
+      @options.has_upstream = cfg.instance_ports.length > 1
+      @options.proxy_pass =
+          if @options.has_upstream
+            @options.upstream
+          elsif cfg.instance_ports.length > 0
+            "localhost:#{cfg.instance_ports.first}"
+          else
+            raise ArgumentError, "Please specify at least 1 instance-port."
+          end
       @options.freeze
     end
 
@@ -31,10 +40,11 @@ module VhostGenerator
       @template ||= ERB.new <<EOF
 #### FILE GENERATED BY `<%= String(cfg.cmdline) %>`, EDIT AT YOUR OWN RISK ####
 
+<% if options.has_upstream %>
 upstream <%= options.upstream %> {
 <% cfg.instance_ports.each do |p| %>  server localhost:<%= p %> fail_timeout=0;
 <% end %>}
-
+<% end %>
 server {
   <% cfg.server_ports.each do |p| %>listen <%= p %>;
   <% end %>
@@ -49,7 +59,7 @@ server {
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header Host $http_host;
     proxy_redirect off;
-    proxy_pass http://<%= options.upstream %>;
+    proxy_pass http://<%= options.proxy_pass %>;
   }
 
   location <%= cfg.relative_root %>assets {

data/lib/vhost_generator/version.rb

@@ -1,3 +1,3 @@
 module VhostGenerator
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/vhost_generator/vhost_configuration.rb

@@ -1,4 +1,5 @@
 require 'vhost_generator/nginx_generator'
+require 'vhost_generator/apache_generator'
 require 'shellwords'
 
 module VhostGenerator
@@ -85,7 +86,8 @@ module VhostGenerator
     attr_writer :registry
     def registry
       # XXX use a real registry to reduce coupling
-      @registry ||= {'nginx' => VhostGenerator::NginxGenerator}
+      @registry ||= {'nginx' => VhostGenerator::NginxGenerator,
+                     'apache' => VhostGenerator::ApacheGenerator}
     end
 
     def parse_word_list(s)

data/spec/apache_generator_spec.rb

@@ -0,0 +1,73 @@
+require 'vhost_generator/apache_generator'
+
+describe VhostGenerator::ApacheGenerator do
+  let(:config) { double('vhost config').as_null_object }
+  subject do
+    described_class.new(config, 'upstream' => 'myupstream')
+  end
+
+  describe "#render" do
+    let(:output) { subject.render }
+
+    it "includes the cmdline in a comment" do
+      config.stub(:cmdline).and_return('CMDLINE')
+      expect(output).to match(/^#### FILE GENERATED BY .*CMDLINE/)
+    end
+
+    context "when multiple upstreams" do
+      before { config.stub(:instance_ports).and_return([1337, 1338]) }
+
+      it "declares the named upstream" do
+        expect(output).to match(%r{<Proxy balancer://myupstream>})
+      end
+
+      it "declares all the requested upstream servers" do
+        expect(output).to include('BalancerMember http://localhost:1337')
+        expect(output).to include('BalancerMember http://localhost:1338')
+      end
+
+      it "proxies to the named upstream" do
+        expect(output).to include(
+          'RewriteRule ^/(.*)$ balancer://myupstream%{REQUEST_URI} [P,QSA,L]')
+      end
+    end
+
+    context "when single upstream" do
+      before { config.stub(:instance_ports).and_return([1337]) }
+
+      it "declares no upstream section" do
+        expect(output).not_to match(%r{<Proxy balancer://\w+>})
+      end
+
+      it "does not declare any upstream servers" do
+        expect(output).not_to include('BalancerMember http://localhost:1337')
+      end
+
+      it "proxies the single upstream directly" do
+        expect(output).to include(
+          'RewriteRule ^/(.*)$ http://localhost:1337%{REQUEST_URI} [P,QSA,L]')
+      end
+    end
+
+    it "listens to the requested server ports" do
+      config.stub(:server_ports).and_return([12345, 12346])
+      expect(output).to include('<VirtualHost *:12345 *:12346>')
+    end
+
+    it "declares the server names it responds to" do
+      config.stub(:server_names).and_return(%w(host1 host2 host3))
+      expect(output).to include('ServerName host1')
+      expect(output).to include('ServerAlias host2 host3')
+    end
+
+    it "declares the requested document root" do
+      config.stub(:static_folder).and_return('STATIC-FOLDER')
+      expect(output).to include('DocumentRoot STATIC-FOLDER')
+    end
+
+    it "respects custom relative_roots" do
+      config.stub(:relative_root).and_return('RELATIVE_ROOT')
+      expect(output).to include('<Location RELATIVE_ROOTassets>')
+    end
+  end
+end

data/spec/nginx_generator_spec.rb

@@ -14,18 +14,37 @@ describe VhostGenerator::NginxGenerator do
       expect(output).to match(/^#### FILE GENERATED BY .*CMDLINE/)
     end
 
-    it "declares the named upstream" do
-      expect(output).to include('upstream myupstream {')
-    end
+    context "when multiple upstreams" do
+      before { config.stub(:instance_ports).and_return([1337, 1338]) }
+
+      it "declares the named upstream" do
+        expect(output).to match(/upstream myupstream {/)
+      end
+
+      it "declares all the requested upstream servers" do
+        expect(output).to include('server localhost:1337 fail_timeout=0;')
+        expect(output).to include('server localhost:1338 fail_timeout=0;')
+      end
 
-    it "references the named upstream" do
-      expect(output).to include('http://myupstream;')
+      it "proxies to the named upstream" do
+        expect(output).to include('proxy_pass http://myupstream;')
+      end
     end
 
-    it "declares all the requested upstream servers" do
-      config.stub(:instance_ports).and_return([1337, 1338])
-      expect(output).to include('server localhost:1337 fail_timeout=0;')
-      expect(output).to include('server localhost:1338 fail_timeout=0;')
+    context "when single upstream" do
+      before { config.stub(:instance_ports).and_return([1337]) }
+
+      it "declares no upstream section" do
+        expect(output).not_to match(/upstream \w+ {/)
+      end
+
+      it "does not declare any upstream servers" do
+        expect(output).not_to include('server localhost:1337 fail_timeout=0;')
+      end
+
+      it "proxies the single upstream directly" do
+        expect(output).to include('proxy_pass http://localhost:1337;')
+      end
     end
 
     it "listens to the requested server ports" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vhost_generator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,11 +94,13 @@ files:
 - bin/vhost-generator
 - features/foreman-export-vhost.feature
 - features/help.feature
+- features/output-apache.feature
 - features/output-nginx.feature
 - features/step_definitions/dev_steps.rb
 - features/support/env.rb
 - features/version.feature
 - lib/vhost_generator.rb
+- lib/vhost_generator/apache_generator.rb
 - lib/vhost_generator/application.rb
 - lib/vhost_generator/capistrano.rb
 - lib/vhost_generator/cmdline_builder.rb
@@ -107,6 +109,7 @@ files:
 - lib/vhost_generator/vhost_configuration.rb
 - lib/vhost_generator/vhost_generator_module.rb
 - script/cibuild
+- spec/apache_generator_spec.rb
 - spec/application_env_spec.rb
 - spec/application_options_spec.rb
 - spec/cmdline_builder_spec.rb
@@ -127,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -968082637
+      hash: 336320189
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -968082637
+      hash: 336320189
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -147,11 +150,13 @@ summary: vhost_generator outputs nginx or apache VirtualHost configurations to r
 test_files:
 - features/foreman-export-vhost.feature
 - features/help.feature
+- features/output-apache.feature
 - features/output-nginx.feature
 - features/step_definitions/dev_steps.rb
 - features/support/env.rb
 - features/version.feature
 - script/cibuild
+- spec/apache_generator_spec.rb
 - spec/application_env_spec.rb
 - spec/application_options_spec.rb
 - spec/cmdline_builder_spec.rb