[DRE-commits] [redmine] 01/10: Add support for plugin assets and plugins migrations

[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 9a8e8c50865a8347a823465adb0be77d0e74146f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jun 5 13:55:16 2016 -0300

    Add support for plugin assets and plugins migrations
    
    Closes: #820875
---
 debian/changelog                                   |  7 ++++
 .../patches/0004-Add-multi-tenancy-support.patch   | 37 ++++++++++++++++++----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca6820e..9003a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+redmine (3.2.1-3) UNRELEASED; urgency=medium
+
+  * 0004-Add-multi-tenancy-support.patch: include support for plugin assets
+    and plugins migrations (Closes: #820875)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sun, 05 Jun 2016 13:54:28 -0300
+
 redmine (3.2.1-2) unstable; urgency=medium
 
   [ Jonatan Nyberg ]
diff --git a/debian/patches/0004-Add-multi-tenancy-support.patch b/debian/patches/0004-Add-multi-tenancy-support.patch
index f3beeed..37982b6 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -19,16 +19,17 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
  .gitignore                                         |   1 +
  Gemfile                                            |  11 +-
  app/models/attachment.rb                           |   4 +-
- bin/redmine-instances                              | 280 +++++++++++++++++++++
+ bin/redmine-instances                              | 289 +++++++++++++++++++++
  config/application.rb                              |   1 +
- config/multitenancy_environment.rb                 |  42 ++++
+ config/multitenancy_environment.rb                 |  42 +++
  .../lib/open_id_authentication.rb                  |   2 +-
  lib/redmine/configuration.rb                       |   4 +-
  lib/redmine/export/pdf.rb                          |   2 +-
- lib/redmine/multi_tenancy.rb                       |  43 ++++
+ lib/redmine/multi_tenancy.rb                       |  43 +++
+ lib/redmine/plugin.rb                              |   2 +-
  lib/redmine/scm/adapters/abstract_adapter.rb       |   2 +-
  lib/tasks/initializers.rake                        |   2 +-
- 12 files changed, 382 insertions(+), 12 deletions(-)
+ 13 files changed, 392 insertions(+), 13 deletions(-)
  create mode 100755 bin/redmine-instances
  create mode 100644 config/multitenancy_environment.rb
  create mode 100644 lib/redmine/multi_tenancy.rb
@@ -97,10 +98,10 @@ index 3d16f57..25fd394 100644
    after_commit :delete_from_disk, :on => :destroy
 diff --git a/bin/redmine-instances b/bin/redmine-instances
 new file mode 100755
-index 0000000..81a1400
+index 0000000..fd43b0e
 --- /dev/null
 +++ b/bin/redmine-instances
-@@ -0,0 +1,280 @@
+@@ -0,0 +1,289 @@
 +#!/bin/sh
 +
 +# Copyright (C) 2015 Antonio Terceiro
@@ -156,8 +157,11 @@ index 0000000..81a1400
 +      files)
 +        echo "/var/lib/redmine/$instance/files"
 +        ;;
++      public/plugin_assets)
++        echo "/var/cache/redmine/$instance/plugin_assets"
++        ;;
 +      tmp)
-+        echo "/var/cache/redmine/$instance"
++        echo "/var/cache/redmine/$instance/tmp"
 +        ;;
 +    esac
 +  fi
@@ -209,6 +213,7 @@ index 0000000..81a1400
 +    make_instance_directory "$instance" config
 +    make_instance_directory "$instance" log
 +    make_instance_directory "$instance" files
++    make_instance_directory "$instance" public/plugin_assets
 +    make_instance_directory "$instance" tmp
 +    ;;
 +
@@ -302,6 +307,9 @@ index 0000000..81a1400
 +I<File attachments> will be stored in
 +/path/to/redmine/instances/I<$REDMINE_INSTANCE>/files/
 +
++I<Plugin assets> will be stored in
++/path/to/redmine/instances/I<$REDMINE_INSTANCE>/public/plugin_assets/
++
 +=head1 NOTES FOR DEBIAN GNU/LINUX
 +
 +When using the official redmine Debian package, the directories mentioned above
@@ -316,6 +324,8 @@ index 0000000..81a1400
 +
 +I<files> will be stored directly in /var/lib/redmine/I<$REDMINE_INSTANCE>/files/
 +
++I<plugin assets> will be stored directly in /var/lib/redmine/I<$REDMINE_INSTANCE>/plugin_assets/
++
 +Users of the Debian package can also find B<redmine-instances> in I<$PATH>,
 +and can call it directly (as root) from any directory.
 +
@@ -538,6 +548,19 @@ index 0000000..0d100f7
 +  end
 +
 +end
+diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb
+index 503c3db..adb2a7c 100644
+--- a/lib/redmine/plugin.rb
++++ b/lib/redmine/plugin.rb
+@@ -47,7 +47,7 @@ module Redmine #:nodoc:
+     self.directory = File.join(Rails.root, 'plugins')
+ 
+     cattr_accessor :public_directory
+-    self.public_directory = File.join(Rails.root, 'public', 'plugin_assets')
++    self.public_directory = File.join(Redmine.root, 'public', 'plugin_assets')
+ 
+     @registered_plugins = {}
+     @used_partials = {}
 diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
 index 9ed8b25..5b745cd 100644
 --- a/lib/redmine/scm/adapters/abstract_adapter.rb

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