#include <limits.h>
#include <pwd.h>
#include <time.h>
-
+#include <libcitadel.h>
#include "citadel.h"
#include "axdefs.h"
#include "sysdep.h"
#include "config.h"
-#include "tools.h"
#include "citadel_dirs.h"
-#define MAXSETUP 5 /* How many setup questions to ask */
+#define MAXSETUP 6 /* How many setup questions to ask */
#define UI_TEXT 0 /* Default setup type -- text only */
#define UI_DIALOG 2 /* Use the 'dialog' program */
char setup_directory[PATH_MAX];
int using_web_installer = 0;
int enable_home = 1;
+char admin_pass[SIZ];
+char admin_cmd[SIZ];
char *setup_titles[] =
{
"Citadel Home Directory",
"System Administrator",
+ "Administrator Password",
"Citadel User ID",
"Server IP address",
"Server port number",
"you). When an account is created with this name, it will\n"
"automatically be given administrator-level access.\n",
+"Enter a password for the system administrator. When setup\n"
+"completes it will attempt to create the administrator user\n"
+"and set the password specified here.\n",
+
"Citadel needs to run under its own user ID. This would\n"
"typically be called \"citadel\", but if you are running Citadel\n"
"as a public BBS, you might also call it \"bbs\" or \"guest\".\n"
setup_directory
);
fprintf(fp, " ;;\n"
- "restart) $0 stop\n"
- " $0 start\n"
- " ;;\n"
+ "restart) if $CITADEL_DIR/sendcommand DOWN 1 >/dev/null 2>&1 ; then\n"
+ " echo \"ok\"\n"
+ " else\n"
+ " echo \"failed\"\n"
+ " fi\n"
+ " ;;\n"
"*) echo \"Usage: $0 {start|stop|restart}\"\n"
" exit 1\n"
" ;;\n"
break;
case 2:
+ if (setup_type == UI_SILENT)
+ {
+ if (getenv("SYSADMIN_PW")) {
+ strcpy(admin_pass, getenv("SYSADMIN_PW"));
+ }
+ }
+ else {
+ set_str_val(curr, admin_pass);
+ }
+ break;
+
+ case 3:
if (setup_type == UI_SILENT)
{
if (getenv("CITADEL_UID")) {
}
break;
- case 3:
+ case 4:
if (setup_type == UI_SILENT)
{
if (getenv("IP_ADDR")) {
}
break;
- case 4:
+ case 5:
if (setup_type == UI_SILENT)
{
if (getenv("CITADEL_PORT")) {
}
break;
- case 5:
+ case 6:
if (setup_type == UI_SILENT)
{
if (getenv("ENABLE_UNIX_AUTH")) {
if (!strcasecmp(getenv("ENABLE_UNIX_AUTH"), "yes")) {
- config.c_auth_mode = 1;
+ config.c_auth_mode = AUTHMODE_HOST;
}
else {
- config.c_auth_mode = 0;
+ config.c_auth_mode = AUTHMODE_NATIVE;
}
}
}
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
- CtdlInitBase64Table();
-
/* set an invalid setup type */
setup_type = (-1);
strcpy(aaa, &aaa[2]);
setup_type = atoi(aaa);
}
- if (!strcmp(argv[a], "-i")) {
+ else if (!strcmp(argv[a], "-i")) {
info_only = 1;
}
- if (!strcmp(argv[a], "-q")) {
+ else if (!strcmp(argv[a], "-q")) {
setup_type = UI_SILENT;
}
+ else if (!strncmp(argv[a], "-h", 2)) {
+ relh=argv[a][2]!='/';
+ if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2],
+ sizeof ctdl_home_directory);
+ else
+ safestrncpy(relhome, &argv[a][2],
+ sizeof relhome);
+ home = 1;
+ }
+
}
+ calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
/* If a setup type was not specified, try to determine automatically
* the best one to use out of all available types.
set_str_val(0, setup_directory);
}
- home=(setup_directory[1]!='\0');
- relh=home&(setup_directory[1]!='/');
- if (!relh) {
- safestrncpy(ctdl_home_directory, setup_directory, sizeof ctdl_home_directory);
- }
- else {
- safestrncpy(relhome, ctdl_home_directory, sizeof relhome);
- }
-
- calc_dirs_n_files(relh, home, relhome, ctdldir);
-
enable_home=(relh|home);
if (home) {
if (config.c_imaps_port == 0) config.c_imaps_port = 993;
if (config.c_pftcpdict_port == 0) config.c_pftcpdict_port = -1;
if (config.c_managesieve_port == 0) config.c_managesieve_port = 2020;
+ if (config.c_xmpp_c2s_port == 0) config.c_xmpp_c2s_port = 5222;
+ if (config.c_xmpp_s2s_port == 0) config.c_xmpp_s2s_port = 5269;
/* Go through a series of dialogs prompting for config info */
for (curr = 1; curr <= MAXSETUP; ++curr) {
unlink("citadel.log");
unlink("weekly");
- check_services_entry(); /* Check /etc/services */
+ if (((setup_type == UI_SILENT) && (getenv("ALTER_ETC_SERVICES")!=NULL)) ||
+ (setup_type != UI_SILENT))
+ check_services_entry(); /* Check /etc/services */
#ifndef __CYGWIN__
delete_inittab_entry(); /* Remove obsolete /etc/inittab entry */
check_xinetd_entry(); /* Check /etc/xinetd.d/telnet */
disable_other_mta("dovecot");
disable_other_mta("exim");
disable_other_mta("exim4");
- disable_other_mta("hula");
disable_other_mta("imapd");
disable_other_mta("mta");
disable_other_mta("pop3d");
disable_other_mta("saslauthd");
disable_other_mta("sendmail");
disable_other_mta("vmailmgrd");
- disable_other_mta("zimbra");
#endif
/* Check for the 'db' nss and offer to disable it */
}
if (test_server() == 0) {
+ snprintf (admin_cmd, sizeof(admin_cmd), "%s/sendcommand \"CREU %s|%s\"", ctdl_utilbin_dir, config.c_sysadm, admin_pass);
+ system(admin_cmd);
important_message("Setup finished",
"Setup of the Citadel server is complete.\n"
"If you will be using WebCit, please run its\n"
projects / citadel.git / blobdiff