[DRE-commits] [redmine] 02/08: Documentation update

Antonio Terceiro terceiro at moszumanska.debian.org
Tue Sep 30 21:39:49 UTC 2014


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

terceiro pushed a commit to branch master
in repository redmine.

commit 7c16fdef70026614353d22d23e355ad04f7f6f32
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Sep 21 12:09:51 2014 -0300

    Documentation update
---
 debian/NEWS                                      |  8 ++++
 debian/README.Debian                             | 43 --------------------
 debian/changelog                                 |  4 ++
 debian/doc/examples/apache2-passenger-alias.conf | 11 +++---
 debian/doc/examples/apache2-passenger-host.conf  | 50 ++++++++----------------
 5 files changed, 35 insertions(+), 81 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 5534f05..45c8dd3 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,11 @@
+redmine (3.0~20140825-1) unstable; urgency=medium
+
+  Running redmine as an unprivileged user re-using the system-wide
+  installation as a base (as previously documented in README.Debian) is not
+  supported anymore.
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sun, 21 Sep 2014 11:23:53 -0300
+
 redmine (2.1.4+dfsg2-2) experimental; urgency=low
 
   An old secret session keys has to be replaced due incompatible changes
diff --git a/debian/README.Debian b/debian/README.Debian
index 8593674..24e8612 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -94,49 +94,6 @@ Relaxing those permissions is discouraged. Please think twice before doing so.
 If one really need to run redmine as another user, please read what follows.
 
 
-MANUAL INSTALL / RUNNING AS UNPRIVILEGED USER WITHOUT COPYING /usr/share/redmine
---------------------------------------------------------------------------------
-
-Why : redmine package upgrades will benefit to all redmine instances, although
-calling manually rake db:migrate on each package upgrade is still necessary.
-Besides support for X_DEBIAN_SITEID, several environment variables are available :
-
-* RAILS_ETC (where database.yml, configuration.yml are supposed to be)
-* RAILS_LOG (the log files)
-* RAILS_VAR (contains the files/ directory)
-* RAILS_CACHE (cached data)
-* RAILS_ENV
-
-That way, one can install redmine as a user foo :
-
-1. First create some directories in e.g. /home/foo/redmine : config, files, tmp, log
-
-2. In a terminal, declare those environment variables :
-    mydir=/home/dev/test/redmine
-    export RAILS_ETC=$mydir/config
-    export RAILS_LOG=$mydir/log
-    export RAILS_VAR=$mydir
-    export RAILS_CACHE=$mydir/tmp
-    export RAILS_ENV=production
-    export X_DEBIAN_SITEID=myinstance
-
-3. Copy /usr/share/redmine/templates/database.yml.template to $mydir/config/database.yml
-and adapt it to your needs; for a quick setup it's easier to use the sqlite template,
-located in the same dir.
-
-4. Link /usr/share/redmine/db to $mydir/db :
-    ln -s /usr/share/redmine/db $mydir/db
-
-5. Then "install" redmine :
-    rake -f /usr/share/redmine/Rakefile generate_session_store
-    rake -f /usr/share/redmine/Rakefile db:migrate
-    rake -f /usr/share/redmine/Rakefile redmine:load_default_data
-    rake -f /usr/share/redmine/Rakefile db:migrate_plugins
-
-6. Run redmine using e.g. webrick and point your browser to localhost:3000
-    ruby /usr/share/redmine/script/server webrick -e production
- 
-
 MANUAL EMAIL CONFIGURATION
 --------------------------
 
diff --git a/debian/changelog b/debian/changelog
index 6058129..cc2256d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,10 @@ redmine (3.0~20140825-1) UNRELEASED; urgency=medium
     expectations; some of them are too strict
   * Add smoke test as autopkgtest test suite.
   * redmine-mysql: use ruby-mysql2 instead of ruby-mysql
+  * Updated documentation:
+    - running as unprivileged user sharing the system-wide install is not
+      really supported anymore. Added a note in NEWS.
+    - updated apache2-passenger setup instructions
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 25 Aug 2014 21:04:18 -0300
 
