From d79f0497d2db33bef542396ed8bcf632dce994fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 14 Mar 2014 16:09:02 +0100 Subject: [PATCH] Update rOCCI-server to 1.0.0-beta.3. --- rocci-server/debian/patches/bundler.patch | 10 +++++----- rocci-server/debian/patches/config.patch | 21 --------------------- rocci-server/debian/patches/series | 1 - rocci-server/debian/patches/unbundle.patch | 25 +++++++++++++------------ 4 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 rocci-server/debian/patches/config.patch diff --git a/rocci-server/debian/patches/bundler.patch b/rocci-server/debian/patches/bundler.patch index b1e458e..c95ccf4 100644 --- a/rocci-server/debian/patches/bundler.patch +++ b/rocci-server/debian/patches/bundler.patch @@ -1,11 +1,11 @@ -commit 55aa8051ff0998f2b43b1ebd6ed4425990fa322c +commit e629097c5e26dd0e8c087b2b8c391e56f7bf1da5 Author: František Dvořák -Date: Fri Mar 7 13:14:19 2014 +0100 +Date: Fri Mar 14 15:06:11 2014 +0100 Patch for compatibility with Debian 7 bundler. diff --git a/Gemfile.lock b/Gemfile.lock -index 8dc2ef3..5a40d60 100644 +index 0b65f09..42b6a6a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,20 +13,6 @@ GIT @@ -30,12 +30,12 @@ index 8dc2ef3..5a40d60 100644 remote: https://rubygems.org/ specs: @@ -275,8 +261,6 @@ DEPENDENCIES - occi-core (~> 4.2.10) + occi-core (~> 4.2.12) opennebula (~> 4.4.0) openssl_cms_1_9_3! - openssl_cms_2_0_0! - openssl_cms_2_1! - passenger (= 4.0.29) + passenger (~> 4.0.38) pry-rails pry-rescue diff --git a/lib/authentication_strategies/bundles/Gemfile.keystone b/lib/authentication_strategies/bundles/Gemfile.keystone diff --git a/rocci-server/debian/patches/config.patch b/rocci-server/debian/patches/config.patch deleted file mode 100644 index e720a87..0000000 --- a/rocci-server/debian/patches/config.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/examples/etc/apache2/sites-available/occi-ssl b/examples/etc/apache2/sites-available/occi-ssl -index 99bc0d2..61de8be 100644 ---- a/examples/etc/apache2/sites-available/occi-ssl -+++ b/examples/etc/apache2/sites-available/occi-ssl -@@ -42,6 +42,16 @@ - Options -MultiViews - - -+ # user should exist and have write permissions to log directory -+ #PassengerUser rocci -+ #PassengerGroup rocci -+ -+ # log directory -+ #SetEnv ROCCI_SERVER_LOG_DIR /var/log/rocci-server -+ -+ # enhance security -+ #PassengerFriendlyErrorPages off -+ - # configuration for rOCCI-server - ## common - SetEnv ROCCI_SERVER_PROTOCOL https diff --git a/rocci-server/debian/patches/series b/rocci-server/debian/patches/series index 50a695f..3414ba9 100644 --- a/rocci-server/debian/patches/series +++ b/rocci-server/debian/patches/series @@ -1,3 +1,2 @@ bundler.patch unbundle.patch -config.patch diff --git a/rocci-server/debian/patches/unbundle.patch b/rocci-server/debian/patches/unbundle.patch index 5ba2837..6583440 100644 --- a/rocci-server/debian/patches/unbundle.patch +++ b/rocci-server/debian/patches/unbundle.patch @@ -1,14 +1,15 @@ -commit 78a0c6345dbdd7050d4cbf420d3a0f3abe34d204 +commit b28a203780beafd5ee95032cdc71a9433b4bf1ce Author: František Dvořák -Date: Sat Mar 8 13:09:34 2014 +0100 +Date: Fri Mar 14 15:19:10 2014 +0100 - Use from system: + Use rather from the system: + - passenger (apache module) - nokogiri (bundles libxslt, libxml2) - rake, yard, redcarpet diff --git a/Gemfile b/Gemfile -index 94a3593..c82753b 100644 +index 27f06f9..7255ee0 100644 --- a/Gemfile +++ b/Gemfile @@ -25,9 +25,6 @@ gem 'debugger', group: [:development, :test] @@ -16,7 +17,7 @@ index 94a3593..c82753b 100644 gem 'whenever', require: false -# Use passenger for deployment (standalone or in Apache2) --gem 'passenger', '= 4.0.29' +-gem 'passenger', '~> 4.0.38' - # Use simplecov for coverage reports gem 'simplecov', group: [:development, :test] @@ -33,7 +34,7 @@ index 94a3593..c82753b 100644 # # Add the following to your ~/.irbrc: diff --git a/Gemfile.lock b/Gemfile.lock -index 2823ef1..667a903 100644 +index 42b6a6a..f93af68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,8 +128,6 @@ GEM @@ -42,7 +43,7 @@ index 2823ef1..667a903 100644 nio4r (1.0.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - occi-core (4.2.10) + occi-core (4.2.12) activesupport (~> 4.0.0) hashie @@ -138,11 +136,6 @@ GEM @@ -50,8 +51,8 @@ index 2823ef1..667a903 100644 opennebula (4.4.0) json - nokogiri -- passenger (4.0.29) -- daemon_controller (>= 1.1.0) +- passenger (4.0.38) +- daemon_controller (>= 1.2.0) - rack - rake (>= 0.8.1) polyglot (0.3.4) @@ -82,10 +83,10 @@ index 2823ef1..667a903 100644 PLATFORMS ruby @@ -261,18 +250,15 @@ DEPENDENCIES - occi-core (~> 4.2.10) + occi-core (~> 4.2.12) opennebula (~> 4.4.0) openssl_cms_1_9_3! -- passenger (= 4.0.29) +- passenger (~> 4.0.38) pry-rails pry-rescue pry-stack_explorer @@ -97,6 +98,6 @@ index 2823ef1..667a903 100644 rvm-capistrano sdoc simplecov - warden + warden (~> 1.2.3) whenever - yard -- 1.8.2.3