idok-commit AT lists.psi.ch

Subject: Commit emails of the iDok project

List archive

[idok-commit] idok commit r740 - branches/opensource/scripts/admin/test_server

From: "Apache" <apache AT savannah.psi.ch>
To: idok-commit AT lists.psi.ch
Subject: [idok-commit] idok commit r740 - branches/opensource/scripts/admin/test_server
Date: Thu, 14 Feb 2008 16:38:22 +0100
List-archive: <https://lists.web.psi.ch/pipermail/idok-commit/>
List-id: Commit emails of the iDok project <idok-commit.lists.psi.ch>

Author: geus AT PSI.CH
Date: Thu Feb 14 16:38:22 2008
New Revision: 740

Log:
Enabled Apache server side includes on test server

Modified:
branches/opensource/scripts/admin/test_server/setup_test_server_ubuntu.sh

Modified:
branches/opensource/scripts/admin/test_server/setup_test_server_ubuntu.sh
==============================================================================
--- branches/opensource/scripts/admin/test_server/setup_test_server_ubuntu.sh
(original)
+++ branches/opensource/scripts/admin/test_server/setup_test_server_ubuntu.sh
Thu Feb 14 16:38:22 2008
@@ -70,7 +70,7 @@
AllowOverride None
</Directory>
<Directory /var/www/>
- Options Indexes FollowSymLinks MultiViews
+ Options Indexes FollowSymLinks MultiViews +Includes
AllowOverride None
Order allow,deny
allow from all
@@ -83,6 +83,9 @@
Order allow,deny
Allow from all
</Directory>
+
+ AddType text/html .shtml
+ AddOutputFilter INCLUDES .shtml

ErrorLog /var/log/apache2/error.log

@@ -110,14 +113,7 @@
ln -s /etc/apache2/sites-available/idok /etc/apache2/sites-enabled

# Index page
-cat > /var/www/index.html << EOT
-<html>
- <body>
- <h1>iDok test server</h1>
- <p><a href="cgi-bin/qtgui.jnlp">iDok GUI application</a></p>
- </body>
-</html>
-EOT
+cp scripts/admin/test_server/welcome.html /var/www/index.shtml

# CGI script
cp generate_jnlp/generate_jnlp.py /usr/lib/cgi-bin/qtgui.jnlp

[idok-commit] idok commit r740 - branches/opensource/scripts/admin/test_server, Apache, 02/14/2008