Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/apache2/patches/ssl.conf.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Tue, 07 May 2013 12:53:03 -0700
branchs11-update
changeset 2600 9fb5ff186455
parent 714 b205ca9f0d84
child 2223 2bbd29293854
permissions -rw-r--r--
15826054 SUNBT7207160 sample cgi script has wrong perl path
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
714
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
     1
 
--- docs/conf/extra/httpd-ssl.conf.in	Wed Jan  4 12:10:40 2012
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
     2
 
+++ docs/conf/extra/httpd-ssl.conf.in	Mon Feb 27 07:09:48 2012
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
     3
 
@@ -22,11 +22,16 @@
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     4
 
 # Manual for more details.
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     5
 
 #
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     6
 
 #SSLRandomSeed startup file:/dev/random  512
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     7
 
-#SSLRandomSeed startup file:/dev/urandom 512
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     8
 
+SSLRandomSeed startup file:/dev/urandom 512
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     9
 
 #SSLRandomSeed connect file:/dev/random  512
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    10
 
-#SSLRandomSeed connect file:/dev/urandom 512
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    11
 
+SSLRandomSeed connect file:/dev/urandom 512
714
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
    12
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
    13
 
+#
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
    14
 
+# Enable Solaris crypto framework
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
    15
 
+#
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    16
 
+SSLCryptoDevice pkcs11
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    17
714
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
    18
 
+
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    19
 
 #
714
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
    20
 
 # When we also provide SSL we have to listen to the
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
    21
 
 # standard HTTP port (see above) and to the HTTPS port
b205ca9f0d84 7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents: 278
diff changeset 
    22
 
@@ -75,7 +80,7 @@
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    23
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    24
 
 #   General setup for the virtual host
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    25
 
 DocumentRoot "@exp_htdocsdir@"
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    26
 
-ServerName www.example.com:@@SSLPort@@
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    27
 
+ServerName 127.0.0.1:@@SSLPort@@
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    28
 
 ServerAdmin [email protected]
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    29
 
 ErrorLog "@exp_logfiledir@/error_log"
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    30
 
 TransferLog "@exp_logfiledir@/access_log"
upstream/oracle/userland-gate