* for migration make install wil create a symlink.
# End of configuration section
-all: all-progs-recursive webserver setup
+all: all-progs-recursive webcit setup
.SUFFIXES: .cpp .c .o
clean:
- rm -f *.o webcit webserver setup
+ rm -f *.o webcit webcit setup
rm -fr locale/*
distclean: clean
$(CC) setup.o \
$(LIBOBJS) $(LIBS) $(LDFLAGS) $(SETUP_LIBS) -o setup
-webserver: webserver.o context_loop.o ical_dezonify.o \
+webcit: webserver.o context_loop.o ical_dezonify.o \
cookie_conversion.o locate_host.o floors.o summary.o \
webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \
roomops.o messages.o userlist.o paging.o sysmsgs.o useredit.o \
groupdav_options.o autocompletion.o tabs.o smtpqueue.o sieve.o \
groupdav_put.o http_datestring.o setup_wizard.o fmt_date.o \
gettext.o downloads.o addressbook_popup.o pushemail.o sysdep.o \
- $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
+ $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webcit
.c.o:
$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
install-bin:
test -d $(DESTDIR)$(prefix) || mkdir -p $(DESTDIR)$(prefix)
- $(INSTALL) webserver $(DESTDIR)$(prefix)/webserver
+ $(INSTALL) webcit $(DESTDIR)$(prefix)/webcit
+ if test -f $(DESTDIR)$(prefix)/webserver; then \
+ rm -f $(DESTDIR)$(prefix)/webserver; \
+ ln -s $(DESTDIR)$(prefix)/webcit $(DESTDIR)$(prefix)/webserver; \
+ fi
install-setupbin: install-bin
may skip the setup program. Instead, open /etc/inittab and add an entry
something like this:
- wc:2345:respawn:/usr/local/webcit/webserver
+ wc:2345:respawn:/usr/local/webcit/webcit
Several command-line options are also available. Here's the usage for
-the "webserver" program:
+the "webcit" program:
- webserver [-i ip_addr] [-p http_port] [-s] [-t tracefile]
+ webcit [-i ip_addr] [-p http_port] [-s] [-t tracefile]
[-c] [-f] [remotehost [remoteport]]
*or*
- webserver [-i ip_addr] [-p http_port] [-s] [-t tracefile]
+ webcit [-i ip_addr] [-p http_port] [-s] [-t tracefile]
[-c] [-f] uds /your/citadel/directory
Explained:
RUNDIR=/var/run/webcit
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Citadel Groupware Webserver "
-NAME=webserver
+NAME=webcit
DAEMON=/usr/sbin/$NAME
DAEMON_ARGS=""
PIDFILE=$RUNDIR/$NAME.pid
strcpy(init_entry, "");
- /* Determine the fully qualified path name of webserver */
- snprintf(looking_for, sizeof looking_for, "%s/webserver ", setup_directory);
+ /* Determine the fully qualified path name of webcit */
+ snprintf(looking_for, sizeof looking_for, "%s/webcit ", setup_directory);
/* Pound through /etc/inittab line by line. Set have_entry to 1 if
- * an entry is found which we believe starts webserver.
+ * an entry is found which we believe starts webcit.
*/
infp = fopen("/etc/inittab", "r");
if (infp == NULL) {
"case \"$1\" in\n"
"\n"
"start) echo -n \"Starting WebCit... \"\n"
- " if $WEBCIT_DIR/webserver "
+ " if $WEBCIT_DIR/webcit "
"-D/var/run/webcit.pid "
"-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/webserver "
+ " if $WEBCIT_DIR/webcit "
"-D/var/run/webcit-ssl.pid "
"-s -p$HTTPS_PORT $CTDL_HOSTNAME $CTDL_PORTNAME\n"
" then\n"
i = unlink(sockpath);
if (i != 0) if (errno != ENOENT) {
- lprintf(1, "webserver: can't unlink %s: %s\n",
+ lprintf(1, "webcit: can't unlink %s: %s\n",
sockpath, strerror(errno));
exit(WC_EXIT_BIND);
}
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- lprintf(1, "webserver: Can't create a socket: %s\n",
+ lprintf(1, "webcit: Can't create a socket: %s\n",
strerror(errno));
exit(WC_EXIT_BIND);
}
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- lprintf(1, "webserver: Can't bind: %s\n",
+ lprintf(1, "webcit: Can't bind: %s\n",
strerror(errno));
exit(WC_EXIT_BIND);
}
if (listen(s, actual_queue_len) < 0) {
- lprintf(1, "webserver: Can't listen: %s\n",
+ lprintf(1, "webcit: Can't listen: %s\n",
strerror(errno));
exit(WC_EXIT_BIND);
}
is_https = 1;
break;
default:
- fprintf(stderr, "usage: webserver "
+ fprintf(stderr, "usage: webcit "
"[-i ip_addr] [-p http_port] "
"[-t tracefile] [-c] [-f] "
"[-d] "