diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 5 | ||||
| -rw-r--r-- | config/packages | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/environment.rb b/config/environment.rb index 44f541122..9174e0f15 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -15,6 +15,11 @@ require File.join(File.dirname(__FILE__), 'boot') $:.push(File.join(File.dirname(__FILE__), '../commonlib/rblib')) # ... if these fail to include, you need the rblib directory from # mySociety CVS, put it at the same level as the foi directory. + +# ruby-ole and ruby-msg. We use a custom ruby-msg to avoid a name conflict +$:.unshift(File.join(File.dirname(__FILE__), '../vendor/ruby-ole/lib')) +$:.unshift(File.join(File.dirname(__FILE__), '../vendor/ruby-msg/lib')) + load "validate.rb" load "config.rb" load "format.rb" diff --git a/config/packages b/config/packages index 87ab85fd2..be82c6324 100644 --- a/config/packages +++ b/config/packages @@ -27,3 +27,4 @@ librack-ruby1.8 (>= 1.0.1-1) librmagick-ruby1.8 libxml-simple-ruby libfcgi-ruby1.8 +vpim |