From: František Dvořák Date: Thu, 13 Mar 2014 17:02:42 +0000 (+0100) Subject: Fixes (remove requirement for :developemnt) and updates (patch to config files in... X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=cf59cd86ea1fb6f8ca32d196d70bb206f8e4b019;p=rOCCI-packaging.git Fixes (remove requirement for :developemnt) and updates (patch to config files in git). --- 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 b4e6533..7af3dab 100644 --- a/rocci-server/debian/patches/series +++ b/rocci-server/debian/patches/series @@ -1,2 +1 @@ unbundle-all.patch -config.patch diff --git a/rocci-server/debian/patches/unbundle-all.patch b/rocci-server/debian/patches/unbundle-all.patch index 588760b..50cdf01 100644 --- a/rocci-server/debian/patches/unbundle-all.patch +++ b/rocci-server/debian/patches/unbundle-all.patch @@ -1,18 +1,9 @@ -commit 57efd09d6b61ed81b729631dd41a963d4b0d884a +commit f3215df48f03308792295a406abc8a819ac1fc6b Author: FrantiÅ¡ek Dvořák -Date: Thu Mar 13 14:27:10 2014 +0100 +Date: Thu Mar 13 18:00:00 2014 +0100 - All gems from the system. + All gems from the system, no git references in Gemfiles, disable :development and :test. -diff --git a/.bundle/config b/.bundle/config -deleted file mode 100644 -index 57d4641..0000000 ---- a/.bundle/config -+++ /dev/null -@@ -1,3 +0,0 @@ ----- --BUNDLE_PATH: vendor/bundle --BUNDLE_DISABLE_SHARED_GEMS: '1' diff --git a/Gemfile b/Gemfile index 94a3593..b6553f7 100644 --- a/Gemfile @@ -27,10 +18,10 @@ index 94a3593..b6553f7 100644 # Use Hashie::Mash to simplify hash-related stuff gem 'hashie' diff --git a/Gemfile.lock b/Gemfile.lock -index 3a6dbbd..58bb5c8 100644 +index 3a6dbbd..6e42b08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock -@@ -1,256 +1,5 @@ +@@ -1,294 +1,23 @@ -GIT - remote: git://github.com/arax/logstasher.git - revision: 4ceebbb27b647d7f15776afba4893684c575ce72 @@ -287,10 +278,23 @@ index 3a6dbbd..58bb5c8 100644 PLATFORMS ruby -@@ -271,12 +20,10 @@ DEPENDENCIES + + DEPENDENCIES +- bond +- capistrano + dalli +- debugger + erubis +- fuubar +- guard-bundler +- guard-rails +- guard-test + hashie +- hirb + ice_nine jbuilder (~> 2.0.0) kgio - libnotify +- libnotify - logstasher! + logstasher occi-core (~> 4.2.10) @@ -300,5 +304,33 @@ index 3a6dbbd..58bb5c8 100644 - openssl_cms_2_1! + openssl_cms_1_9_3 passenger (= 4.0.29) - pry-rails - pry-rescue +- pry-rails +- pry-rescue +- pry-stack_explorer + rails (~> 4.0.0) + rails-api (~> 0.2.0) +- rb-inotify +- redcarpet +- rspec-rails +- rvm-capistrano + sdoc +- simplecov + warden + whenever +- yard +diff --git a/lib/authentication_strategies/bundles/Gemfile.keystone b/lib/authentication_strategies/bundles/Gemfile.keystone +index 7abebc5..a1de43b 100644 +--- a/lib/authentication_strategies/bundles/Gemfile.keystone ++++ b/lib/authentication_strategies/bundles/Gemfile.keystone +@@ -1,8 +1,8 @@ + # Deps for the Keystone auth. strategy + #raise "KeystoneStrategy requires CRuby!" unless RUBY_ENGINE == "ruby" + +-gem "openssl_cms_1_9_3", git: 'https://github.com/arax/openssl-cms.git', branch: 'ruby_1_9_3', require: false, platforms: :ruby_19 ++gem "openssl_cms_1_9_3", require: false, platforms: :ruby_19 + +-gem "openssl_cms_2_0_0", git: 'https://github.com/arax/openssl-cms.git', branch: 'ruby_2_0_0', require: false, platforms: :ruby_20 ++gem "openssl_cms_2_0_0", require: false, platforms: :ruby_20 + +-gem "openssl_cms_2_1", git: 'https://github.com/arax/openssl-cms.git', branch: 'ruby_2_1', require: false, platforms: :ruby_21 ++gem "openssl_cms_2_1", require: false, platforms: :ruby_21 diff --git a/rocci-server/debian/rocci-server.install b/rocci-server/debian/rocci-server.install index 997098a..892bdad 100644 --- a/rocci-server/debian/rocci-server.install +++ b/rocci-server/debian/rocci-server.install @@ -1,4 +1,3 @@ -.bundle usr/share/rocci-server app usr/share/rocci-server bin usr/share/rocci-server config usr/share/rocci-server