[DRE-commits] [redmine] 17/19: Always assume the default instance

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository redmine.

commit 95daae2bc293054db87f7d798340fe8e268ad042
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Feb 15 09:14:36 2016 -0200

    Always assume the default instance
    
    This patch it not supposed to go upstream
---
 debian/patches/0005-Assume-default-instance.patch | 35 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/0005-Assume-default-instance.patch b/debian/patches/0005-Assume-default-instance.patch
new file mode 100644
index 0000000..6b96f09
--- /dev/null
+++ b/debian/patches/0005-Assume-default-instance.patch
@@ -0,0 +1,35 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Mon, 15 Feb 2016 09:11:07 -0200
+Subject: Assume default instance
+
+---
+ Gemfile                      | 2 +-
+ lib/redmine/multi_tenancy.rb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Gemfile b/Gemfile
+index 4a04b1e..9562231 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -56,7 +56,7 @@ require 'yaml'
+ # XXX this duplicates logic in lib/redmine/multi_tenancy.rb, but we can't load
+ # XXX that at this point. X_DEBIAN_SITEID is kept for compatibility with
+ # existing XXX Debian installations.
+-instance = ENV['X_DEBIAN_SITEID'] || ENV['REDMINE_INSTANCE']
++instance = ENV['X_DEBIAN_SITEID'] || ENV['REDMINE_INSTANCE'] || 'default'
+ root = instance && File.join(File.dirname(__FILE__), 'instances', instance) || File.dirname(__FILE__)
+ database_file = File.join(root, "config/database.yml")
+ 
+diff --git a/lib/redmine/multi_tenancy.rb b/lib/redmine/multi_tenancy.rb
+index 0d100f7..17530b2 100644
+--- a/lib/redmine/multi_tenancy.rb
++++ b/lib/redmine/multi_tenancy.rb
+@@ -23,7 +23,7 @@ module Redmine
+     def tenant
+       # X_DEBIAN_SITEID is kept here for backwards compatibility with existing
+       # Debian installations.
+-      ENV['X_DEBIAN_SITEID'] || ENV['REDMINE_INSTANCE']
++      ENV['X_DEBIAN_SITEID'] || ENV['REDMINE_INSTANCE'] || 'default'
+     end
+ 
+     def tenant?
diff --git a/debian/patches/series b/debian/patches/series
index 73ab562..6361bfb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Force-table-encoding-in-mysql.patch
 0003-Use-production-environment-by-default.patch
 0004-Add-multi-tenancy-support.patch
+0005-Assume-default-instance.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git