134 lines
2.9 KiB
Diff
134 lines
2.9 KiB
Diff
From 43b366e92113c63926fd372e081bb633cee3ba31 Mon Sep 17 00:00:00 2001
|
|
From: Tomas Jelinek <tojeline@redhat.com>
|
|
Date: Fri, 5 Jun 2015 14:29:03 +0200
|
|
Subject: [PATCH] fedfix patch
|
|
|
|
---
|
|
pcsd/Gemfile | 16 ++++++++--------
|
|
pcsd/Gemfile.lock | 10 ----------
|
|
pcsd/Makefile | 2 +-
|
|
pcsd/pcsd.conf | 1 +
|
|
pcsd/pcsd.rb | 22 ++++++++++++----------
|
|
5 files changed, 22 insertions(+), 29 deletions(-)
|
|
|
|
diff --git a/pcsd/Gemfile b/pcsd/Gemfile
|
|
index db98546..3658683 100644
|
|
--- a/pcsd/Gemfile
|
|
+++ b/pcsd/Gemfile
|
|
@@ -1,16 +1,16 @@
|
|
source 'https://rubygems.org'
|
|
|
|
-gem 'sinatra'
|
|
+#gem 'sinatra'
|
|
gem 'sinatra-contrib'
|
|
-gem 'rack'
|
|
-gem 'rack-protection'
|
|
-gem 'tilt'
|
|
-gem 'eventmachine'
|
|
-gem 'rack-test'
|
|
+#gem 'rack'
|
|
+#gem 'rack-protection'
|
|
+#gem 'tilt'
|
|
+#gem 'eventmachine'
|
|
+#gem 'rack-test'
|
|
gem 'backports'
|
|
gem 'sinatra-sugar'
|
|
gem 'monkey-lib'
|
|
gem 'rpam-ruby19'
|
|
-gem 'multi_json'
|
|
-gem 'open4'
|
|
+#gem 'multi_json'
|
|
+#gem 'open4'
|
|
gem 'orderedhash'
|
|
diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
|
|
index 6eb3d03..af1d77a 100644
|
|
--- a/pcsd/Gemfile.lock
|
|
+++ b/pcsd/Gemfile.lock
|
|
@@ -2,11 +2,9 @@ GEM
|
|
remote: https://rubygems.org/
|
|
specs:
|
|
backports (3.6.4)
|
|
- eventmachine (1.0.7)
|
|
monkey-lib (0.5.4)
|
|
backports
|
|
multi_json (1.11.0)
|
|
- open4 (1.3.4)
|
|
orderedhash (0.0.6)
|
|
rack (1.5.3)
|
|
rack-protection (1.5.3)
|
|
@@ -35,16 +33,8 @@ PLATFORMS
|
|
|
|
DEPENDENCIES
|
|
backports
|
|
- eventmachine
|
|
monkey-lib
|
|
- multi_json
|
|
- open4
|
|
orderedhash
|
|
- rack
|
|
- rack-protection
|
|
- rack-test
|
|
rpam-ruby19
|
|
- sinatra
|
|
sinatra-contrib
|
|
sinatra-sugar
|
|
- tilt
|
|
diff --git a/pcsd/Makefile b/pcsd/Makefile
|
|
index 0d28b58..d320162 100644
|
|
--- a/pcsd/Makefile
|
|
+++ b/pcsd/Makefile
|
|
@@ -7,7 +7,7 @@ else
|
|
endif
|
|
|
|
build_gems_normal:
|
|
- bundle install --local --deployment
|
|
+ bundle install --local --path vendor/bundle
|
|
|
|
# RHEL6 needs special rpam-ruby19 gem to work with 1.8.7
|
|
build_gems_rhel6:
|
|
diff --git a/pcsd/pcsd.conf b/pcsd/pcsd.conf
|
|
index 69c4022..f596d59 100644
|
|
--- a/pcsd/pcsd.conf
|
|
+++ b/pcsd/pcsd.conf
|
|
@@ -1,3 +1,4 @@
|
|
# pcsd configuration file
|
|
# Set PCSD_DEBUG to true for advanced pcsd debugging information
|
|
PCSD_DEBUG=false
|
|
+RACK_ENV=production
|
|
diff --git a/pcsd/pcsd.rb b/pcsd/pcsd.rb
|
|
index 82d3fcd..bb137a4 100644
|
|
--- a/pcsd/pcsd.rb
|
|
+++ b/pcsd/pcsd.rb
|
|
@@ -39,16 +39,18 @@ use Rack::Session::Cookie,
|
|
|
|
#use Rack::SSL
|
|
|
|
-Dir["wizards/*.rb"].each {|file| also_reload file}
|
|
-also_reload 'resource.rb'
|
|
-also_reload 'remote.rb'
|
|
-also_reload 'fenceagent.rb'
|
|
-also_reload 'cluster.rb'
|
|
-also_reload 'config.rb'
|
|
-also_reload 'pcs.rb'
|
|
-also_reload 'auth.rb'
|
|
-also_reload 'wizard.rb'
|
|
-also_reload 'cfgsync.rb'
|
|
+if development?
|
|
+ Dir["wizards/*.rb"].each {|file| also_reload file}
|
|
+ also_reload 'resource.rb'
|
|
+ also_reload 'remote.rb'
|
|
+ also_reload 'fenceagent.rb'
|
|
+ also_reload 'cluster.rb'
|
|
+ also_reload 'config.rb'
|
|
+ also_reload 'pcs.rb'
|
|
+ also_reload 'auth.rb'
|
|
+ also_reload 'wizard.rb'
|
|
+ also_reload 'cfgsync.rb'
|
|
+end
|
|
|
|
before do
|
|
$session = session
|
|
--
|
|
1.9.1
|
|
|