[DRE-commits] [redmine] 20/26: remove breaks-testbed restriction

[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 cf9b40d32b9b4e2f6d0ebe50f63ab21f7332fd19
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Sep 13 23:48:11 2014 -0300

    remove breaks-testbed restriction
---
 debian/tests/control    |  2 +-
 debian/tests/smoke-test | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 0097add..575c50f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Test-Command: debian/tests/smoke-test
 Depends: redmine, redmine-sqlite, apache2, libapache2-mod-passenger, curl
-Restrictions: needs-root, breaks-testbed
+Restrictions: needs-root
diff --git a/debian/tests/smoke-test b/debian/tests/smoke-test
index c0a55d9..bfe5d3a 100755
--- a/debian/tests/smoke-test
+++ b/debian/tests/smoke-test
@@ -3,18 +3,19 @@
 exec 2>&1
 set -e
 
-cat > /etc/apache2/sites-enabled/000-default.conf <<EOF
+cat > /etc/apache2/sites-enabled/redmine.conf <<EOF
 <VirtualHost *:80>
-        RailsEnv production
-        SetEnv X_DEBIAN_SITEID "default"
-        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>
+  ServerName localhost
+  RailsEnv production
+  SetEnv X_DEBIAN_SITEID "default"
+  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>
   ErrorLog /var/log/apache2/redmine.error.log
   CustomLog ${APACHE_LOG_DIR}/redmine.access.log vhost_combined
 </VirtualHost>

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