File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1010 else
1111 system ( "node node-server/server-dev.js --ruby-port=#{ rubyPort } --node-port=9293 &" )
1212 end
13- elsif ENV [ 'SP ' ] == 'true'
14- workers 1
13+ elsif ENV [ 'WP ' ] != nil
14+ workers ENV [ 'WP' ] . to_i
1515 before_fork do
16- puts "Single Process Mode " . colorize ( :red )
16+ puts "The amount of proccesses is: #{ ENV [ 'WP' ] } " . colorize ( :green )
1717 puts "Master Process ID: #{ Process . pid } " . colorize ( :green )
1818 puts "Starting Server..." . colorize ( :green )
1919 rubyPort = 9292
Original file line number Diff line number Diff line change 2626}
2727#Validate the YML file
2828validateYML ( )
29+ #Validate the ENV variables
30+ validateEnv ( )
2931#Encrypted cookies
3032use Rack ::Session ::EncryptedCookie , cookie_options
3133#csrf
3840 if request . path_info == '/auth'
3941 return
4042 #any route on the main domain
41- elsif request . url . include? Settings . mainURL
43+ elsif request . url . include? ENV [ 'DOMAIN' ] || Settings . mainURL
4244 return
4345 else
4446 auth ( )
Original file line number Diff line number Diff line change 1313require './ruby/utils.rb'
1414require './ruby/uv.rb'
1515require './ruby/auth.rb'
16- require './ruby/yamlValidator .rb'
16+ require './ruby/validator .rb'
Original file line number Diff line number Diff line change @@ -52,3 +52,15 @@ def validateYML
5252 exit
5353 end
5454end
55+
56+ def validateEnv
57+ if ENV [ 'DOMAIN' ] != nil
58+ if ENV [ 'DOMAIN' ] !~ /\A #{ URI ::regexp ( [ 'http' , 'https' ] ) } \z /
59+ puts "Domain is not a valid URL" . red
60+ exit
61+ elsif ENV [ 'DOMAIN' ] !~ /\/ \z /
62+ puts "Domain must end with a /" . red
63+ exit
64+ end
65+ end
66+ end
You can’t perform that action at this time.
0 commit comments