| author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
| Tue, 24 Feb 2015 08:21:46 -0800 | |
| changeset 3851 | 340f8dd103eb |
| parent 2223 | 2bbd29293854 |
| child 4052 | dd17ecf751c3 |
| permissions | -rw-r--r-- |
|
2223
2bbd29293854
18764604 Apache should not enable pkcs11 engine by default on T4/T4+ platforms
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
1 |
Patch origin: in-house |
|
2bbd29293854
18764604 Apache should not enable pkcs11 engine by default on T4/T4+ platforms
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
2bbd29293854
18764604 Apache should not enable pkcs11 engine by default on T4/T4+ platforms
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
3 |
|
|
714
b205ca9f0d84
7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
4 |
--- 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
|
5 |
+++ 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
|
6 |
@@ -22,11 +22,16 @@ |
|
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
# Manual for more details. |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
# |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
#SSLRandomSeed startup file:/dev/random 512 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
-#SSLRandomSeed startup file:/dev/urandom 512 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
+SSLRandomSeed startup file:/dev/urandom 512 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
#SSLRandomSeed connect file:/dev/random 512 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
-#SSLRandomSeed connect file:/dev/urandom 512 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+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
|
15 |
|
|
b205ca9f0d84
7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
16 |
+# |
|
2223
2bbd29293854
18764604 Apache should not enable pkcs11 engine by default on T4/T4+ platforms
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
17 |
+# Enable Solaris crypto framework (recommended for T1/T2/T3 based systems) |
|
714
b205ca9f0d84
7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
18 |
+# |
|
2223
2bbd29293854
18764604 Apache should not enable pkcs11 engine by default on T4/T4+ platforms
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
19 |
+#SSLCryptoDevice pkcs11 |
|
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
|
|
714
b205ca9f0d84
7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
21 |
+ |
|
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
# |
|
714
b205ca9f0d84
7149111 Upgrade Apache Web Server to version 2.2.22
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
23 |
# 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
|
24 |
# 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
|
25 |
@@ -75,7 +80,7 @@ |
|
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
# General setup for the virtual host |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
DocumentRoot "@exp_htdocsdir@" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
-ServerName www.example.com:@@SSLPort@@ |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
+ServerName 127.0.0.1:@@SSLPort@@ |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
ServerAdmin [email protected] |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
ErrorLog "@exp_logfiledir@/error_log" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
TransferLog "@exp_logfiledir@/access_log" |