|
 |
49b7d4 |
From bc24e3c0a438a2b6f177227b3340b516c15292a8 Mon Sep 17 00:00:00 2001
|
|
|
49b7d4 |
From: Rob Crittenden <rcritten@redhat.com>
|
|
|
49b7d4 |
Date: Thu, 20 Feb 2014 17:21:41 -0500
|
|
|
49b7d4 |
Subject: [PATCH] Configure nss.conf.in to match Fedora filesystem layout
|
|
|
49b7d4 |
|
|
|
49b7d4 |
---
|
|
|
49b7d4 |
nss.conf.in | 18 ++++++++++--------
|
|
|
49b7d4 |
1 file changed, 10 insertions(+), 8 deletions(-)
|
|
|
49b7d4 |
|
|
|
49b7d4 |
diff --git a/nss.conf.in b/nss.conf.in
|
|
|
49b7d4 |
index c941ecf..349a810 100644
|
|
|
49b7d4 |
--- a/nss.conf.in
|
|
|
49b7d4 |
+++ b/nss.conf.in
|
|
|
49b7d4 |
@@ -8,14 +8,16 @@
|
|
|
49b7d4 |
# consult the online docs. You have been warned.
|
|
|
49b7d4 |
#
|
|
|
49b7d4 |
|
|
|
49b7d4 |
+LoadModule nss_module modules/libmodnss.so
|
|
|
49b7d4 |
+
|
|
|
49b7d4 |
#
|
|
|
49b7d4 |
# When we also provide SSL we have to listen to the
|
|
|
49b7d4 |
# standard HTTP port (see above) and to the HTTPS port
|
|
|
49b7d4 |
#
|
|
|
49b7d4 |
# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
|
|
|
49b7d4 |
-# Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
|
|
|
49b7d4 |
+# Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:443"
|
|
|
49b7d4 |
#
|
|
|
49b7d4 |
-Listen 443
|
|
|
49b7d4 |
+Listen 8443
|
|
|
49b7d4 |
|
|
|
49b7d4 |
##
|
|
|
49b7d4 |
## SSL Global Context
|
|
|
49b7d4 |
@@ -79,17 +81,17 @@ NSSRequireSafeNegotiation off
|
|
|
49b7d4 |
## SSL Virtual Host Context
|
|
|
49b7d4 |
##
|
|
|
49b7d4 |
|
|
|
49b7d4 |
-<VirtualHost _default_:443>
|
|
|
49b7d4 |
+<VirtualHost _default_:8443>
|
|
|
49b7d4 |
|
|
|
49b7d4 |
# General setup for the virtual host
|
|
|
49b7d4 |
#DocumentRoot "@apache_prefix@/htdocs"
|
|
|
49b7d4 |
-#ServerName www.example.com:443
|
|
|
49b7d4 |
+#ServerName www.example.com:8443
|
|
|
49b7d4 |
#ServerAdmin you@example.com
|
|
|
49b7d4 |
|
|
|
49b7d4 |
# mod_nss can log to separate log files, you can choose to do that if you'd like
|
|
|
49b7d4 |
# LogLevel is not inherited from httpd.conf.
|
|
|
49b7d4 |
-#ErrorLog @apache_prefix@/logs/error_log
|
|
|
49b7d4 |
-#TransferLog @apache_prefix@/logs/access_log
|
|
|
49b7d4 |
+ErrorLog @apache_prefix@/logs/error_log
|
|
|
49b7d4 |
+TransferLog @apache_prefix@/logs/access_log
|
|
|
49b7d4 |
LogLevel warn
|
|
|
49b7d4 |
|
|
|
49b7d4 |
# SSL Engine Switch:
|
|
|
49b7d4 |
@@ -133,7 +135,7 @@ NSSNickname Server-Cert
|
|
|
49b7d4 |
# The NSS security database directory that holds the certificates and
|
|
|
49b7d4 |
# keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
|
|
|
49b7d4 |
# Provide the directory that these files exist.
|
|
|
49b7d4 |
-NSSCertificateDatabase @apache_conf@
|
|
|
49b7d4 |
+NSSCertificateDatabase /etc/httpd/alias
|
|
|
49b7d4 |
|
|
|
49b7d4 |
# Database Prefix:
|
|
|
49b7d4 |
# In order to be able to store multiple NSS databases in one directory
|
|
|
49b7d4 |
@@ -209,7 +211,7 @@ NSSCertificateDatabase @apache_conf@
|
|
|
49b7d4 |
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
|
|
|
49b7d4 |
NSSOptions +StdEnvVars
|
|
|
49b7d4 |
</Files>
|
|
|
49b7d4 |
-<Directory "@apache_prefix@/cgi-bin">
|
|
|
49b7d4 |
+<Directory "/var/www/cgi-bin">
|
|
|
49b7d4 |
NSSOptions +StdEnvVars
|
|
|
49b7d4 |
</Directory>
|
|
|
49b7d4 |
|
|
|
49b7d4 |
--
|
|
|
49b7d4 |
1.7.11.7
|
|
|
49b7d4 |
|