Skip to content

Commit

Permalink
Item12952: merge related wizards into a smaller number of files
Browse files Browse the repository at this point in the history
  • Loading branch information
crawford committed Sep 24, 2014
1 parent dd0b86d commit 77fe999
Show file tree
Hide file tree
Showing 8 changed files with 794 additions and 384 deletions.
12 changes: 6 additions & 6 deletions core/lib/Foswiki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -1807,18 +1807,18 @@ $Foswiki::cfg{WebMasterEmail} = '';
# FEEDBACK="label='Generate S/MIME Certificate';span=2; \
# title='Generate a self-signed certficate for the WebMaster. \
# This allows immediate use of signed email.'; \
# wizard='GenerateSMIMECertificate'; method='generate_cert'"\
# wizard='SMIMECertificate'; method='generate_cert'"\
# FEEDBACK="label='Generate S/MIME CSR';col=1;\
# title='Generate a Certificate Signing Request for the \
# WebMaster. This request must be signed by a \
# Certificate Authority to create a certificate, \
# then installed.';\
# wizard='GenerateCSR'; method='request_cert'"\
# wizard='SMIMECertificate'; method='request_cert'"\
# FEEDBACK="label='Cancel CSR';\
# title='Cancel a pending Certificate Signing request. \
# This destroys the private key associated with \
# the request.';\
# wizard='CancelSMIMECertificate'; method='cancel_cert'"\
# wizard='SMIMECertificate'; method='cancel_cert'"\
# **
# Wiki administrator's name address.
# For use in mails (first name and last name, for example =Fred Smith=).
Expand Down Expand Up @@ -2003,7 +2003,7 @@ $Foswiki::cfg{SMTP}{SENDERHOST} = '';
$Foswiki::cfg{Email}{SSLVerifyServer} = $FALSE;

# **PATH EXPERT \
# FEEDBACK="label='Guess certificate locations'; wizard='GuessSSLCaLocations'; method='guess'"\
# FEEDBACK="label='Guess certificate locations'; wizard='SSLCertificates'; method='guess_locations'"\
# DISPLAY_IF="{EnableEmail} && /^Net::SMTP/.test({Email}{MailMethod}) && {Email}{SSLVerifyServer}"**
# Specify the file used to verify the server certificate trust chain.
# This is the list of root Certificate authorities that you trust to issue
Expand All @@ -2013,8 +2013,8 @@ $Foswiki::cfg{Email}{SSLVerifyServer} = $FALSE;
$Foswiki::cfg{Email}{SSLCaFile} = '';

# **PATH EXPERT \
# FEEDBACK="label='Guess certificate locations'; wizard='GuessSSLCaLocations'; method='guess'"\
# FEEDBACK='label="Validate Contents"; wizard="ValidateCertificates"; method="validate";\
# FEEDBACK="label='Guess certificate locations'; wizard='SSLCertificates'; method='guess_locations'"\
# FEEDBACK='label="Validate Contents"; wizard="SSLCertificates"; method="validate";\
# title="Examines every file in the directory and verifies \
# that the contents look like certificates/and/or CRLs"' \
# DISPLAY_IF="{EnableEmail} && /^Net::SMTP/.test({Email}{MailMethod}) && {Email}{SSLVerifyServer}"**
Expand Down
69 changes: 0 additions & 69 deletions core/lib/Foswiki/Configure/Wizards/CancelSMIMECertificate.pm

This file was deleted.

53 changes: 0 additions & 53 deletions core/lib/Foswiki/Configure/Wizards/GenerateCSR.pm

This file was deleted.

79 changes: 0 additions & 79 deletions core/lib/Foswiki/Configure/Wizards/GuessSSLCaLocations.pm

This file was deleted.

114 changes: 0 additions & 114 deletions core/lib/Foswiki/Configure/Wizards/InstallCertificate.pm

This file was deleted.

Loading

0 comments on commit 77fe999

Please sign in to comment.