From f4d4f7be4db101dafb7fc026824e7b215bb2f292 Mon Sep 17 00:00:00 2001 From: Tomas Jelinek Date: Mon, 11 Apr 2016 10:52:30 +0200 Subject: [PATCH] fedfix --- pcsd/Gemfile | 16 +--------------- pcsd/Gemfile.lock | 26 -------------------------- pcsd/Makefile | 4 ++-- pcsd/ssl.rb | 2 +- 4 files changed, 4 insertions(+), 44 deletions(-) diff --git a/pcsd/Gemfile b/pcsd/Gemfile index e851eaf..3d426d8 100644 --- a/pcsd/Gemfile +++ b/pcsd/Gemfile @@ -1,19 +1,5 @@ source 'https://rubygems.org' -source 'https://tojeline.fedorapeople.org/rubygems/' do - gem 'rpam-ruby19-feist', :platform => :ruby_18 -end - -gem 'sinatra' gem 'sinatra-contrib' -gem 'rack' -gem 'rack-protection' -gem 'tilt' -gem 'eventmachine' -gem 'rack-test' -gem 'backports' -gem 'rpam-ruby19', :platform => [:ruby_19, :ruby_20, :ruby_21, :ruby_22] -gem 'json' -gem 'multi_json' -gem 'open4' +gem 'rpam-ruby19' gem 'orderedhash' diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock index 575a014..fc61d83 100644 --- a/pcsd/Gemfile.lock +++ b/pcsd/Gemfile.lock @@ -1,23 +1,8 @@ GEM remote: https://rubygems.org/ - remote: https://tojeline.fedorapeople.org/rubygems/ specs: - backports (3.6.4) - eventmachine (1.0.7) - json (1.8.3) - multi_json (1.11.1) - open4 (1.3.4) orderedhash (0.0.6) - rack (1.6.4) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) rpam-ruby19 (1.2.1) - sinatra (1.4.6) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) sinatra-contrib (1.4.4) backports (>= 2.0) multi_json @@ -25,22 +10,11 @@ GEM rack-test sinatra (~> 1.4.0) tilt (>= 1.3, < 3) - tilt (1.4.1) PLATFORMS ruby DEPENDENCIES - backports - eventmachine - json - multi_json - open4 orderedhash - rack - rack-protection - rack-test rpam-ruby19 - sinatra sinatra-contrib - tilt diff --git a/pcsd/Makefile b/pcsd/Makefile index 8ae6bc4..1fdfea7 100644 --- a/pcsd/Makefile +++ b/pcsd/Makefile @@ -1,5 +1,5 @@ -build_gems: get_gems - bundle install --local --deployment +build_gems: + bundle install --verbose --local --path vendor/bundle # RHEL6 needs special rpam-ruby19 gem to work with 1.8.7 # also bundler is not available on RHEL6 in rpm diff --git a/pcsd/ssl.rb b/pcsd/ssl.rb index f56c947..0ee8448 100644 --- a/pcsd/ssl.rb +++ b/pcsd/ssl.rb @@ -95,7 +95,7 @@ else end default_bind = true -primary_addr = '::' +primary_addr = nil secondary_addrs = [] if ENV['PCSD_BIND_ADDR'] user_addrs = ENV['PCSD_BIND_ADDR'].split(',').collect { |x| x.strip() } -- 1.9.1