r4926 - trunk/src/scripts/debian

[daigle at ecoinformatics.org]

Author: daigle
Date: 2009-04-15 11:13:30 -0700 (Wed, 15 Apr 2009)
New Revision: 4926

Added:
   trunk/src/scripts/debian/knb-ssl
Modified:
   trunk/src/scripts/debian/knb
   trunk/src/scripts/debian/workers.properties
Log:
Add ssl virtualhost.  Change non-ssl to work with ssl.

Modified: trunk/src/scripts/debian/knb
===================================================================
--- trunk/src/scripts/debian/knb	2009-04-15 18:11:59 UTC (rev 4925)
+++ trunk/src/scripts/debian/knb	2009-04-15 18:13:30 UTC (rev 4926)
@@ -1,14 +1,22 @@
-ScriptAlias /knb/cgi-bin/ /usr/share/tomcat5.5/webapps/knb/cgi-bin/
-<Directory "/usr/share/tomcat5.5/webapps/knb/cgi-bin/">
-	AllowOverride All
-	Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-	Order allow,deny
-	Allow from all
-</Directory>
+NameVirtualHost *:80
+<VirtualHost *:80>
+        DocumentRoot /usr/share/tomcat5.5/webapps/knb
+        ServerName <your_hostname_here>
 
-<IfModule mod_jk.c>
-	JkMount /knb ajp13
-	JkMount /knb/* ajp13
-	JkMount /knb/metacat ajp13
-	JkUnMount /knb/cgi-bin/* ajp13
-</IfModule>
+        ScriptAlias /knb/cgi-bin/ /usr/share/tomcat5.5/webapps/knb/cgi-bin/
+        <Directory "/usr/share/tomcat5.5/webapps/knb/cgi-bin/">
+                AllowOverride All
+                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+                Order allow,deny
+                Allow from all
+        </Directory>
+
+        <IfModule mod_jk.c>
+                JkMount /knb ajp13
+                JkMount /knb/* ajp13
+                JkMount /knb/metacat ajp13
+                JkMount /*.jsp ajp13
+                JkUnMount /knb/cgi-bin/* ajp13
+        </IfModule>
+</VirtualHost>
+

Added: trunk/src/scripts/debian/knb-ssl
===================================================================
--- trunk/src/scripts/debian/knb-ssl	                        (rev 0)
+++ trunk/src/scripts/debian/knb-ssl	2009-04-15 18:13:30 UTC (rev 4926)
@@ -0,0 +1,34 @@
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+        DocumentRoot /usr/share/tomcat5.5/webapps/knb
+
+        ScriptAlias /knb/cgi-bin/ /usr/share/tomcat5.5/webapps/knb/cgi-bin/
+        <Directory "/usr/share/tomcat5.5/webapps/knb/cgi-bin/">
+                AllowOverride All
+                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+                Order allow,deny
+                Allow from all
+        </Directory>
+
+        <IfModule mod_jk.c>
+                JkMount /knb ajp13
+                JkMount /knb/* ajp13
+                JkMount /knb/metacat ajp13
+                JkMount /*.jsp ajp13
+                JkUnMount /knb/cgi-bin/* ajp13
+        </IfModule>
+        #   SSL Engine Switch:
+        #   Enable/Disable SSL for this virtual host.
+
+        SSLEngine on
+        #   A self-signed (snakeoil) certificate can be created by installing
+        #   the ssl-cert package. See
+        #   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
+        #   If both key and certificate are stored in the same file, only the
+        #   SSLCertificateFile directive is needed.
+        SSLCertificateFile /etc/ssl/certs/<your_cert_name>.crt
+        SSLCertificateKeyFile /etc/ssl/private/<your_cert_name>.key
+
+</VirtualHost>
+</IfModule>
+        
\ No newline at end of file

Modified: trunk/src/scripts/debian/workers.properties
===================================================================
--- trunk/src/scripts/debian/workers.properties	2009-04-15 18:11:59 UTC (rev 4925)
+++ trunk/src/scripts/debian/workers.properties	2009-04-15 18:13:30 UTC (rev 4926)
@@ -6,5 +6,4 @@
 worker.ajp13.host=localhost
 worker.ajp13.type=ajp13
 worker.ajp13.lbfactor=1
-worker.loadbalancer.type=lb
-worker.loadbalancer.balanced_workers=ajp13
\ No newline at end of file
+worker.loadbalancer.type=lb
\ No newline at end of file