* Prompt for HTTPS port number during setup. We may make this optional.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 5061f6e6d1b552a31ae5a94ccd4cdf2985b3f023..c7d21957a83c74d9cd7c8102062803a1327aef0b 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 506.12  2004/04/27 03:21:36  ajc
+* Prompt for HTTPS port number during setup.  We may make this optional.
+
 Revision 506.11  2004/04/27 03:16:31  ajc
 * When running on the same host as Citadel, if no key/cert are found,
   symlink to Citadel's if possible.
@@ -1799,4 +1802,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/setup.c b/webcit/setup.c
index 5d08633b66b21cd9ecd23db0c8fa7f50b7b43258..6cf1d84ade608da291b132f47a8e2a8d691b208d 100644 (file)
--- a/webcit/setup.c
+++ b/webcit/setup.c
@@ -386,7 +386,8 @@ void check_inittab_entry(void)
        char looking_for[SIZ];
        char question[SIZ];
        char entryname[5];
-       char listenport[128];
+       char http_port[128];
+       char https_port[128];
        char hostname[128];
        char portname[128];
 
@@ -411,8 +412,16 @@ void check_inittab_entry(void)
                "requests?\n\nYou can use the standard port (80) if you are "
                "not running another\nweb server (such as Apache), otherwise "
                "select another port.");
-       sprintf(listenport, "2000");
-       set_value(question, listenport);
+       sprintf(http_port, "2000");
+       set_value(question, http_port);
+
+       snprintf(question, sizeof question,
+               "On which port do you want WebCit to listen for HTTPS "
+               "requests?\n\nYou can use the standard port (443) if you are "
+               "not running another\nweb server (such as Apache), otherwise "
+               "select another port.");
+       sprintf(https_port, "443");
+       set_value(question, https_port);
 
        /* Find out where Citadel is. */
        if ( (using_web_installer) && (getenv("CITADEL") != NULL) ) {
@@ -460,9 +469,9 @@ void check_inittab_entry(void)
                display_error(strerror(errno));
        } else {
                fprintf(infp, "# Start the WebCit server...\n");
-               fprintf(infp, "%s:2345:respawn:%s -p%s %s %s\n",
+               fprintf(infp, "%s:2345:respawn:%s -p%s -s%s %s %s\n",
                        entryname, looking_for,
-                       listenport, hostname, portname);
+                       http_port, https_port, hostname, portname);
                fclose(infp);
                strcpy(init_entry, entryname);
        }