]> code.citadel.org Git - citadel.git/blobdiff - citadel/modules/upgrade/serv_upgrade.c
started setting up new config system
[citadel.git] / citadel / modules / upgrade / serv_upgrade.c
index 3e8ad1e7412b86899cc96df8279a2aaab54d8281..fc8c1d58e7f1769f3d45b4d5354a33aa77fe784d 100644 (file)
@@ -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.
@@ -21,7 +21,6 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/utsname.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -254,82 +253,6 @@ void guess_time_zone(void) {
 }
 
 
-/*
- * Put some sane default values into our configuration.  Some will be overridden when we run setup.
- */
-void brand_new_installation_set_defaults(void) {
-
-       struct passwd *pw;
-       struct utsname my_utsname;
-       struct hostent *he;
-
-       /* Determine our host name, in case we need to use it as a default */
-       uname(&my_utsname);
-
-       /* set some sample/default values in place of blanks... */
-       char c_nodename[256];
-       safestrncpy(c_nodename, my_utsname.nodename, sizeof c_nodename);
-       strtok(config.c_nodename, ".");
-       if (IsEmptyStr(config.c_fqdn) ) {
-               if ((he = gethostbyname(my_utsname.nodename)) != NULL) {
-                       safestrncpy(config.c_fqdn, he->h_name, sizeof config.c_fqdn);
-               }
-               else {
-                       safestrncpy(config.c_fqdn, my_utsname.nodename, sizeof config.c_fqdn);
-               }
-       }
-
-       safestrncpy(config.c_humannode, "Citadel Server", sizeof config.c_humannode);
-       safestrncpy(config.c_phonenum, "US 800 555 1212", sizeof config.c_phonenum);
-       config.c_initax = 4;
-       safestrncpy(config.c_moreprompt, "<more>", sizeof config.c_moreprompt);
-       safestrncpy(config.c_twitroom, "Trashcan", sizeof config.c_twitroom);
-       safestrncpy(config.c_baseroom, BASEROOM, sizeof config.c_baseroom);
-       safestrncpy(config.c_aideroom, "Aide", sizeof config.c_aideroom);
-       config.c_port_number = 504;
-       config.c_sleeping = 900;
-       config.c_instant_expunge = 1;
-
-       if (config.c_ctdluid == 0) {
-               pw = getpwnam("citadel");
-               if (pw != NULL) {
-                       config.c_ctdluid = pw->pw_uid;
-               }
-       }
-       if (config.c_ctdluid == 0) {
-               pw = getpwnam("bbs");
-               if (pw != NULL) {
-                       config.c_ctdluid = pw->pw_uid;
-               }
-       }
-       if (config.c_ctdluid == 0) {
-               pw = getpwnam("guest");
-               if (pw != NULL) {
-                       config.c_ctdluid = pw->pw_uid;
-               }
-       }
-       if (config.c_createax == 0) {
-               config.c_createax = 3;
-       }
-
-       /*
-        * Default port numbers for various services
-        */
-       config.c_smtp_port = 25;
-       config.c_pop3_port = 110;
-       config.c_imap_port = 143;
-       config.c_msa_port = 587;
-       config.c_smtps_port = 465;
-       config.c_pop3s_port = 995;
-       config.c_imaps_port = 993;
-       config.c_pftcpdict_port = -1 ;
-       config.c_managesieve_port = 2020;
-       config.c_xmpp_c2s_port = 5222;
-       config.c_xmpp_s2s_port = 5269;
-}
-
-
-
 /*
  * Perform any upgrades that can be done automatically based on our knowledge of the previous
  * version of Citadel server that was running here.
@@ -337,41 +260,41 @@ void brand_new_installation_set_defaults(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) {
-               brand_new_installation_set_defaults();
-       }
 
-       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();
        }
@@ -389,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..."
                );
@@ -404,29 +327,41 @@ 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.