odania-static-pages 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf1d65c68bf508a1cd71caf770b1a0c483e5428
-  data.tar.gz: c8cfc0da9684acc62e72308bfb5a4686f274234a
+  metadata.gz: 3367af5072b1e9be5310054749f59e1c614fd2da
+  data.tar.gz: 6da2cbedc60cba4fbbe7ec7a29835179f4d8acf3
 SHA512:
-  metadata.gz: d69ad404e678ce5c427a496020c474ecb0ceb21308dbc077aa4fb86fc99ecf3891bb61843cee3e43e0ee265e75c4844f45f91d59a0d6c03937e1447a65cc6a52
-  data.tar.gz: 0f028e9dc997ce99e574c97a55d5f11562f1fb66a7f08910444bc58bd0e2050240d47ca5c59b5bbd91c3def015af20caba7348dc32d4115bc5418b07be287b3d
+  metadata.gz: 4c177898819b04578d39429dc53eb880cbde802425d41b9e5012e66912282964b218f861d89c2764c7945544ce52bec30805cc696a83e1966923d80be079ef31
+  data.tar.gz: 419327034c55947c6046b8b29f4673256a0092f8df4cdbeb8334142d77078665d2573444e94ed99914768e73a5b8d0ccd53ca7cc40b3b3b5b7bbb42ba8df10d3

data/lib/odania_static_pages/deploy/docker_compose.rb

@@ -83,6 +83,9 @@ module OdaniaStaticPages
 
 				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

data/lib/odania_static_pages/generator/jekyll.rb

@@ -95,7 +95,8 @@ module OdaniaStaticPages
 				env_vars = "BUNDLE_GEMFILE=#{full_site_path}/Gemfile JEKYLL_ENV=#{jekyll_env}"
 				cmd = "cd #{full_site_path} && #{env_vars} bundle exec jekyll build #{options}"
 				puts " -> Building site [cmd: #{cmd}]"
-				unless system(cmd)
+				puts `#{cmd}`
+				unless $?.success?
 					puts "Error building site: #{site_path}"
 					exit 1
 				end

data/lib/odania_static_pages/version.rb

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

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

@@ -61,8 +61,7 @@ services:
     stdin_open: true
     tty: true
     environment:
-    	<% image['environment'].each do |key, val| %>
-      <%= key %>: <%= val %>
+      <% image['environment'].each do |key, val| %><%= key %>: <%= val %>
       <% end %>
 
 <% end %>

data/templates/nginx/{default-live-vhost.conf → default-live-vhost.conf.erb}

@@ -8,6 +8,6 @@ server {
 	}
 
 	location / {
-		return 301 https://www.die-information.eu;
+		return 301 <%= nginx_default_redirect %>;
 	}
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania-static-pages
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mike Petersen
@@ -163,7 +163,7 @@ files:
 - templates/docker-compose/docker-compose.yml.erb
 - templates/jekyll/Gemfile.erb
 - templates/jekyll/example_config.yml
-- templates/nginx/default-live-vhost.conf
+- templates/nginx/default-live-vhost.conf.erb
 - templates/nginx/default-vhost.conf
 - templates/nginx/index.html.erb
 - templates/nginx/nginx.conf