odania-static-pages 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3367af5072b1e9be5310054749f59e1c614fd2da
-  data.tar.gz: 6da2cbedc60cba4fbbe7ec7a29835179f4d8acf3
+  metadata.gz: 0baa2c52d548e23641889addb9bad4f553a9b96d
+  data.tar.gz: ddab7c74d9821064703a8aba1be792eae86687a5
 SHA512:
-  metadata.gz: 4c177898819b04578d39429dc53eb880cbde802425d41b9e5012e66912282964b218f861d89c2764c7945544ce52bec30805cc696a83e1966923d80be079ef31
-  data.tar.gz: 419327034c55947c6046b8b29f4673256a0092f8df4cdbeb8334142d77078665d2573444e94ed99914768e73a5b8d0ccd53ca7cc40b3b3b5b7bbb42ba8df10d3
+  metadata.gz: b42ea397e077f6bc548e8d4f5f357551619a58f9b004f3c6c93863b3d7594dd61e0b4d1bbfc68cbe18fa00fa54a271bf86703455a61b6be6a2b228b4fd1b4c83
+  data.tar.gz: bedf3a45c11f951e934d16affb548f0b0a9272e2e27ec83354c045ff1f0ab669cd7f1c4bb685dc767e402efbfc911fea22f861249335c71979d67e0968a48581

data/lib/odania_static_pages.rb

@@ -13,6 +13,7 @@ require_relative 'odania_static_pages/deploy/docker_compose'
 require_relative 'odania_static_pages/deploy/rsync'
 require_relative 'odania_static_pages/deploy/s3'
 require_relative 'odania_static_pages/generator/jekyll'
+require_relative 'odania_static_pages/helper/nginx'
 require_relative 'odania_static_pages/server/nginx'
 require_relative 'odania_static_pages/version'
 

data/lib/odania_static_pages/config.rb

@@ -63,6 +63,10 @@ module OdaniaStaticPages
 			File.join @project_dir, 'pages'
 		end
 
+		def output_nginx_conf_d_path
+			File.join @output_nginx_path, 'conf.d'
+		end
+
 		def current_environment
 			if @environments[@environment].nil?
 				puts "Environment #{environment} no found!"

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

@@ -50,7 +50,7 @@ module OdaniaStaticPages
 
 					puts ' -> Linking Gemfile*'
 					dot_bundle_folder = File.join(full_common_folder, '.bundle')
-					FileUtils.ln_s dot_bundle_folder, page_path, force: true if File.exist? dot_bundle_folder
+					FileUtils.ln_s(dot_bundle_folder, page_path, force: true) if File.exist? dot_bundle_folder
 					FileUtils.ln_s File.join(full_common_folder, 'Gemfile'), File.join(page_path, 'Gemfile'), force: true
 					FileUtils.ln_s File.join(full_common_folder, 'Gemfile.lock'), File.join(page_path, 'Gemfile.lock'), force: true
 

data/lib/odania_static_pages/deploy/docker_compose.rb

@@ -1,6 +1,8 @@
 module OdaniaStaticPages
 	module Deploy
 		class DockerCompose
+			include NginxHelper
+
 			def initialize
 				@config = OdaniaStaticPages.config
 				@environment = @config.current_environment
@@ -28,7 +30,7 @@ module OdaniaStaticPages
 				puts " -> Deploying to color: #{new_color} [Path: #{@site_path}]"
 
 				generate_compose_config
-				generate_nginx_config(do_rebuild)
+				NginxHelper.generate_nginx_config(do_rebuild)
 				prepare_varnish
 
 				@config.current_environment.do_notify new_color, color
@@ -59,35 +61,6 @@ module OdaniaStaticPages
 				docker_compose_generator.write compose_file
 			end
 
