foreman-export-nginx 0.0.16 → 0.0.17

data/data/export/nginx/nginx.erb

@@ -9,17 +9,17 @@ server {
   error_log  <%= log %>/<%= app %>-nginx-error.log;
 
   listen 80;
-  server_name <%= app %>.<%= ENV['BASE_DOMAIN'] %> <%= (ENV['ADDITIONAL_DOMAINS'] || '').split(',').join(' ') %>;
+  server_name <%= app %>.<%= base_domain %> <%= additional_domains %>;
 
-  <% if ENV['USE_SSL'] != '' %>
+  <% if use_ssl %>
   listen 443 ssl;
 
-  <% if ENV['SSL_CERT_PATH'] != '' && ENV['SSL_KEY_PATH'] != '' %>
-  ssl_certificate <%= ENV['SSL_CERT_PATH'] %>;
-  ssl_certificate_key <%= ENV['SSL_KEY_PATH'] %>;
+  <% if ssl_cert_path && ssl_key_path %>
+  ssl_certificate <%= ssl_cert_path %>;
+  ssl_certificate_key <%= ssl_key_path %>;
   <% end %>
 
-  <% if ENV['FORCE_SSL'] != '' %>
+  <% if force_ssl %>
   if ($ssl_protocol = "") {
      rewrite ^   https://$server_name$request_uri? permanent;
   }    

data/foreman-export-nginx.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "foreman-export-nginx"
-  gem.version       = '0.0.16'
+  gem.version       = '0.0.17'
   gem.authors       = ["Pete Keen"]
   gem.email         = ["pete@bugsplat.info"]
   gem.description   = %q{Export Nginx configs using Foreman}

data/lib/foreman/export/nginx.rb

@@ -3,12 +3,25 @@ require 'foreman/export'
 module Foreman
   module Export
     class Nginx < Foreman::Export::Base
+
+      def env_var(key)
+        val = ENV[key]
+        val == "" ? nil : val
+      end
+
       def export
         super
 
         engine.each_process do |name, process|
           next unless name == 'web'
 
+          base_domain = env_var('BASE_DOMAIN') or raise "Need a BASE_DOMAIN"
+          additional_domains = (env_var('ADDITIONAL_DOMAINS') || '').split(',').join(' ')
+          use_ssl = !!env_var('USE_SSL')
+          ssl_cert_path = env_var('SSL_CERT_PATH')
+          ssl_key_path  = env_var('SSL_KEY_PATH')
+          force_ssl = !!env_var('FORCE_SSL')
+
           ports = []
           1.upto(engine.formation[name]) do |num|
             ports << engine.port_for(process, num)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-export-nginx
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors: