removed unncessary schema declared on column and fixed issue where value needed was...

[migration-tools.git] / opac_settings.pl

diff --git a/opac_settings.pl b/opac_settings.pl
index 4c9f3cb..38a537d 100755 (executable)
--- a/opac_settings.pl
+++ b/opac_settings.pl
@@ -1,5 +1,21 @@
 #!/usr/bin/perl
 
+# Copyright 2009-2012, Equinox Software, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 # USAGE: ./opac_settings.pl --bootstrap /openils/conf/opensrf_core.xml --schema m_sage
 # Produces output that can be pasted into /etc/apache2/sites-available/eg.conf
 
@@ -89,7 +105,7 @@ for my $ou_id ( @$ous ) {
   print "  DirectoryIndex index.xml index.html index.xhtml\n";
   print "  RedirectMatch ^/\$ http://$s{'opac.server_name'}/opac/en-US/skin/$s{'opac.directory'}/xml/index.xml?ol=$ou_id\n";
   print "  RedirectMatch default/css/colors.css\$ http://$s{'opac.server_name'}/opac/theme/$s{'opac.directory'}/css/colors.css\n";
-  print "  RedirectMatch /favicon.ico\$ http://$s{'opac.server_name'}/opac/images/$s{'opac.directory'}/favicon.ico\n";
+  print "  RedirectMatch ^/favicon.ico\$ http://$s{'opac.server_name'}/opac/images/$s{'opac.directory'}/favicon.ico\n";
   print "  RedirectMatch images/main_logo.jpg\$ http://$s{'opac.server_name'}/opac/images/$s{'opac.directory'}/main_logo.jpg\n";
   print "  RedirectMatch images/small_logo.jpg\$ http://$s{'opac.server_name'}/opac/images/$s{'opac.directory'}/small_logo.jpg\n";
   print "  RedirectMatch en-US/extras/slimpac/(start|advanced).html http://$s{'opac.server_name'}/opac/en-US/extras/slimpac/\$1.html\n";
@@ -104,16 +120,15 @@ for my $ou_id ( @$ous ) {
   print "  DirectoryIndex index.xml index.html index.xhtml\n";
   print "  RedirectMatch ^/\$ https://$s{'opac.server_name'}/opac/en-US/skin/$s{'opac.directory'}/xml/index.xml?ol=$ou_id\n";
   print "  RedirectMatch default/css/colors.css\$ https://$s{'opac.server_name'}/opac/theme/$s{'opac.directory'}/css/colors.css\n";
-  print "  RedirectMatch /favicon.ico\$ https://$s{'opac.server_name'}/opac/images/$s{'opac.directory'}/favicon.ico\n";
+  print "  RedirectMatch ^/favicon.ico\$ https://$s{'opac.server_name'}/opac/images/$s{'opac.directory'}/favicon.ico\n";
   print "  RedirectMatch images/main_logo.jpg\$ https://$s{'opac.server_name'}/opac/images/$s{'opac.directory'}/main_logo.jpg\n";
   print "  RedirectMatch images/small_logo.jpg\$ https://$s{'opac.server_name'}/opac/images/$s{'opac.directory'}/small_logo.jpg\n";
   print "  RedirectMatch en-US/extras/slimpac/(start|advanced).html https://$s{'opac.server_name'}/opac/en-US/extras/slimpac/\$1.html\n";
-  print "  GnuTLSEnable on\n";
-  print "  GnuTLSPriorities NORMAL\n";
-  print "  GnuTLSExportCertificates on\n";
-  print "  GnuTLSCacheTimeout 500\n";
-  print "  GnuTLSCertificateFile $s{'opac.ssl_cert'}\n";
-  print "  GnuTLSKeyFile $s{'opac.ssl_key'}\n";
+  print "  SSLEngine on\n";
+  print "  SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL\n";
+  print "  SSLCertificateFile $s{'opac.ssl_cert'}\n";
+  print "  SSLCertificateKeyFile $s{'opac.ssl_key'}\n";
+  print "  SSLCertificateChainFile ssl/gd_bundle.crt\n";
   print "  Include eg_vhost.conf\n";
   print "  BrowserMatch \".*MSIE.*\" \\\n";
   print "    nokeepalive ssl-unclean-shutdown \\\n";