odania-static-pages 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e87ff149552068b031e640c61dc0620b8fda024f
-  data.tar.gz: 7dc936ada60f872026f2e2b65b89a34cccd6f2a8
+  metadata.gz: ebeaadbc0d974b04d8628669f8538704e611f657
+  data.tar.gz: db5e0bfe90902e65baf633d0cfdd1fce90af9ba1
 SHA512:
-  metadata.gz: 2abd158ce29d3a29bcd4e505ec5ef551a9ea0d784dbb44c3b131353e1406c342f129dbc8b462b42d05d37b6711a9ced3faebdc6237b3c6fdb85eb80613666e5c
-  data.tar.gz: 88c10972d83d7e6a5f92f77b12802779a9078d883ca7917cbf8649e4d708fd2cf8db4f761408ae521326ba9028e5c77d41ba7f07de727c57f0628787eceb564c
+  metadata.gz: 19d466e7fe1e8e502b6a022ec1a45696408dd8eaa65388b1d42aa1761c1754636c0ff1fcc988395e20c5ce41084a4174e9ec318e8309a99fe20bdd4ce1fcdb13
+  data.tar.gz: 713fddaf55803a91b6a7e5b776b3568543f7a27098a7e4d44d3423658182d0051c81f376e1c6ee0319cc734023f86743520c141eb7e286a8d6313691708bba26

data/lib/odania_static_pages/helper/nginx.rb

@@ -1,9 +1,23 @@
 module NginxHelper
 	def generate_nginx_config(do_rebuild)
+		nginx_default_redirect = @generator_config.nginx_default_redirect
+		if 'live'.eql?(@config.environment)
+			default_vhost_file = 'default-live-vhost.conf.erb'
+			domain_extension = ''
+		else
+			default_vhost_file = 'default-vhost.conf'
+			domain_extension = '.lvh.me'
+
+			puts 'Generating index.html'
+			FileUtils.mkdir_p @config.output_site_path
+			renderer = ERB.new(File.read(File.join(@config.base_dir, 'templates', 'nginx', 'index.html.erb')))
+			File.write File.join(@config.output_site_path, 'index.html'), renderer.result(binding)
+		end
+
 		vhost_renderer = ERB.new(File.read(File.join(@config.base_dir, 'templates', 'nginx', 'vhost.conf.erb')))
 		sites = {}
 		grouped_domains.each_pair do |site_name, page_config|
-			full_site_name = "#{site_name}.lvh.me"
+			full_site_name = "#{site_name}#{domain_extension}"
 			puts "Writing vhost for: #{full_site_name}"
 
 			if @deploy_config.respond_to? :expires
@@ -15,25 +29,13 @@ module NginxHelper
 			FileUtils.mkdir_p @nginx_conf_dir
 			File.write File.join(@nginx_conf_dir, "#{site_name}.conf"), vhost_renderer.result(binding)
 
-			sites[site_name] = "#{site_name}.lvh.me:8080"
+			sites[site_name] = "#{site_name}#{domain_extension}:8080"
 
 			page_config.each do |config|
-				sites["#{site_name}#{config[:baseurl]}"] = "#{site_name}.lvh.me:8080#{config[:baseurl]}"
+				sites["#{site_name}#{config[:baseurl]}"] = "#{site_name}#{domain_extension}:8080#{config[:baseurl]}"
 			end if page_config.count > 1
 		end
 
-		nginx_default_redirect = @generator_config.nginx_default_redirect
-		if 'live'.eql?(@config.environment)
-			default_vhost_file = 'default-live-vhost.conf.erb'
-		else
-			default_vhost_file = 'default-vhost.conf'
-
-			puts 'Generating index.html'
-			FileUtils.mkdir_p @config.output_site_path
-			renderer = ERB.new(File.read(File.join(@config.base_dir, 'templates', 'nginx', 'index.html.erb')))
-			File.write File.join(@config.output_site_path, 'index.html'), renderer.result(binding)
-		end
-
 		puts 'Copy default vhost'
 		renderer = ERB.new(File.read(File.join(@config.base_dir, 'templates', 'nginx', default_vhost_file)))
 		File.write File.join(@nginx_conf_dir, 'default.conf'), renderer.result(binding)

data/lib/odania_static_pages/version.rb

@@ -1,3 +1,3 @@
 module OdaniaStaticPages
-	VERSION = '0.1.8'
+	VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania-static-pages
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Mike Petersen