odania-static-pages 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 543e2e282d07aa73056287f7f7e4607c9ec1f4fc
-  data.tar.gz: ea24ca48949e7982ce592c2f71d273ab1df09972
+  metadata.gz: 19174f40f54e21e3790229962c383ef68b15a79f
+  data.tar.gz: 0ff3d92eec6680d814bfcf81358d80cc7cd5da4a
 SHA512:
-  metadata.gz: 56d574ecd49ca2187f91996746056f27db0fb40cc170b1fcd97cec1d57062801f1cc25812e5985b0caf2ce4a28b7c65904b8a52c577e940bed63a52b88e899ee
-  data.tar.gz: ce9419c138211510479cdf438a19cac7de04362badefc836124a69913cd476b5804010618118eb53311750691c0356c7758131cd0f8c5692a89d646a45f11c47
+  metadata.gz: 3ae20100eb8c7bc404c831cd32b981ae561e2b880fcd75bed0f5aff278221ae932e263a6c570bbd0cdb6c23d483b72d74e7033b540cfc1f8d09b8ebc9b7cbed8
+  data.tar.gz: e7a7cf492690e6f08aa1db9bd15d78f78f5f10df5ae653c947c6e1a11e1acf07b671775c454ab15b581dd5230082ab545a9ef69ca80021586883f53043586b74

data/lib/odania_static_pages/config/generator/jekyll.rb

@@ -2,7 +2,7 @@ module OdaniaStaticPages
 	class Config
 		module Generator
 			class Jekyll
-				attr_reader :plugins, :encoding, :common_folder, :extra_options, :gem_extra
+				attr_reader :plugins, :encoding, :common_folder, :extra_options, :gem_extra, :nginx_default_redirect
 
 				def initialize(project_dir, options)
 					@plugins = options['plugins'] || %w(jekyll-feed octopress-image-tag octopress-gist)
@@ -11,6 +11,7 @@ module OdaniaStaticPages
 					@extra_options = options['extra_options'] || {}
 					@gem_extra = options['gem_extra'] || ''
 					@project_dir = project_dir
+					@nginx_default_redirect = options['nginx_default_redirect'] || 'https://www.odania-it.com'
 				end
 
 				def to_h

data/lib/odania_static_pages/deploy/rsync.rb

@@ -1,8 +1,6 @@
 module OdaniaStaticPages
 	module Deploy
 		class Rsync
-			include ::NginxHelper
-
 			def initialize
 				@config = OdaniaStaticPages.config
 				@deploy_config = @config.current_environment.deploy_module
@@ -14,11 +12,6 @@ module OdaniaStaticPages
 				puts 'Preparing rsync state'
 				load_state
 				save_state
-
-				puts 'Copying Dockerfile'
-				FileUtils.cp File.join(@config.base_dir, 'templates', 'live', 'Dockerfile'), File.join(@config.output_path, 'Dockerfile')
-
-				generate_nginx_config(false)
 			end
 
 			def publish(color, do_rebuild)

data/lib/odania_static_pages/generator/jekyll.rb

@@ -1,6 +1,8 @@
 module OdaniaStaticPages
 	module Generator
 		class Jekyll
+			include ::NginxHelper
+
 			def init
 				puts 'Initliazing jekyll pages'
 				puts
@@ -20,6 +22,9 @@ module OdaniaStaticPages
 				gem_extra = @generator_config.gem_extra
 				File.write File.join(@generator_config.full_common_folder, 'Gemfile'), ERB.new(File.read(gemfile_template)).result(binding)
 
+				puts 'Copying Dockerfile'
+				FileUtils.cp File.join(@config.base_dir, 'templates', 'live', 'Dockerfile'), File.join(@config.output_path, 'Dockerfile')
+
 				puts 'Install gems'
 				puts `cd #{@generator_config.full_common_folder} && bundle check`
 				puts `cd #{@generator_config.full_common_folder} && bundle install --path ~/.gems` unless $?.success?
@@ -57,6 +62,8 @@ module OdaniaStaticPages
 				puts 'Building all jekyll websites'
 				setup_generator
 
+				generate_nginx_config(false)
+
 				grouped_domains.each_pair do |site_name, page_config|
 					build_for_configs(page_config, site_name, @config.output_site_path, env)
 				end
@@ -71,6 +78,10 @@ module OdaniaStaticPages
 				@pages_path = @config.pages_path
 				@jekyll_config_file = @generator_config.jekyll_config_file
 				@jekyll_config = @generator_config.jekyll_config
+
+				@deploy_config = @current_environment.deploy_module
+				@nginx_dir = File.join(@config.output_path, 'nginx')
+				@nginx_conf_dir = File.join(@nginx_dir, 'conf.d')
 			end
 
 			def grouped_domains

data/lib/odania_static_pages/helper/nginx.rb

@@ -5,7 +5,13 @@ module NginxHelper
 		grouped_domains.each_pair do |site_name, page_config|
 			full_site_name = "#{site_name}.lvh.me"
 			puts "Writing vhost for: #{full_site_name}"
-			expires = @deploy_config.expires
+
+			if @deploy_config.respond_to? :expires
+				expires = @deploy_config.expires
+			else
+				expires = 'live'.eql?(@config.environment) ? 'modified +24h' : '-1'
+			end
+
 			FileUtils.mkdir_p @nginx_conf_dir
 			File.write File.join(@nginx_conf_dir, "#{site_name}.conf"), vhost_renderer.result(binding)
 
@@ -16,13 +22,19 @@ module NginxHelper
 			end if page_config.count > 1
 		end
 
-		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)
+		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'
-		default_vhost_file = 'live'.eql?(@config.environment) ? 'default-live-vhost.conf' : 'default-vhost.conf'
 		FileUtils.cp File.join(@config.base_dir, 'templates', 'nginx', default_vhost_file), File.join(@nginx_conf_dir, 'default.conf')
 
 		puts 'Copy nginx.conf'

data/lib/odania_static_pages/version.rb

@@ -1,3 +1,3 @@
 module OdaniaStaticPages
-	VERSION = '0.1.6'
+	VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania-static-pages
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Mike Petersen
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Helper For creating static pages