#include "webserver.h"
-#ifdef HAVE_NEWT
-#include <newt.h>
-#endif
-
-
#define UI_TEXT 0 /* Default setup type -- text only */
#define UI_DIALOG 2 /* Use the 'dialog' program */
#define UI_SILENT 3 /* Silent running, for use in scripts */
-#define UI_NEWT 4 /* Use the "newt" window library */
int setup_type;
char setup_directory[SIZ];
extract_token(prog, buf, 3, ':', sizeof prog); /* includes 0x0a LF */
if (!strcmp(entry, which_entry)) {
- buf[0] = 0; /* delete it */
+ strcpy(state, "off"); /* disable it */
}
}
void cleanup(int exitcode)
{
-#ifdef HAVE_NEWT
- newtCls();
- newtRefresh();
- newtFinished();
-#endif
exit(exitcode);
}
int yesno(char *question)
{
-#ifdef HAVE_NEWT
- newtComponent form = NULL;
- newtComponent yesbutton = NULL;
- newtComponent nobutton = NULL;
-#endif
int i = 0;
int answer = 0;
char buf[SIZ];
}
break;
-#ifdef HAVE_NEWT
- case UI_NEWT:
- newtCenteredWindow(76, 10, "Question");
- form = newtForm(NULL, NULL, 0);
- for (i=0; i<num_tokens(question, '\n'); ++i) {
- extract_token(buf, question, i, '\n', sizeof buf);
- newtFormAddComponent(form, newtLabel(1, 1+i, buf));
- }
- yesbutton = newtButton(10, 5, "Yes");
- nobutton = newtButton(60, 5, "No");
- newtFormAddComponent(form, yesbutton);
- newtFormAddComponent(form, nobutton);
- if (newtRunForm(form) == yesbutton) {
- answer = 1;
- }
- else {
- answer = 0;
- }
- newtPopWindow();
- newtFormDestroy(form);
-
- break;
-#endif
-
}
return (answer);
}
void set_value(char *prompt, char str[])
{
-#ifdef HAVE_NEWT
- newtComponent form;
- char *result;
- int i;
-#endif
char buf[SIZ];
char dialog_result[PATH_MAX];
char setupmsg[SIZ];
}
break;
-#ifdef HAVE_NEWT
- case UI_NEWT:
-
- newtCenteredWindow(76, 10, "WebCit setup");
- form = newtForm(NULL, NULL, 0);
- for (i=0; i<num_tokens(prompt, '\n'); ++i) {
- extract_token(buf, prompt, i, '\n', sizeof buf);
- newtFormAddComponent(form, newtLabel(1, 1+i, buf));
- }
- newtFormAddComponent(form, newtEntry(1, 8, str, 74, (const char **) &result,
- NEWT_FLAG_RETURNEXIT));
- newtRunForm(form);
- strcpy(str, result);
-
- newtPopWindow();
- newtFormDestroy(form);
-
-#endif
}
}
void important_message(char *title, char *msgtext)
{
-#ifdef HAVE_NEWT
- newtComponent form = NULL;
- int i = 0;
-#endif
char buf[SIZ];
switch (setup_type) {
msgtext);
system(buf);
break;
-
-#ifdef HAVE_NEWT
- case UI_NEWT:
- newtCenteredWindow(76, 10, title);
- form = newtForm(NULL, NULL, 0);
- for (i=0; i<num_tokens(msgtext, '\n'); ++i) {
- extract_token(buf, msgtext, i, '\n', sizeof buf);
- newtFormAddComponent(form, newtLabel(1, 1+i, buf));
- }
- newtFormAddComponent(form, newtButton(35, 5, "OK"));
- newtRunForm(form);
- newtPopWindow();
- newtFormDestroy(form);
- break;
-#endif
-
}
}
void progress(char *text, long int curr, long int cmax)
{
-#ifdef HAVE_NEWT
-
- /* These variables are static because progress() gets called
- * multiple times during the course of whatever operation is
- * being performed. This makes setup non-threadsafe, but who
- * cares?
- */
- static newtComponent form = NULL;
- static newtComponent scale = NULL;
-#endif
static long dots_printed = 0L;
long a = 0;
char buf[SIZ];
}
}
break;
-
-#ifdef HAVE_NEWT
- case UI_NEWT:
- if (curr == 0) {
- newtCenteredWindow(76, 8, text);
- form = newtForm(NULL, NULL, 0);
- scale = newtScale(1, 3, 74, cmax);
- newtFormAddComponent(form, scale);
- newtDrawForm(form);
- newtRefresh();
- }
- if ((curr > 0) && (curr <= cmax)) {
- newtScaleSet(scale, curr);
- newtRefresh();
- }
- if (curr == cmax) {
- newtFormDestroy(form);
- newtPopWindow();
- newtRefresh();
- }
- break;
-#endif
-
}
}
"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(http_port, "80");
+ sprintf(http_port, "2000");
set_value(question, http_port);
uname(&my_utsname);
sprintf(suggested_url, "http://%s:%s/", my_utsname.nodename, http_port);
fprintf(fp, "CTDL_HOSTNAME=%s\n", hostname);
fprintf(fp, "CTDL_PORTNAME=%s\n", portname);
fprintf(fp, "\n"
- "test -x $WEBCIT_DIR/ctdlsvc || exit 0\n"
"test -d /var/run || exit 0\n"
"\n"
"case \"$1\" in\n"
"\n"
"start) echo -n \"Starting WebCit... \"\n"
- " if $WEBCIT_DIR/ctdlsvc /var/run/webcit.pid "
- "$WEBCIT_DIR/webserver "
+ " if $WEBCIT_DIR/webserver "
+ "-d/var/run/webcit.pid "
"-t/dev/null "
"-p$HTTP_PORT $CTDL_HOSTNAME $CTDL_PORTNAME\n"
" then\n"
" fi\n");
#ifdef HAVE_OPENSSL
fprintf(fp, " echo -n \"Starting WebCit SSL... \"\n"
- " if $WEBCIT_DIR/ctdlsvc /var/run/webcit-ssl.pid "
- "$WEBCIT_DIR/webserver "
+ " if $WEBCIT_DIR/webserver "
+ "-d/var/run/webcit-ssl.pid "
"-t/dev/null "
"-s -p$HTTPS_PORT $CTDL_HOSTNAME $CTDL_PORTNAME\n"
" then\n"
" rm -f /var/run/webcit-ssl.pid 2>/dev/null\n");
#endif
fprintf(fp, " ;;\n"
- "*) echo \"Usage: $0 {start|stop}\"\n"
+ "restart) $0 stop\n"
+ " $0 start\n"
+ " ;;\n"
+ "*) echo \"Usage: $0 {start|stop|restart}\"\n"
" exit 1\n"
" ;;\n"
"esac\n"
return UI_DIALOG;
}
-#ifdef HAVE_NEWT
- newtInit();
- newtCls();
- newtDrawRootText(0, 0, "WebCit Setup");
- return UI_NEWT;
-#endif
return UI_TEXT;
}
install_init_scripts();
if (!access("/etc/init.d/webcit", X_OK)) {
- for (a=0; a<=2; ++a) {
- progress("Restarting the WebCit service...", a, 3);
- if (a == 0) system("/etc/init.d/webcit stop >/dev/null 2>&1");
- if (a == 1) system("/etc/init.d/webcit start >/dev/null 2>&1");
- sleep(1);
- }
+ system("/etc/init.d/webcit stop");
+ system("/etc/init.d/webcit start");
}
sprintf(aaa,
projects / citadel.git / blobdiff