pcs/fedfix.patch

125 lines
2.8 KiB
Diff
Raw Normal View History

From 16b05cae25afdd208fc9d0d9f77db22d54dbb27a Mon Sep 17 00:00:00 2001
2015-06-05 12:39:48 +00:00
From: Tomas Jelinek <tojeline@redhat.com>
Date: Wed, 17 Feb 2016 13:08:18 +0100
Subject: [PATCH] fedfix
2015-06-05 12:39:48 +00:00
---
pcsd/Gemfile | 16 +---------------
pcsd/Gemfile.lock | 26 --------------------------
2015-09-18 14:15:59 +00:00
pcsd/Makefile | 4 ++--
pcsd/ssl.rb | 4 ++--
4 files changed, 5 insertions(+), 45 deletions(-)
2015-06-05 12:39:48 +00:00
diff --git a/pcsd/Gemfile b/pcsd/Gemfile
index fb97a1a..41987d4 100644
2015-06-05 12:39:48 +00:00
--- a/pcsd/Gemfile
+++ b/pcsd/Gemfile
@@ -1,21 +1,7 @@
2013-12-14 00:07:51 +00:00
source 'https://rubygems.org'
2015-09-18 14:15:59 +00:00
-source 'https://tojeline.fedorapeople.org/rubygems/' do
- gem 'rpam-ruby19-feist', :platform => :ruby_18
-end
-
2013-12-14 00:07:51 +00:00
-gem 'sinatra'
gem 'sinatra-contrib'
-gem 'rack'
-gem 'rack-protection'
-gem 'tilt'
-gem 'eventmachine'
-gem 'rack-test'
-gem 'backports'
2013-12-14 00:07:51 +00:00
gem 'sinatra-sugar'
gem 'monkey-lib'
2015-09-18 14:15:59 +00:00
-gem 'rpam-ruby19', :platform => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
-gem 'json'
2013-12-14 00:07:51 +00:00
-gem 'multi_json'
2015-02-19 10:32:46 +00:00
-gem 'open4'
2015-09-18 14:15:59 +00:00
+gem 'rpam-ruby19'
2015-06-05 12:39:48 +00:00
gem 'orderedhash'
diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
index 3140d6f..723e644 100644
2015-06-05 12:39:48 +00:00
--- a/pcsd/Gemfile.lock
+++ b/pcsd/Gemfile.lock
@@ -1,25 +1,10 @@
2015-09-18 14:15:59 +00:00
GEM
2015-02-19 10:32:46 +00:00
remote: https://rubygems.org/
2015-09-18 14:15:59 +00:00
- remote: https://tojeline.fedorapeople.org/rubygems/
2015-02-19 10:32:46 +00:00
specs:
- backports (3.6.4)
2015-06-05 12:39:48 +00:00
- eventmachine (1.0.7)
2015-09-18 14:15:59 +00:00
- json (1.8.3)
2015-02-19 10:32:46 +00:00
monkey-lib (0.5.4)
backports
2015-06-23 14:52:04 +00:00
- multi_json (1.11.1)
2015-02-19 10:32:46 +00:00
- open4 (1.3.4)
2015-06-05 12:39:48 +00:00
orderedhash (0.0.6)
2015-06-23 14:52:04 +00:00
- 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
@@ -30,24 +15,13 @@ GEM
2015-06-23 14:52:04 +00:00
sinatra-sugar (0.5.1)
monkey-lib (~> 0.5.0)
sinatra (~> 1.0)
- tilt (1.4.1)
PLATFORMS
ruby
2015-02-19 10:32:46 +00:00
DEPENDENCIES
- backports
2015-02-19 10:32:46 +00:00
- eventmachine
2015-09-18 14:15:59 +00:00
- json
2015-02-19 10:32:46 +00:00
monkey-lib
- multi_json
- open4
2015-06-05 12:39:48 +00:00
orderedhash
2015-02-19 10:32:46 +00:00
- rack
- rack-protection
- rack-test
rpam-ruby19
- sinatra
sinatra-contrib
sinatra-sugar
- tilt
2015-06-05 12:39:48 +00:00
diff --git a/pcsd/Makefile b/pcsd/Makefile
index e18d2df..60e2e12 100644
2015-06-05 12:39:48 +00:00
--- a/pcsd/Makefile
+++ b/pcsd/Makefile
2015-09-18 14:15:59 +00:00
@@ -1,5 +1,5 @@
-build_gems: get_gems
2015-06-05 12:39:48 +00:00
- bundle install --local --deployment
2015-09-18 14:15:59 +00:00
+build_gems:
+ bundle install --verbose --local --path vendor/bundle
2015-06-05 12:39:48 +00:00
# RHEL6 needs special rpam-ruby19 gem to work with 1.8.7
2015-09-18 14:15:59 +00:00
# also bundler is not available on RHEL6 in rpm
diff --git a/pcsd/ssl.rb b/pcsd/ssl.rb
index 2858574..68e1024 100644
2015-09-18 14:15:59 +00:00
--- a/pcsd/ssl.rb
+++ b/pcsd/ssl.rb
@@ -48,8 +48,8 @@ end
webrick_options = {
:Port => 2224,
- :BindAddress => '::',
- :Host => '::',
+ :BindAddress => nil,
+ :Host => nil,
:SSLEnable => true,
:SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE,
:SSLCertificate => OpenSSL::X509::Certificate.new(crt),
2015-06-05 12:39:48 +00:00
--
1.9.1