summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2014-12-05 17:25:43 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2014-12-05 17:25:43 +0000
commit56138cae8a450dba961b759d4945ad7638708110 (patch)
tree7acd5086b49495d49effd5a0a1c822417ab0bf08 /conf
parent765bf3beb5f7fcfa17292d1c62ad6d78e401b69b (diff)
downloadcups-56138cae8a450dba961b759d4945ad7638708110.tar.gz
The cups-files.conf file contained the old ServerCertificate/Key directives
instead of ServerKeychain. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12289 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
-rw-r--r--conf/cups-files.conf.in7
1 files changed, 2 insertions, 5 deletions
diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 71683a654..4a78ba615 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -75,11 +75,8 @@ PageLog @CUPS_LOGDIR@/page_log
# Location of helper programs...
#ServerBin @CUPS_SERVERBIN@
-# SSL/TLS certificate for the scheduler...
-#ServerCertificate @CUPS_SERVERCERT@
-
-# SSL/TLS private key for the scheduler...
-#ServerKey @CUPS_SERVERKEY@
+# SSL/TLS keychain for the scheduler...
+#ServerKeychain @CUPS_SERVERKEYCHAIN@
# Location of other configuration files...
#ServerRoot @CUPS_SERVERROOT@