started setting up new config system

[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 8e7ef34553a73014799218c4d0dff59adad75140..fc8c1d58e7f1769f3d45b4d5354a33aa77fe784d 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -1,7 +1,7 @@
 /*
  * Transparently handle the upgrading of server data formats.
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -48,12 +48,9 @@
 #include "msgbase.h"
 #include "serv_upgrade.h"
 #include "euidindex.h"
-
-
 #include "ctdl_module.h"
 
 
-
 /*
  * Fix up the name for Citadel user 0 and try to remove any extra users with number 0
  */
@@ -263,41 +260,41 @@ void guess_time_zone(void) {
  * Note that if the previous version was 0 then this is a new installation running for the first time.
  */
 void update_config(void) {
-       get_config();
-
-       if (CitControl.version == 0) {
-               config.c_instant_expunge = 1;
-       }
 
-       if (CitControl.version < 606) {
+       if (CitControl.MM_hosted_upgrade_level < 606) {
                config.c_rfc822_strict_from = 0;
        }
 
-       if (CitControl.version < 609) {
+       if (CitControl.MM_hosted_upgrade_level < 609) {
                config.c_purge_hour = 3;
        }
 
-       if (CitControl.version < 615) {
+       if (CitControl.MM_hosted_upgrade_level < 615) {
                config.c_ldap_port = 389;
        }
 
-       if (CitControl.version < 623) {
+       if (CitControl.MM_hosted_upgrade_level < 623) {
                strcpy(config.c_ip_addr, "*");
        }
 
-       if (CitControl.version < 650) {
+       if (CitControl.MM_hosted_upgrade_level < 650) {
                config.c_enable_fulltext = 1;
        }
 
-       if (CitControl.version < 652) {
+       if (CitControl.MM_hosted_upgrade_level < 652) {
                config.c_auto_cull = 1;
        }
 
-       if (CitControl.version < 725) {
+       if (CitControl.MM_hosted_upgrade_level < 725) {
                config.c_xmpp_c2s_port = 5222;
                config.c_xmpp_s2s_port = 5269;
        }
 
+       if (CitControl.MM_hosted_upgrade_level < 830) {
+               config.c_nntp_port = 119;
+               config.c_nntps_port = 563;
+       }
+
        if (IsEmptyStr(config.c_default_cal_zone)) {
                guess_time_zone();
        }
@@ -315,11 +312,11 @@ void check_server_upgrades(void) {
 
        get_control();
        syslog(LOG_INFO, "Existing database version on disk is %d.%02d",
-               (CitControl.version / 100),
-               (CitControl.version % 100)
+               (CitControl.MM_hosted_upgrade_level / 100),
+               (CitControl.MM_hosted_upgrade_level % 100)
        );
 
-       if (CitControl.version < REV_LEVEL) {
+       if (CitControl.MM_hosted_upgrade_level < REV_LEVEL) {
                syslog(LOG_WARNING,
                        "Server hosted updates need to be processed at this time.  Please wait..."
                );
@@ -330,29 +327,58 @@ void check_server_upgrades(void) {
 
        update_config();
 
-       if ((CitControl.version > 000) && (CitControl.version < 555)) {
+       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 555)) {
                syslog(LOG_EMERG, "This database is too old to be upgraded.  Citadel server will exit.");
                exit(EXIT_FAILURE);
        }
-       if ((CitControl.version > 000) && (CitControl.version < 591)) {
+       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 591)) {
                bump_mailbox_generation_numbers();
        }
-       if ((CitControl.version > 000) && (CitControl.version < 608)) {
+       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 608)) {
                convert_ctdluid_to_minusone();
        }
-       if ((CitControl.version > 000) && (CitControl.version < 659)) {
+       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 659)) {
                rebuild_euid_index();
        }
-       if (CitControl.version < 735) {
+       if (CitControl.MM_hosted_upgrade_level < 735) {
                fix_sys_user_name();
        }
-       if (CitControl.version < 736) {
+       if (CitControl.MM_hosted_upgrade_level < 736) {
                rebuild_usersbynumber();
        }
-       if (CitControl.version < 790) {
+       if (CitControl.MM_hosted_upgrade_level < 790) {
                remove_thread_users();
        }
-       CitControl.version = REV_LEVEL;
+       if (CitControl.MM_hosted_upgrade_level < 810) {
+               struct ctdlroom QRoom;
+               if (!CtdlGetRoom(&QRoom, SMTP_SPOOLOUT_ROOM)) {
+                       QRoom.QRdefaultview = VIEW_QUEUE;
+                       CtdlPutRoom(&QRoom);
+               }
+               if (!CtdlGetRoom(&QRoom, FNBL_QUEUE_ROOM)) {
+                       QRoom.QRdefaultview = VIEW_QUEUE;
+                       CtdlPutRoom(&QRoom);
+               }
+       }
+
+       CitControl.MM_hosted_upgrade_level = REV_LEVEL;
+
+       /*
+        * Negative values for maxsessions are not allowed.
+        */
+       if (config.c_maxsessions < 0) {
+               config.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;
+       }
+
        put_control();
 }