odania-static-pages 0.1.8 → 0.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/odania_static_pages/helper/nginx.rb +17 -15
- data/lib/odania_static_pages/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ebeaadbc0d974b04d8628669f8538704e611f657
|
|
4
|
+
data.tar.gz: db5e0bfe90902e65baf633d0cfdd1fce90af9ba1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 19d466e7fe1e8e502b6a022ec1a45696408dd8eaa65388b1d42aa1761c1754636c0ff1fcc988395e20c5ce41084a4174e9ec318e8309a99fe20bdd4ce1fcdb13
|
|
7
|
+
data.tar.gz: 713fddaf55803a91b6a7e5b776b3568543f7a27098a7e4d44d3423658182d0051c81f376e1c6ee0319cc734023f86743520c141eb7e286a8d6313691708bba26
|
|
@@ -1,9 +1,23 @@
|
|
|
1
1
|
module NginxHelper
|
|
2
2
|
def generate_nginx_config(do_rebuild)
|
|
3
|
+
nginx_default_redirect = @generator_config.nginx_default_redirect
|
|
4
|
+
if 'live'.eql?(@config.environment)
|
|
5
|
+
default_vhost_file = 'default-live-vhost.conf.erb'
|
|
6
|
+
domain_extension = ''
|
|
7
|
+
else
|
|
8
|
+
default_vhost_file = 'default-vhost.conf'
|
|
9
|
+
domain_extension = '.lvh.me'
|
|
10
|
+
|
|
11
|
+
puts 'Generating index.html'
|
|
12
|
+
FileUtils.mkdir_p @config.output_site_path
|
|
13
|
+
renderer = ERB.new(File.read(File.join(@config.base_dir, 'templates', 'nginx', 'index.html.erb')))
|
|
14
|
+
File.write File.join(@config.output_site_path, 'index.html'), renderer.result(binding)
|
|
15
|
+
end
|
|
16
|
+
|
|
3
17
|
vhost_renderer = ERB.new(File.read(File.join(@config.base_dir, 'templates', 'nginx', 'vhost.conf.erb')))
|
|
4
18
|
sites = {}
|
|
5
19
|
grouped_domains.each_pair do |site_name, page_config|
|
|
6
|
-
full_site_name = "#{site_name}
|
|
20
|
+
full_site_name = "#{site_name}#{domain_extension}"
|
|
7
21
|
puts "Writing vhost for: #{full_site_name}"
|
|
8
22
|
|
|
9
23
|
if @deploy_config.respond_to? :expires
|
|
@@ -15,25 +29,13 @@ module NginxHelper
|
|
|
15
29
|
FileUtils.mkdir_p @nginx_conf_dir
|
|
16
30
|
File.write File.join(@nginx_conf_dir, "#{site_name}.conf"), vhost_renderer.result(binding)
|
|
17
31
|
|
|
18
|
-
sites[site_name] = "#{site_name}
|
|
32
|
+
sites[site_name] = "#{site_name}#{domain_extension}:8080"
|
|
19
33
|
|
|
20
34
|
page_config.each do |config|
|
|
21
|
-
sites["#{site_name}#{config[:baseurl]}"] = "#{site_name}
|
|
35
|
+
sites["#{site_name}#{config[:baseurl]}"] = "#{site_name}#{domain_extension}:8080#{config[:baseurl]}"
|
|
22
36
|
end if page_config.count > 1
|
|
23
37
|
end
|
|
24
38
|
|
|
25
|
-
nginx_default_redirect = @generator_config.nginx_default_redirect
|
|
26
|
-
if 'live'.eql?(@config.environment)
|
|
27
|
-
default_vhost_file = 'default-live-vhost.conf.erb'
|
|
28
|
-
else
|
|
29
|
-
default_vhost_file = 'default-vhost.conf'
|
|
30
|
-
|
|
31
|
-
puts 'Generating index.html'
|
|
32
|
-
FileUtils.mkdir_p @config.output_site_path
|
|
33
|
-
renderer = ERB.new(File.read(File.join(@config.base_dir, 'templates', 'nginx', 'index.html.erb')))
|
|
34
|
-
File.write File.join(@config.output_site_path, 'index.html'), renderer.result(binding)
|
|
35
|
-
end
|
|
36
|
-
|
|
37
39
|
puts 'Copy default vhost'
|
|
38
40
|
renderer = ERB.new(File.read(File.join(@config.base_dir, 'templates', 'nginx', default_vhost_file)))
|
|
39
41
|
File.write File.join(@nginx_conf_dir, 'default.conf'), renderer.result(binding)
|