| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Thu, 15 Jan 2015 05:22:17 -0800 | |
| changeset 3648 | 29c40c98aad3 |
| parent 2079 | 46ce7840065c |
| child 3737 | a71f444ba849 |
| permissions | -rw-r--r-- |
|
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
1 |
Patch origin: in-house |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
3 |
|
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
4 |
--- docs/conf/extra/httpd-ssl.conf.in |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
5 |
+++ docs/conf/extra/httpd-ssl.conf.in |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
714
diff
changeset
|
6 |
@@ -24,9 +24,9 @@ |
|
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 |
|
|
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
# |
|
3648
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
18 |
@@ -42,6 +42,10 @@ |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
19 |
## the main server and all SSL-enabled virtual hosts. |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
20 |
## |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
21 |
|
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
22 |
+# Enable FIPS 140 mode, this requires the openssl pkg mediator |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
23 |
+# be set to install the fips-140 version of OpenSSL and mod_ssl. |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
24 |
+#SSLFIPS on |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
25 |
+ |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
26 |
# SSL Cipher Suite: |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
27 |
# List the ciphers that the client is permitted to negotiate. |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
28 |
# See the mod_ssl documentation for a complete list. |
|
29c40c98aad3
PSARC/2015/007 Apache FIPS 140-2 mod_ssl module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2079
diff
changeset
|
29 |
@@ -81,7 +85,7 @@ |
|
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
# General setup for the virtual host |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
DocumentRoot "@exp_htdocsdir@" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
-ServerName www.example.com:@@SSLPort@@ |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
+ServerName 127.0.0.1:@@SSLPort@@ |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
ServerAdmin [email protected] |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
ErrorLog "@exp_logfiledir@/error_log" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
TransferLog "@exp_logfiledir@/access_log" |