fclose(sfp);
}
}
- sleep(1);
}
}
}
/* Determine the fully qualified path name of citserver */
snprintf(looking_for,
- sizeof looking_for,
- "%s/citserver",
-#ifndef HAVE_RUN_DIR
- setup_directory
-#else
- CTDLDIR
-#endif
- );
+ sizeof looking_for,
+ "%s/citserver",
+ ctdl_sbin_dir
+ );
/* Now tweak /etc/inittab */
infp = fopen("/etc/inittab", "r");
*/
void install_init_scripts(void)
{
+ struct stat etcinitd;
FILE *fp;
+ char *initfile = "/etc/init.d/citadel";
+ char command[SIZ];
if (yesno("Would you like to automatically start Citadel at boot?\n", 1) == 0) {
return;
}
- fp = fopen("/etc/init.d/citadel", "w");
+ if ((stat("/etc/init.d/", &etcinitd) == -1) &&
+ (errno == ENOENT))
+ {
+ if ((stat("/etc/rc.d/init.d/", &etcinitd) == -1) &&
+ (errno == ENOENT))
+ initfile = CTDLDIR"/citadel.init";
+ else
+ initfile = "/etc/rc.d/init.d/citadel";
+ }
+
+ fp = fopen(initfile, "w");
if (fp == NULL) {
display_error("Cannot create /etc/init.d/citadel");
return;
}
fprintf(fp, "#!/bin/sh\n"
+ "#\n"
+ "# Init file for Citadel\n"
+ "#\n"
+ "# chkconfig: - 79 30\n"
+ "# description: Citadel service\n"
+ "# processname: citserver\n"
+ "# pidfile: %s/citadel.pid\n"
"\n"
- "CITADEL_DIR=%s\n", setup_directory);
+ "CITADEL_DIR=%s\n"
+ ,
+ setup_directory,
+ setup_directory
+ );
fprintf(fp, "\n"
- "test -x $CITADEL_DIR/ctdlsvc || exit 0\n"
"test -d /var/run || exit 0\n"
"\n"
"case \"$1\" in\n"
"\n"
"start) echo -n \"Starting Citadel... \"\n"
- " if $CITADEL_DIR/ctdlsvc /var/run/citadel.pid "
- "$CITADEL_DIR/citserver "
- "-t/dev/null\n"
+ " if $CITADEL_DIR/citserver -d -h$CITADEL_DIR\n"
" then\n"
" echo \"ok\"\n"
" else\n"
" else\n"
" echo \"failed\"\n"
" fi\n"
- " rm -f /var/run/citadel.pid 2>/dev/null\n");
+ " rm -f %s/citadel.pid 2>/dev/null\n"
+ ,
+ setup_directory
+ );
fprintf(fp, " ;;\n"
"restart) $0 stop\n"
" $0 start\n"
);
fclose(fp);
- chmod("/etc/init.d/citadel", 0755);
+ chmod(initfile, 0755);
/* Set up the run levels. */
system("/bin/rm -f /etc/rc?.d/[SK]??citadel 2>/dev/null");
- system("for x in 2 3 4 5 ; do [ -d /etc/rc$x.d ] && ln -s /etc/init.d/citadel /etc/rc$x.d/S79citadel ; done 2>/dev/null");
- system("for x in 0 6 S; do [ -d /etc/rc$x.d ] && ln -s /etc/init.d/citadel /etc/rc$x.d/K30citadel ; done 2>/dev/null");
+ snprintf(command, sizeof(command), "for x in 2 3 4 5 ; do [ -d /etc/rc$x.d ] && ln -s %s /etc/rc$x.d/S79citadel ; done 2>/dev/null", initfile);
+ system(command);
+ snprintf(command, sizeof(command),"for x in 0 6 S; do [ -d /etc/rc$x.d ] && ln -s %s /etc/rc$x.d/K30citadel ; done 2>/dev/null", initfile);
+ system(command);
}
" server_args = -h -L %s/citadel\n"
" log_on_failure += USERID\n"
"}\n",
-#ifndef HAVE_RUN_DIR
- setup_directory
-#else
- RUN_DIR
-#endif
- );
+ ctdl_bin_dir);
fclose(fp);
/* Now try to restart the service */
sprintf(cookie, "--test--%d--", getpid());
sprintf(cmd, "%s/sendcommand %s%s ECHO %s 2>&1",
-#ifndef HAVE_RUN_DIR
- setup_directory,
-#else
- CTDLDIR,
-#endif
- (enable_home)?"-h":"",
- (enable_home)?setup_directory:"",
- cookie);
+ ctdl_sbin_dir,
+ (enable_home)?"-h":"",
+ (enable_home)?ctdl_run_dir:"",
+ cookie);
fp = popen(cmd, "r");
if (fp == NULL) return(errno);
switch (curr) {
case 1:
- if (getenv("SYSADMIN_NAME")) {
- strcpy(config.c_sysadm, getenv("SYSADMIN_NAME"));
+ if (setup_type == UI_SILENT)
+ {
+ if (getenv("SYSADMIN_NAME")) {
+ strcpy(config.c_sysadm, getenv("SYSADMIN_NAME"));
+ }
}
else {
set_str_val(curr, config.c_sysadm);
break;
case 2:
+ if (setup_type == UI_SILENT)
+ {
+ if (getenv("CITADEL_UID")) {
+ config.c_ctdluid = atoi(getenv("CITADEL_UID"));
+ }
+ }
+ else
+ {
#ifdef __CYGWIN__
- config.c_ctdluid = 0; /* XXX Windows hack, prob. insecure */
+ config.c_ctdluid = 0; /* XXX Windows hack, prob. insecure */
#else
- i = config.c_ctdluid;
- pw = getpwuid(i);
- if (pw == NULL) {
- set_int_val(curr, &i);
- config.c_ctdluid = i;
- }
- else {
- strcpy(ctdluidname, pw->pw_name);
- set_str_val(curr, ctdluidname);
- pw = getpwnam(ctdluidname);
- if (pw != NULL) {
- config.c_ctdluid = pw->pw_uid;
+ i = config.c_ctdluid;
+ pw = getpwuid(i);
+ if (pw == NULL) {
+ set_int_val(curr, &i);
+ config.c_ctdluid = i;
}
- else if (atoi(ctdluidname) > 0) {
- config.c_ctdluid = atoi(ctdluidname);
+ else {
+ strcpy(ctdluidname, pw->pw_name);
+ set_str_val(curr, ctdluidname);
+ pw = getpwnam(ctdluidname);
+ if (pw != NULL) {
+ config.c_ctdluid = pw->pw_uid;
+ }
+ else if (atoi(ctdluidname) > 0) {
+ config.c_ctdluid = atoi(ctdluidname);
+ }
}
}
#endif
break;
case 3:
- set_str_val(curr, config.c_ip_addr);
+ if (setup_type == UI_SILENT)
+ {
+ if (getenv("IP_ADDR")) {
+ strcpy(config.c_ip_addr, getenv("IP_ADDR"));
+ }
+ }
+ else {
+ set_str_val(curr, config.c_ip_addr);
+ }
break;
case 4:
- set_int_val(curr, &config.c_port_number);
+ if (setup_type == UI_SILENT)
+ {
+ if (getenv("CITADEL_PORT")) {
+ config.c_port_number = atoi(getenv("CITADEL_PORT"));
+ }
+ }
+ else
+ {
+ set_int_val(curr, &config.c_port_number);
+ }
break;
case 5:
- if (getenv("ENABLE_UNIX_AUTH")) {
- if (!strcasecmp(getenv("ENABLE_UNIX_AUTH"), "yes")) {
- config.c_auth_mode = 1;
- }
- else {
- config.c_auth_mode = 0;
+ if (setup_type == UI_SILENT)
+ {
+ if (getenv("ENABLE_UNIX_AUTH")) {
+ if (!strcasecmp(getenv("ENABLE_UNIX_AUTH"), "yes")) {
+ config.c_auth_mode = 1;
+ }
+ else {
+ config.c_auth_mode = 0;
+ }
}
}
else {
}
/* Get started in a valid setup directory. */
- strcpy(setup_directory,
-#ifdef HAVE_RUN_DIR
- ""
-#else
- CTDLDIR
-#endif
- );
+ strcpy(setup_directory, ctdl_run_dir);
if ( (using_web_installer) && (getenv("CITADEL") != NULL) ) {
strcpy(setup_directory, getenv("CITADEL"));
}
if (config.c_managesieve_port == 0) config.c_managesieve_port = 2020;
/* Go through a series of dialogs prompting for config info */
- if (setup_type != UI_SILENT) {
- for (curr = 1; curr <= MAXSETUP; ++curr) {
- edit_value(curr);
- }
+ for (curr = 1; curr <= MAXSETUP; ++curr) {
+ edit_value(curr);
}
/***** begin version update section ***** */
chmod(ctdl_netcfg_dir, 0700);
chown(ctdl_netcfg_dir, config.c_ctdluid, -1);
- /* TODO: where to put this? */
- mkdir("netconfigs", 0700);
- chmod("netconfigs", 0700);
- chown("netconfigs", config.c_ctdluid, -1);
-
/* Delete files and directories used by older Citadel versions */
system("exec /bin/rm -fr ./rooms ./chatpipes ./expressmsgs ./sessions 2>/dev/null");
unlink("citadel.log");
gid = pw->pw_gid;
progress("Setting file permissions", 0, 4);
- chown(".", config.c_ctdluid, gid);
- sleep(1);
+ chown(ctdl_run_dir, config.c_ctdluid, gid);
progress("Setting file permissions", 1, 4);
chown(file_citadel_config, config.c_ctdluid, gid);
- sleep(1);
progress("Setting file permissions", 2, 4);
snprintf(aaa, sizeof aaa,
"%schkpwd",
ctdl_sbin_dir);
chown(aaa,0,0); /* config.c_ctdluid, gid); chkpwd needs to be root owned*/
- sleep(1);
progress("Setting file permissions", 3, 4);
chmod(aaa, 04755);
- sleep(1);
progress("Setting file permissions", 3, 4);
chmod(file_citadel_config, S_IRUSR | S_IWUSR);
- sleep(1);
progress("Setting file permissions", 4, 4);
/*
projects / citadel.git / blobdiff