diff --git a/debian/doc/examples/apache2-passenger-alias.conf b/debian/doc/examples/apache2-passenger-alias.conf
index cde0aad..91b7bab 100644
--- a/debian/doc/examples/apache2-passenger-alias.conf
+++ b/debian/doc/examples/apache2-passenger-alias.conf
@@ -1,17 +1,18 @@
-# These modules must be enabled : passenger
-# Configuration for http://localhost/redmine
-<VirtualHost localhost>
+# The passenger module (from the libapache2-mod-passenger package) must be
+# enabled
+<VirtualHost *:80>
     # ServerName my.domain.name
     # this is the passenger config
     RailsEnv production
     SetEnv X_DEBIAN_SITEID "default"
     SetEnv RAILS_RELATIVE_URL_ROOT "/redmine"
+    PassengerDefaultUser www-data
     # apache2 serves public files
-    DocumentRoot /usr/share/redmine/public
     Alias "/redmine/plugin_assets/" /var/cache/redmine/default/plugin_assets/
     Alias "/redmine" /usr/share/redmine/public
     <Directory "/usr/share/redmine/public">
-        Order allow,deny
         Allow from all
+        Options -MultiViews
+        Require all granted
     </Directory>
 </VirtualHost>
diff --git a/debian/doc/examples/apache2-passenger-host.conf b/debian/doc/examples/apache2-passenger-host.conf
index 2964df3..fb86e92 100644
--- a/debian/doc/examples/apache2-passenger-host.conf
+++ b/debian/doc/examples/apache2-passenger-host.conf
@@ -1,34 +1,18 @@
-# These modules must be enabled : passenger
-# Configuration for multiple vhosts http://localhost:3000/ and http://localhost:3030/
-# listen the port...
-Listen 3000
-<VirtualHost localhost:3000>
-        # ServerName my.domain.name
-        # this is the passenger config
-        RailsEnv production
-        # create a link in /var/lib/redmine/default/passenger to /usr/share/redmine
-        PassengerAppRoot /var/lib/redmine/default/passenger
-        SetEnv X_DEBIAN_SITEID "default"
-        Alias "/plugin_assets/" /var/cache/redmine/default/plugin_assets/
-        DocumentRoot /usr/share/redmine/public
-        <Directory "/usr/share/redmine/public">
-                Order allow,deny
-                Allow from all
-        </Directory>
-</VirtualHost>
-
-Listen 3030
-<VirtualHost localhost:3030>
-        # ServerName my.domain.name
-        # this is the passenger config
-        RailsEnv production
-        # create a link in /var/lib/redmine/instance2/passenger to /usr/share/redmine
-        PassengerAppRoot /var/lib/redmine/instance2/passenger
-        SetEnv X_DEBIAN_SITEID "instance2"
-        Alias "/plugin_assets/" /var/cache/redmine/instance2/plugin_assets/
-        DocumentRoot /usr/share/redmine/public
-        <Directory "/usr/share/redmine/public">
-                Order allow,deny
-                Allow from all
-        </Directory>
+# The passenger module (from the libapache2-mod-passenger package) must be
+# enabled
+<VirtualHost *:80>
+    # ServerName my.domain.name
+    # this is the passenger config
+    RailsEnv production
+    SetEnv X_DEBIAN_SITEID "default"
+    # create a link in /var/lib/redmine/default/passenger to /usr/share/redmine
+    PassengerAppRoot /var/lib/redmine/default/passenger
+    PassengerDefaultUser www-data
+    Alias "/plugin_assets/" /var/cache/redmine/default/plugin_assets/
+    DocumentRoot /usr/share/redmine/public
+    <Directory "/usr/share/redmine/public">
+        Allow from all
+        Options -MultiViews
+        Require all granted
+    </Directory>
 </VirtualHost>

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



More information about the Pkg-ruby-extras-commits mailing list