Completed initial code for config system cutover. Not tested yet. Also the import...

[citadel.git] / citadel / modules / upgrade / serv_upgrade.c

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index fc8c1d58e7f1769f3d45b4d5354a33aa77fe784d..eadfefb3086a18af2c5d989626f14c10423682e8 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -245,8 +245,8 @@ void guess_time_zone(void) {
        if (fp) {
                if (fgets(buf, sizeof buf, fp) && (strlen(buf) > 2)) {
                        buf[strlen(buf)-1] = 0;
-                       safestrncpy(config.c_default_cal_zone, buf, sizeof config.c_default_cal_zone);
-                       syslog(LOG_INFO, "Configuring timezone: %s", config.c_default_cal_zone);
+                       CtdlSetConfigStr("c_default_cal_zone", buf);
+                       syslog(LOG_INFO, "Configuring timezone: %s", buf);
                }
                fclose(fp);
        }
@@ -261,45 +261,45 @@ void guess_time_zone(void) {
  */
 void update_config(void) {
 
-       if (CitControl.MM_hosted_upgrade_level < 606) {
-               config.c_rfc822_strict_from = 0;
+       int oldver = CitControl.MM_hosted_upgrade_level;
+
+       if (oldver < 606) {
+               CtdlSetConfigInt("c_rfc822_strict_from", 0);
        }
 
-       if (CitControl.MM_hosted_upgrade_level < 609) {
-               config.c_purge_hour = 3;
+       if (oldver < 609) {
+               CtdlSetConfigInt("c_purge_hour", 3);
        }
 
-       if (CitControl.MM_hosted_upgrade_level < 615) {
-               config.c_ldap_port = 389;
+       if (oldver < 615) {
+               CtdlSetConfigInt("c_ldap_port", 389);
        }
 
-       if (CitControl.MM_hosted_upgrade_level < 623) {
-               strcpy(config.c_ip_addr, "*");
+       if (oldver < 623) {
+               CtdlSetConfigStr("c_ip_addr", "*");
        }
 
-       if (CitControl.MM_hosted_upgrade_level < 650) {
-               config.c_enable_fulltext = 1;
+       if (oldver < 650) {
+               CtdlSetConfigInt("c_enable_fulltext", 1);
        }
 
-       if (CitControl.MM_hosted_upgrade_level < 652) {
-               config.c_auto_cull = 1;
+       if (oldver < 652) {
+               CtdlSetConfigInt("c_auto_cull", 1);
        }
 
-       if (CitControl.MM_hosted_upgrade_level < 725) {
-               config.c_xmpp_c2s_port = 5222;
-               config.c_xmpp_s2s_port = 5269;
+       if (oldver < 725) {
+               CtdlSetConfigInt("c_xmpp_c2s_port", 5222);
+               CtdlSetConfigInt("c_xmpp_s2s_port", 5269);
        }
 
-       if (CitControl.MM_hosted_upgrade_level < 830) {
-               config.c_nntp_port = 119;
-               config.c_nntps_port = 563;
+       if (oldver < 830) {
+               CtdlSetConfigInt("c_nntp_port", 119);
+               CtdlSetConfigInt("c_nntps_port", 563);
        }
 
-       if (IsEmptyStr(config.c_default_cal_zone)) {
+       if (IsEmptyStr(CtdlGetConfigStr("c_default_cal_zone"))) {
                guess_time_zone();
        }
-
-       put_config();
 }
 
 
@@ -366,17 +366,17 @@ void check_server_upgrades(void) {
        /*
         * Negative values for maxsessions are not allowed.
         */
-       if (config.c_maxsessions < 0) {
-               config.c_maxsessions = 0;
+       if (CtdlGetConfigInt("c_maxsessions") < 0) {
+               CtdlSetConfigInt("c_maxsessions", 0);
        }
 
        /* We need a system default message expiry policy, because this is
         * the top level and there's no 'higher' policy to fall back on.
         * By default, do not expire messages at all.
         */
-       if (config.c_ep.expire_mode == 0) {
-               config.c_ep.expire_mode = EXPIRE_MANUAL;
-               config.c_ep.expire_value = 0;
+       if (CtdlGetConfigInt("c_ep_mode") == 0) {
+               CtdlSetConfigInt("c_ep_mode", EXPIRE_MANUAL);
+               CtdlSetConfigInt("c_ep_value", 0);
        }
 
        put_control();