-			def generate_nginx_config(do_rebuild)
-				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"
-					puts "Writing vhost for: #{full_site_name}"
-					expires = @deploy_config.expires
-					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"
-
-					page_config.each do |config|
-						sites["#{site_name}#{config[:baseurl]}"] = "#{site_name}.lvh.me:8080#{config[:baseurl]}"
-					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)
-
-				puts 'Copy default vhost'
-				FileUtils.cp File.join(@config.base_dir, 'templates', 'nginx', 'default-vhost.conf'), File.join(@nginx_conf_dir, 'default.conf')
-
-				puts 'Copy nginx.conf'
-				FileUtils.cp File.join(@config.base_dir, 'templates', 'nginx', 'nginx.conf'), File.join(@nginx_dir, 'nginx.conf')
-			end
-
 			def prepare_varnish
 				docker_folder = File.join(@config.project_dir, 'docker')
 				FileUtils.mkdir_p docker_folder

data/lib/odania_static_pages/deploy/rsync.rb

@@ -1,6 +1,8 @@
 module OdaniaStaticPages
 	module Deploy
 		class Rsync
+			include NginxHelper
+
 			def initialize
 				@config = OdaniaStaticPages.config
 				@deploy_config = @config.current_environment.deploy_module
@@ -11,6 +13,11 @@ 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')
+
+				NginxHelper.generate_nginx_config(false)
 			end
 
 			def publish(color, do_rebuild)

data/lib/odania_static_pages/helper/nginx.rb

@@ -0,0 +1,31 @@
+module NginxHelper
+	def generate_nginx_config(do_rebuild)
+		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"
+			puts "Writing vhost for: #{full_site_name}"
+			expires = @deploy_config.expires
+			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"
+
+			page_config.each do |config|
+				sites["#{site_name}#{config[:baseurl]}"] = "#{site_name}.lvh.me:8080#{config[:baseurl]}"
+			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)
+
+		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'
+		FileUtils.cp File.join(@config.base_dir, 'templates', 'nginx', 'nginx.conf'), File.join(@nginx_dir, 'nginx.conf')
+	end
+end

data/lib/odania_static_pages/version.rb

@@ -1,3 +1,3 @@
 module OdaniaStaticPages
-	VERSION = '0.1.2'
+	VERSION = '0.1.3'
 end

data/templates/docker-compose/docker-compose.yml.erb

@@ -42,7 +42,7 @@ services:
     depends_on:
       - generator
     ports:
-      - "3000:80/tcp"
+      - "8088:80/tcp"
 
   generator:
     build: ../docker/varnish-generator

data/templates/live/Dockerfile

@@ -0,0 +1,6 @@
+FROM nginx:stable
+MAINTAINER Mike Petersen <mike@odania-it.de>
+
+COPY sites /srv
+COPY nginx/nginx.conf /etc/nginx/nginx.conf
+COPY nginx/conf.d /etc/nginx/conf.d

data/templates/nginx/index.html.erb

@@ -5,7 +5,7 @@
 <ul>
   <% sites.each do |site_name, site_path| %>
     <li>
-			<a href="<%= site_path.gsub(':8080', ':3000') %>" target="_blank"><%= site_name %></a>
+			<a href="<%= site_path.gsub(':8080', ':8088') %>" target="_blank"><%= site_name %></a>
 			(<a href="<%= site_path %>" target="_blank">Nginx</a>)
 		</li>
   <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania-static-pages
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,6 +156,7 @@ files:
 - lib/odania_static_pages/deploy/rsync.rb
 - lib/odania_static_pages/deploy/s3.rb
 - lib/odania_static_pages/generator/jekyll.rb
+- lib/odania_static_pages/helper/nginx.rb
 - lib/odania_static_pages/server/nginx.rb
 - lib/odania_static_pages/version.rb
 - odania-static-pages.gemspec
@@ -163,6 +164,7 @@ files:
 - templates/docker-compose/docker-compose.yml.erb
 - templates/jekyll/Gemfile.erb
 - templates/jekyll/example_config.yml
+- templates/live/Dockerfile
 - templates/nginx/default-live-vhost.conf.erb
 - templates/nginx/default-vhost.conf
 - templates/nginx/index.html.erb
@@ -189,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