Completed the merge of a read-only, reader-only NNTP service into Citadel server.

[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 4bc8aab9eeaa35c93333a88b5cc6052755e49c22..085f5f046d1ebca105e936a0ab0ef61e237cf79a 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -1,21 +1,15 @@
 /*
  * Transparently handle the upgrading of server data formats.
  *
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2014 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 as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * modify it under the terms of the GNU General Public License version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "sysdep.h"
@@ -54,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,7 +254,10 @@ void guess_time_zone(void) {
 
 
 /*
- * Do various things to our configuration file
+ * Perform any upgrades that can be done automatically based on our knowledge of the previous
+ * version of Citadel server that was running here.
+ *
+ * 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();
@@ -285,7 +279,7 @@ void update_config(void) {
        }
 
        if (CitControl.version < 650) {
-               config.c_enable_fulltext = 0;
+               config.c_enable_fulltext = 1;
        }
 
        if (CitControl.version < 652) {
@@ -297,6 +291,11 @@ void update_config(void) {
                config.c_xmpp_s2s_port = 5269;
        }
 
+       if (CitControl.version < 830) {
+               config.c_nntp_port = 119;
+               config.c_nntps_port = 563;
+       }
+
        if (IsEmptyStr(config.c_default_cal_zone)) {
                guess_time_zone();
        }
@@ -351,7 +350,36 @@ void check_server_upgrades(void) {
        if (CitControl.version < 790) {
                remove_thread_users();
        }
+       if (CitControl.version < 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.version = 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();
 }