Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package redmine

This version includes a documentation update, and changes to
debian/tests/* which add a new DEP-8 test case, but have no impact
whatsoever on the produced binary packages.

The diff against the version currently in testing is attached.

unblock redmine/3.0~20140825-4

-- System Information:
Debian Release: 8.0
  APT prefers buildd-unstable
  APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (500, 'testing'), 
(1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-- 
Antonio Terceiro <terce...@debian.org>
diff --git a/debian/changelog b/debian/changelog
index f36fe0c..6bad6fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+redmine (3.0~20140825-4) unstable; urgency=medium
+
+  * debian/doc/examples/apache2-passenger-alias.conf: updated example
+    configuration for Passenger setups under a sub-uri (e.g. /redmine) so that
+    it actually works.
+  * debian/tests/* also test apache2-passenger-alias case.
+
+ -- Antonio Terceiro <terce...@debian.org>  Fri, 30 Jan 2015 14:04:38 -0200
+
 redmine (3.0~20140825-3) unstable; urgency=medium
 
   * debian/patches/avoid-crash-on-issues.diff: apply upstream patch to avoid
diff --git a/debian/doc/examples/apache2-passenger-alias.conf b/debian/doc/examples/apache2-passenger-alias.conf
index 91b7bab..3911794 100644
--- a/debian/doc/examples/apache2-passenger-alias.conf
+++ b/debian/doc/examples/apache2-passenger-alias.conf
@@ -10,6 +10,10 @@
     # apache2 serves public files
     Alias "/redmine/plugin_assets/" /var/cache/redmine/default/plugin_assets/
     Alias "/redmine" /usr/share/redmine/public
+    <Location /redmine>
+        PassengerBaseURI /redmine
+        PassengerAppRoot /usr/share/redmine
+    </Location>
     <Directory "/usr/share/redmine/public">
         Allow from all
         Options -MultiViews
diff --git a/debian/tests/control b/debian/tests/control
index 1e94396..a0aaddf 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,11 +1,15 @@
-Test-Command: debian/tests/smoke-test sqlite3
+Test-Command: debian/tests/smoke-test sqlite3 apache2-passenger-host /
 Depends: redmine-sqlite, redmine, apache2, libapache2-mod-passenger, curl
 Restrictions: needs-root
 
-Test-Command: debian/tests/smoke-test postgresql
+Test-Command: debian/tests/smoke-test postgresql apache2-passenger-host /
 Depends: postgresql, redmine-pgsql, redmine, apache2, libapache2-mod-passenger, curl
 Restrictions: needs-root
 
-Test-Command: debian/tests/smoke-test mysql2
+Test-Command: debian/tests/smoke-test mysql2 apache2-passenger-host /
 Depends: mysql-server, redmine-mysql, redmine, apache2, libapache2-mod-passenger, curl
 Restrictions: needs-root
+
+Test-Command: debian/tests/smoke-test sqlite3 apache2-passenger-alias /redmine
+Depends: redmine-sqlite, redmine, apache2, libapache2-mod-passenger, curl
+Restrictions: needs-root
diff --git a/debian/tests/smoke-test b/debian/tests/smoke-test
index 1110061..2e9e8e4 100755
--- a/debian/tests/smoke-test
+++ b/debian/tests/smoke-test
@@ -1,30 +1,18 @@
 #!/bin/sh
 
 dbadapter="${1:-sqlite3}"
-webserver="${2:-apache2-passenger}"
+setup="${2:-apache2-passenger-host}"
+uri="${3:-/}"
 
 exec 2>&1
 set -eux
 
 grep "adapter:[[:space:]]*$dbadapter" /etc/redmine/default/database.yml
 
-setup_apache2() {
-  sed -e '/<VirtualHost/ a ServerName localhost' /usr/share/doc/redmine/examples/$webserver-host.conf > /etc/apache2/sites-enabled/redmine.conf
-  service apache2 restart
-}
+a2enmod rewrite
 
-case "$webserver" in
-  apache2)
-    a2enmod rewrite
-    setup_apache2
-    ;;
-  apache2-passenger)
-    setup_apache2
-    ;;
-  *)
-    set +x
-    echo "Testing under $webserver not supported yet"
-    exit 1
-esac
+sed -e '/<VirtualHost/ a ServerName localhost' /usr/share/doc/redmine/examples/${setup}.conf > /etc/apache2/sites-enabled/redmine.conf
 
-curl -s http://localhost/ | grep 'meta.*name="description".*content="Redmine"'
+service apache2 restart
+
+curl -s http://localhost${uri} | grep 'meta.*name="description".*content="Redmine"'

Attachment: signature.asc
Description: Digital signature

Reply via email to