From 5b5f58368216c51015efd47346073a8e21e2962e Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 27 Apr 2004 03:21:36 +0000 Subject: [PATCH] * Prompt for HTTPS port number during setup. We may make this optional. --- webcit/ChangeLog | 4 +++- webcit/setup.c | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 5061f6e6d..c7d21957a 100644 --- 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 1998-12-03 Nathan Bryant * webserver.c: warning fix - diff --git a/webcit/setup.c b/webcit/setup.c index 5d08633b6..6cf1d84ad 100644 --- 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); } -- 2.39.2