sjs/samhuri.net
1
0
Fork 0
mirror of https://github.com/samsonjs/samhuri.net.git synced 2026-04-27 14:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

support SSL for building URLs

Browse source
This commit is contained in:
Sami Samhuri 2015-06-15 20:27:14 -07:00
parent 1de17f2df3
commit 422f0c7566
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
server/server.rb
View file

@ -14,16 +14,19 @@ CONFIG_DEFAULTS = {
host: '127.0.0.1', host: '127.0.0.1',
hostname: `hostname --fqdn`.strip, hostname: `hostname --fqdn`.strip,
port: 6706, port: 6706,
external_port: 6706,
external_ssl: false,
preview_port: 5000, preview_port: 5000,
preview_ssl: false,
} }
def env_value(name) def env_value(name)
env_name = "BLOG_#{name.to_s.upcase}" env_name = "BLOG_#{name.to_s.upcase}"
raw_value = ENV[env_name] raw_value = ENV[env_name]
case name case name
when :auth, :dry_run when :auth, :dry_run, :preview_ssl, :external_ssl
raw_value ? raw_value.to_i != 0 : false raw_value ? raw_value.to_i != 0 : false
when :port when :port, :external_port, :preview_port
raw_value ? raw_value.to_i : nil raw_value ? raw_value.to_i : nil
else else
raw_value raw_value
@ -38,7 +41,15 @@ $config.each_key do |name|
end end
end end
$config[:preview_url] = "http://#{$config[:hostname]}:#{$config[:preview_port]}" if $config[:external_ssl] && $config[:external_port] == 80
$config[:external_port] = 443
end
if !$config[:external_ssl] && $config[:external_port] == 443
$config[:external_ssl] = true
end
proto = $config[:preview_ssl] ? 'https' : 'http'
$config[:preview_url] = "#{proto}://#{$config[:hostname]}:#{$config[:preview_port]}"
unless File.directory?($config[:path]) unless File.directory?($config[:path])
raise RuntimeError.new("file not found: #{$config[:path]}") raise RuntimeError.new("file not found: #{$config[:path]}")
@ -59,7 +70,8 @@ def authenticated?(auth)
end end
host = $config[:hostname] || $config[:host] host = $config[:hostname] || $config[:host]
$url_root = "http://#{host}:#{$config[:port]}/" proto = $config[:external_ssl] ? 'https' : 'http'
$url_root = "#{proto}://#{host}:#{$config[:external_port]}/"
puts "URL root: #{$url_root}" puts "URL root: #{$url_root}"
def url_for(*components) def url_for(*components)
File.join($url_root, *components) File.join($url_root, *components)