foreman-export-nginx 0.0.31 → 0.0.32

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjM3OGEyM2RmMWJiZWM4OGUxYmZhZWRhOWY1YjM5NWZhMDMwNDYyNA==
-  data.tar.gz: !binary |-
-    MzE0MTUzZjJlNzMzNmRhMmQ3NmRlZTNmNTY1NTE1MzNmMmJiNjQwMQ==
+SHA1:
+  metadata.gz: fb5868f084e37268bd6a2180f4914a7532a120ec
+  data.tar.gz: e171352f2179c42677d94077f61766b8c3d2552a
 SHA512:
-  metadata.gz: !binary |-
-    ZDg5NDI1ZGYzNGYzNjExMWRlMTUwMDBiZWRmYzc5YzEyOTIyYjU5OTg0NWRm
-    NmU4YzcxMjg1YzUzYWUyYmJlYjAyODdkODI0MDlhZjdjODVjZmUyY2Q2ZWJk
-    YjQwMWNmZGRjYWU3ZDEyNTI2ZDljNDJlOTQ5MWQxMWU5ODhlMmI=
-  data.tar.gz: !binary |-
-    M2NlZDlhMzE3NjEwNzhlMDVhZmNiZWEzNjU2OGQ4NjQxMTczYTc3MDIzNTM5
-    YmEyZDU5NDBhY2VjM2MwZTE1NTQ2Mzk2MTg5MWRlMDVmMjUwNzI1YzVjMDNl
-    Mzg0OGMyOThiZWNjYTUwMmRkZjdhZTE1NWFhMjQ5ZmNhZTA3ZTE=
+  metadata.gz: d1179b3d60e787a18778bb03451c678c2d36366f63d6f8619e4b17e6fa6a008ecab1e818b3372347e7a990506e74a00fbcf2cc88c287a7f622a062b97f7a4bbf
+  data.tar.gz: 8b3da305fa9e6e3f78c21a51cf80ea75449231d9a0923d949e3197748dcb6280e280338a4ce2f90a0de7a6bf9920879a8f7371d8478af652a327ac039861f885

data/data/export/nginx/nginx.erb

@@ -1,8 +1,10 @@
+<% if ports.length > 0 %>
 upstream <%= app %> {
   <% ports.each do |port| %>
   server localhost:<%= port %> fail_timeout=0;
   <% end %>
 }
+<% end %>
 
 server {
   access_log <%= log %>/<%= app %>-nginx-access.log combined buffer=2k;
@@ -38,7 +40,10 @@ server {
   include <%= engine.root %>/.nginx;
   <% end %>
 
+  <% if ports.length > 0 %>
   try_files $uri/index.html $uri.html $uri @app;
+  <% else %>
+  try_files $uri/index.html $uri.html $uri;  
 
   location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml)$ {
     try_files $uri @app;
@@ -46,6 +51,7 @@ server {
     expires max;
   }
 
+  <% if ports.length > 0 %>
   location @app {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $scheme;
@@ -54,4 +60,5 @@ server {
 
     proxy_pass http://<%= app %>;
   }
+  <% end %>
 }

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.31'
+  gem.version       = '0.0.32'
   gem.authors       = ["Pete Keen"]
   gem.email         = ["pete@bugsplat.info"]
   gem.description   = %q{Export Nginx configs using Foreman}

data/lib/foreman/export/nginx.rb

@@ -12,28 +12,26 @@ module Foreman
       def export
         super
 
-        engine.each_process do |name, process|
-          next unless name == 'web'
+        next if engine.formation['web'].nil?
 
-          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')
-          force_domain = env_var('FORCE_DOMAIN')
-          default_server = !!env_var('DEFAULT_SERVER')
-          listen_address = env_var('LISTEN_ADDRESS') || '*'
+        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')
+        force_domain = env_var('FORCE_DOMAIN')
+        default_server = !!env_var('DEFAULT_SERVER')
+        listen_address = env_var('LISTEN_ADDRESS') || '*'
 
-          ports = []
-          1.upto(engine.formation[name]) do |num|
-            ports << engine.port_for(process, num)
-          end
-
-          content = File.read(File.expand_path("../../../../data/export/nginx/nginx.erb", __FILE__))
-          result = ERB.new(content, nil, '-').result(binding)
-          write_file "#{app}.conf", result
+        ports = []
+        1.upto(engine.formation['web']) do |num|
+          ports << engine.port_for(process, num)
         end
+
+        content = File.read(File.expand_path("../../../../data/export/nginx/nginx.erb", __FILE__))
+        result = ERB.new(content, nil, '-').result(binding)
+        write_file "#{app}.conf", result        
       end
     end
   end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: foreman-export-nginx
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Pete Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2018-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Export Nginx configs using Foreman
@@ -32,8 +32,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .repo.yml
+- ".gitignore"
+- ".repo.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -51,17 +51,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Export Nginx confguration files using Foreman