Skip to content
Extraits de code Groupes Projets
Valider 4da94254 rédigé par danielgrippi's avatar danielgrippi
Parcourir les fichiers

fix pod_uri bug in app_config

parent 084ed0e8
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -6,7 +6,7 @@ require 'uri' ...@@ -6,7 +6,7 @@ require 'uri'
class AppConfig < Settingslogic class AppConfig < Settingslogic
def self.source_file_name def self.source_file_name
if Rails.env == 'test' || ENV["CI"] || Rails.env.include?("integration") || ENV["HEROKU"].present? if Rails.env == 'test' || ENV["CI"] || Rails.env.include?("integration") || ENV["HEROKU"]
File.join(Rails.root, "config", "application.yml.example") File.join(Rails.root, "config", "application.yml.example")
else else
File.join(Rails.root, "config", "application.yml") File.join(Rails.root, "config", "application.yml")
...@@ -16,7 +16,7 @@ class AppConfig < Settingslogic ...@@ -16,7 +16,7 @@ class AppConfig < Settingslogic
namespace Rails.env namespace Rails.env
def self.load! def self.load!
unless ENV["HEROKU"].present? unless ENV["HEROKU"]
if no_config_file? && !have_old_config_file? if no_config_file? && !have_old_config_file?
$stderr.puts <<-HELP $stderr.puts <<-HELP
******** You haven't set up your Diaspora settings file. ********** ******** You haven't set up your Diaspora settings file. **********
...@@ -52,7 +52,7 @@ Please do the following: ...@@ -52,7 +52,7 @@ Please do the following:
Process.exit(1) Process.exit(1)
end end
if !ENV["HEROKU"].present? && no_cert_file_in_prod? if !ENV["HEROKU"] && no_cert_file_in_prod?
$stderr.puts <<-HELP $stderr.puts <<-HELP
******** Diaspora does not know where your SSL-CA-Certificates file is. ********** ******** Diaspora does not know where your SSL-CA-Certificates file is. **********
Please add the root certificate bundle (this is operating system specific) to application.yml. Defaults: Please add the root certificate bundle (this is operating system specific) to application.yml. Defaults:
...@@ -134,9 +134,9 @@ HELP ...@@ -134,9 +134,9 @@ HELP
def self.pod_uri def self.pod_uri
if @@pod_uri.nil? if @@pod_uri.nil?
begin begin
@@pod_uri = Addressable::URI.parse(self.pod_url) @@pod_uri = Addressable::URI.parse(self[:pod_url])
rescue rescue
puts "WARNING: pod url " + self.pod_url + " is not a legal URI" puts "WARNING: pod url " + self[:pod_url] + " is not a legal URI"
end end
end end
return @@pod_uri return @@pod_uri
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter