diff --git a/admin/app/admin/icecast_bootstrap.rb b/admin/app/admin/icecast_bootstrap.rb index 6367fff89..5b360c3d9 100644 --- a/admin/app/admin/icecast_bootstrap.rb +++ b/admin/app/admin/icecast_bootstrap.rb @@ -43,10 +43,10 @@ ActiveAdmin.register_page "Bootstrap" do admin_auth.save! path = IcecastPath.new - path.base_dir = '/usr/local/Cellar/icecast/2.4.1/share/icecast' - path.log_dir = '/usr/local/Cellar/icecast/2.4.1/var/log/icecast' - path.web_root = '/usr/local/Cellar/icecast/2.4.1/share/icecast/web' - path.admin_root = '/usr/local/Cellar/icecast/2.4.1/share/icecast/admin' + path.base_dir = '/opt/homebrew/share/icecast' + path.log_dir = '/opt/homebrew/var/log/icecast' + path.web_root = '/opt/homebrew/share/icecast/web' + path.admin_root = '/opt/homebrew/share/icecast/admin' path.pid_file = nil path.save! diff --git a/ruby/.gitignore b/ruby/.gitignore index fe1f4d2c5..e91489756 100644 --- a/ruby/.gitignore +++ b/ruby/.gitignore @@ -23,3 +23,4 @@ vendor *.swp *.iml .byebug_history +.ruby-version \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/icecast_path_spec.rb b/ruby/spec/jam_ruby/models/icecast_path_spec.rb index 50354d38d..324a23fa3 100644 --- a/ruby/spec/jam_ruby/models/icecast_path_spec.rb +++ b/ruby/spec/jam_ruby/models/icecast_path_spec.rb @@ -7,7 +7,7 @@ describe IcecastPath do let(:builder) { ::Builder::XmlMarkup.new(:target => output, :indent => 1) } it "save default" do - path.save.should be_true + path.save.should be_truthy path.dumpXml(builder) output.rewind @@ -38,7 +38,7 @@ describe IcecastPath do path.deny_ip = Faker::Lorem.characters(10) path.alias_source = Faker::Lorem.characters(10) path.alias_dest = Faker::Lorem.characters(10) - path.save.should be_true + path.save.should be_truthy path.dumpXml(builder) output.rewind diff --git a/web/config/application.rb b/web/config/application.rb index b3361beea..d4b5e55df 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -227,9 +227,9 @@ if defined?(Bundler) config.normalize_mp3_path = ENV['NORMALIZE_MP3_PATH'] || (File.exist?('/usr/local/bin/normalize-mp3') ? '/usr/local/bin/normalize-mp3' : '/usr/bin/normalize-mp3') # if it looks like linux, use init.d script; otherwise use kill - config.icecast_reload_cmd = ENV['ICECAST_RELOAD_CMD'] || (File.exist?('/usr/local/bin/icecast2') ? "bash -l -c #{Shellwords.escape("sudo /etc/init.d/icecast2 reload")}" : "bash -l -c #{Shellwords.escape("kill -1 `ps -f | grep /usr/local/bin/icecast | grep -v grep | awk \'{print $2}\'`")}") + config.icecast_reload_cmd = ENV['ICECAST_RELOAD_CMD'] || (File.exist?('/usr/local/bin/icecast2') ? "bash -l -c #{Shellwords.escape("sudo /etc/init.d/icecast2 reload")}" : "bash -l -c #{Shellwords.escape("kill -1 `ps -f | grep /opt/homebrew/bin/icecast | grep -v grep | awk \'{print $2}\'`")}") # if it looks like linux, use that path; otherwise use the brew default path - config.icecast_config_file = ENV['ICECAST_CONFIG_FILE'] || (File.exist?('/etc/icecast2/icecast.xml') ? '/etc/icecast2/icecast.xml' : '/usr/local/etc/icecast.xml') + config.icecast_config_file = ENV['ICECAST_CONFIG_FILE'] || (File.exist?('/etc/icecast2/icecast.xml') ? '/etc/icecast2/icecast.xml' : '/opt/homebrew/etc/icecast.xml') # this will be the qualifier on the IcecastConfigWorker queue name config.icecast_server_id = ENV['ICECAST_SERVER_ID'] || 'localhost' config.icecast_max_missing_check = 2 * 60 # 2 minutes diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb index 0a787bc04..51455bc5a 100644 --- a/web/config/environments/development.rb +++ b/web/config/environments/development.rb @@ -119,5 +119,5 @@ SampleApp::Application.configure do config.spa_origin = "http://beta.jamkazam.local:4000" - config.session_cookie_domain = ".jamkazam.local" + #config.session_cookie_domain = ".jamkazam.local" end