X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=opac_settings.pl;h=211d1d9bdf40b2ef86188da83f4318111a80f833;hp=4c9f3cb96238017935e72b5c5923803f920d42d9;hb=bbe12ab2cd9badf460eae1116c4f9cb927e2ee03;hpb=0fa1a558d8a86e9996d1c754ffeaab28faa55290

diff --git a/opac_settings.pl b/opac_settings.pl
index 4c9f3cb..211d1d9 100755
--- a/opac_settings.pl
+++ b/opac_settings.pl
@@ -89,7 +89,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 +104,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";