* setup.c: updated to use new built-in daemonization

[citadel.git] / citadel / setup.c

diff --git a/citadel/setup.c b/citadel/setup.c
index b1c6487db1bec58e7a1260110d2490b81a5d7c8e..8ff9c297cae6fa6794dc710e7894b2082fc128b8 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -392,8 +392,19 @@ void install_init_scripts(void)
        }
 
        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"
@@ -401,9 +412,7 @@ void install_init_scripts(void)
                        "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\n"
                        "               then\n"
                        "                       echo \"ok\"\n"
                        "               else\n"
@@ -416,7 +425,10 @@ void install_init_scripts(void)
                        "               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"
@@ -731,7 +743,17 @@ void edit_value(int curr)
                break;
 
        case 5:
-               set_bool_val(curr, &config.c_auth_mode);
+               if (getenv("ENABLE_UNIX_AUTH")) {
+                       if (!strcasecmp(getenv("ENABLE_UNIX_AUTH"), "yes")) {
+                               config.c_auth_mode = 1;
+                       }
+                       else {
+                               config.c_auth_mode = 0;
+                       }
+               }
+               else {
+                       set_bool_val(curr, &config.c_auth_mode);
+               }
                break;
 
        }