Changeset 1034

Timestamp:

03/07/08 01:03:10 (7 months ago)

Author:

rats

Message:

* Fixed #1082: Packages list debian lenny
* Fixed #1086: Errors during installation
* Fixed: 'null' problem in strict perl
* Updated: Russian (thanks to Grundik)
* Updated: Update script; Update to RC3
* Updated: Update script; Update to RC4

Files:

• trunk/CHANGELOG (modified) (2 diffs)
• trunk/configs/dists/centos/ispcp.conf (modified) (1 diff)
• trunk/configs/dists/fedora/ispcp.conf (modified) (1 diff)
• trunk/configs/dists/freebsd/ispcp.conf (modified) (1 diff)
• trunk/configs/dists/gentoo/ispcp.conf (modified) (1 diff)
• trunk/configs/dists/openbsd/ispcp.conf (modified) (1 diff)
• trunk/configs/dists/opensuse/ispcp.conf (modified) (1 diff)
• trunk/configs/dists/redhat/ispcp.conf (modified) (1 diff)
• trunk/configs/dists/ubuntu/ispcp.conf (modified) (1 diff)
• trunk/configs/ispcp.conf (modified) (1 diff)
• trunk/docs/Debian/INSTALL (modified) (3 diffs)
• trunk/docs/Debian/debian-packages-lenny (modified) (4 diffs)
• trunk/engine/ispcp_common_methods.pl (modified) (8 diffs)
• trunk/engine/setup/ispcp-setup-methods.pl (modified) (1 diff)
• trunk/engine/setup/ispcp-update (modified) (4 diffs)
• trunk/engine/setup/ispcp1.0.0rc2-ispcp.sql (modified) (1 diff)
• trunk/engine/setup/ispcp1.0.0rc3-ispcp.sql (modified) (1 diff)
• trunk/language-files/ru_RU.po (modified) (227 diffs)
• trunk/language-files/russian/russian (modified) (18 diffs)

trunk/CHANGELOG

@@ -2 +2 @@
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+2008-03-07 Benedikt Heintel
+        - DOCS:
+                * Fixed #1082: Packages list debian lenny
+        - ENGINE
+                * Fixed #1086: Errors during installation
+                * Fixed: 'null' problem in strict perl
+        - LANGUAGES:
+                * Updated: Russian (thanks to Grundik)
+        - SETUP:
+                * Updated: Update script; Update to RC3
+                * Updated: Update script; Update to RC4
+
-2008-03-04 Benedikt Heintel
-        - SETUP:
-                * Fixed #824: IMAP SSL Traffic not counted
-                * Fixed #1075: ispcp-update fails when upgrading from RC2
-
+script; Update 
-        - DISTS:
-                * Fixed #1074: config Dists opensuse - wrong makefile
@@ -12 +24 @@
-2008-03-03 Benedikt Heintel
-        - ENGINE:
-B
+D
-
-2008-03-02 Benedikt Heintel

trunk/configs/dists/centos/ispcp.conf

@@ -9 +9 @@
-#
-
-1
+7
-
-Version = 1.0.0 RC4 OMEGA

trunk/configs/dists/fedora/ispcp.conf

@@ -9 +9 @@
-#
-
-1
+7
-
-Version = 1.0.0 RC4 OMEGA

trunk/configs/dists/freebsd/ispcp.conf

@@ -9 +9 @@
-#
-
-1
+7
-
-Version = 1.0.0 RC4 OMEGA

trunk/configs/dists/gentoo/ispcp.conf

@@ -9 +9 @@
-#
-
-1
+7
-
-Version = 1.0.0 RC4 OMEGA

trunk/configs/dists/openbsd/ispcp.conf

@@ -9 +9 @@
-#
-
-1
+7
-
-Version = 1.0.0 RC4 OMEGA

trunk/configs/dists/opensuse/ispcp.conf

@@ -9 +9 @@
-#
-
-1
+7
-
-Version = 1.0.0 RC4 OMEGA

trunk/configs/dists/redhat/ispcp.conf

@@ -9 +9 @@
-#
-
-1
+7
-
-Version = 1.0.0 RC4 OMEGA

trunk/configs/dists/ubuntu/ispcp.conf

@@ -9 +9 @@
-#
-
-1
+7
-
-Version = 1.0.0 RC4 OMEGA

trunk/configs/ispcp.conf

@@ -9 +9 @@
-#
-
-1
+7
-
-Version = 1.0.0 RC4 OMEGA

trunk/docs/Debian/INSTALL

@@ -81 +81 @@
-   /etc/apt/sources.list:
-
- 
- 
+
+
-
-
@@ -146 +146 @@
-        # apt-get install `cat ./docs/Debian/debian-packages-sarge`
-   for Debian Etch please use:
-   
+
-   for Debian Lenny/Sid please use:
-   
+
-
-   Make sure you have added the non-free into your /etc/apt/sources.list:
@@ -158 +158 @@
-   /etc/apt/sources.list:
-
- 
- 
+
+
-
-

trunk/docs/Debian/debian-packages-lenny

@@ -12 +12 @@
-courier-maildrop
-courier-pop
-chkrootkit
-diff
-dnsutils
@@ -18 +17 @@
-gzip
-iptables
-libapache2-mod-cband
-libapache2-mod-fastcgi
-libberkeleydb-perl
@@ -40 +38 @@
-libnet-smtp-server-perl
-libperl5.8
-
+-2
-libsasl2-modules
-libsnmp-session-perl
@@ -72 +70 @@
-postgrey
-procmail
--mysql
+
-rkhunter
-sasl2-bin

trunk/engine/ispcp_common_methods.pl

@@ -378 +378 @@
-# @param        String  $fname  File Name
-# @param        Mixed   $fuser  Linux User or UserID
-null
+'null'
-# @param        int             $fperms Linux Permissions
-# @return       int                             success (0) or error (-1)
@@ -423 +423 @@
-                $gid = $fgroup;
-        }
-null
+'null'
-                $gid = $udata[3];
-        }
@@ -463 +463 @@
-
-    if (!defined($fname) || ($fname eq '')) {
-
-
-
-
-
-
-
-
-
+
+
-    }
-
-    if (! -e $fname) {
-
-
-
-
-
-
-
-
-
+
+
-    }
-
@@ -489 +475 @@
-
-    if (!defined($res)) {
-
-
-
-
-
-
-
-
-
+
+
-    }
-
@@ -543 +522 @@
-
-    if (!defined($res)) {
- 
+: $
-        return -1;
-    }
@@ -583 +562 @@
-
-    if (!defined($res)) {
- 
+: $
-        return -1;
-
@@ -1016 +995 @@
-        if (!defined($rs)) {
-
-
+: $!
-
-            return (-1, '');
@@ -1875 +1854 @@
-sub store_conf {
-
+        if ( defined($_[0]) ) {
+                $file_name = $_[0];
+        }
+        else {
+                $file_name = $main::cfg_file;
+        }
+
-    my ($key, $value, $fline, $rs) = (undef, undef, undef, undef);
-
-    my $rwith = undef;
-
-    push_el(\@main::el, 'store_conf()', 'Starting...');
-
-
-
+
-    return 1 if ($rs != 0);
-
-    if (scalar(keys(%main::cfg_reg)) > 0) {
-
-        while (($key, $value) = each %main::cfg_reg) {
-
-            $rwith = "$key = $value\n";
-
-            $fline =~ s/^$key *= *([^\n\r]*)[\n\r]/$rwith/gim;
-
-
-
-
-
-
-
+
+
+
+
-    return 1 if ($rs != 0);
-
-
-
+
-    return 1 if ($rs != 0);
-
-    push_el(\@main::el, 'store_conf()', 'Ending...');
-
-    return 0;
-
-}
-

trunk/engine/setup/ispcp-setup-methods.pl

@@ -1488 +1488 @@
-                                my $rdata = "$main::cfg{'AUTHLIB_CONF_DIR'}/authdaemonrc";
-                                $rdata =~ s/authmodulelist="/authmodulelist="authuserdb /gi;
-$main::cfg{'AUTHLIB_CONF_DIR'}/authdaemonrc
+"$main::cfg{'AUTHLIB_CONF_DIR'}/authdaemonrc"
-                                return $rs if ($rs != 0);
-

trunk/engine/setup/ispcp-update

@@ -583 +583 @@
-}
-
+sub update_conf {
+        push_el(\@main::el, 'update_conf()', 'Starting...');
+
+        my ($oldconf, $newconf) = ($_[0], $_[1]);
+
+        if (!defined($oldconf) || !defined($newconf)) {
+                push_el(\@main::el, 'update_conf()', 'ERROR: Undefined input data...');
+                return 1;
+        }
+
+    my ($rs, $fline) = get_file($oldconf);
+    return 1 if ($rs != 0);
+    $rs = get_conf($newconf);
+    return 1 if ($rs != 0);
+
+    my @frows = split(/\n/, $fline);
+
+    my $i = undef;
+
+    for ($i = 0; $i < scalar(@frows); $i++) {
+            $frows[$i] = "$frows[$i]\n";
+            if (($frows[$i] =~ /$main::cfg_re/)) {
+                    # Lines should not match variables that have to be changed
+                    if ($1 ne 'BuildDate' && $1 ne 'Version' && $1 ne 'CodeName') {
+                            # now overwrite new conf values with old if exists
+                            if (defined($main::cfg{$1})) {
+                                    $rs = set_conf_val($1, $2);
+                                    return $rs if ($rs != 0);
+                            }
+                    }
+            }
+    }
+
+        $rs = store_conf($newconf);
+    return 1 if ($rs != 0);
+
+        push_el(\@main::el, 'update_conf()', 'Ending...');
+        return 0;
+}
+
-sub patch_ispcp_rc2 {
-        push_el(\@main::el, 'patch_ispcp_rc2()', 'Starting...');
@@ -619 +659 @@
-        }
-
-        # copy variables
-        my $default_admin_address       = $main::cfg{'DEFAULT_ADMIN_ADDRESS'};
-        my $server_hostname                     = $main::cfg{'SERVER_HOSTNAME'};
-        my $base_server_ip                      = $main::cfg{'BASE_SERVER_IP'};
-        my $base_vhost_name                     = $main::cfg{'BASE_SERVER_VHOST'};
-        my $database_host                       = $main::cfg{'DATABASE_HOST'};
-        my $database_name                       = $main::cfg{'DATABASE_NAME'};
-        my $database_user                       = $main::cfg{'DATABASE_USER'};
-        my $database_password           = $main::cfg{'DATABASE_PASSWORD'};
-        my $mysql_prefix                        = $main::ua{'mysql_prefix'};
-        my $mysql_prefix_type           = $main::ua{'mysql_prefix_type'};
-        my $ftpd_conf_file                      = $main::cfg{'FTPD_CONF_FILE'};
-        my $secondary_dns                       = $main::cfg{'SECONDARY_DNS'};
-        my $mta_mailbox_min_uid         = $main::cfg{'MTA_MAILBOX_MIN_UID'};
-        my $mta_mailbox_uid                     = $main::cfg{'MTA_MAILBOX_UID'};
-        my $mta_mailbox_gid                     = $main::cfg{'MTA_MAILBOX_GID'};
-        my $apache_suexec_min_uid       = $main::cfg{'APACHE_SUEXEC_MIN_UID'};
-        my $apache_suexec_min_gid       = $main::cfg{'APACHE_SUEXEC_MIN_GID'};
-
-        # update ispcp.conf
-        my $cfg_file = '/etc/ispcp/ispcp.conf';
-get
+update
-        if ($rs != 0) {
-                exit_werror("failed to get /etc/ispcp/ispcp.conf!");
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        $rs = set_conf_val('AWSTATS_ACTIVE', $main::ua{'awstats_on'});
-        return $rs if ($rs != 0);
-        $rs = set_conf_val('AWSTATS_MODE', $main::ua{'awstats_dyn'});
-        return $rs if ($rs != 0);
-        $rs = set_conf_val('PHP_VERSION', $main::ua{'php_version'});
-
-
-
+
+
-        $rs = store_conf();
-        if ($rs != 0) {
@@ -714 +697 @@
-    print STDOUT "done\n";
-
+    # Rebuild system configs
+    print STDOUT "\tRebuilding system configurations...";
+
+        $rs = rebuild_configs();
+
+        if ($rs != 0) {
+        print STDOUT "failed!\n";
+                exit_werror("Config Rebuild failed.");
+        }
+
+        print STDOUT "done\n";
+
+        # Update PMA's config.inc.php
+        print STDOUT "\tUpdating PMA's config.inc.php...";
+
+        $rs = update_pma();
+
+        if ($rs != 0) {
+        print STDOUT "failed!\n";
+                exit_werror("Updating PMA's config.inc.php failed.");
+        }
+
+        print STDOUT "\tdone\n";
+
+        push_el(\@main::el, 'patch_ispcp_rc2()', 'Ending...');
+        return 0;
+}
+
+sub patch_ispcp_rc3() {
+        push_el(\@main::el, 'patch_ispcp_rc3()', 'Ending...');
+
+        print STDOUT "\tUpgrading system values ...";
+
+        # update ispcp.conf
+        my $cfg_file = '/etc/ispcp/ispcp.conf';
+        $rs = update_conf($cfg_file);
+        if ($rs != 0) {
+                exit_werror("failed to get /etc/ispcp/ispcp.conf!");
+        }
+
+        # save into /etc/ispcp/ispcp.conf
+        $rs = store_conf();
+        if ($rs != 0) {
+                print STDOUT "failed!\n";
+                exit_werror("Storing new ispcp.conf failed!");
+        }
+        print STDOUT "\tdone\n";
+
+        # database upgrade
+    print STDOUT "\tUpgrading database structure...";
+
+        ($rs, $rdata) = get_file("$main::cfg{'ROOT_DIR'}/engine/setup/ispcp1.0.0rc3-ispcp.sql");
+        return $rs if ($rs != 0);
+
+        $rdata =~ s/\{DATABASE\}/$main::db_name/gi;
+        $rs = store_file("/tmp/db.sql", $rdata, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
+        return $rs if ($rs != 0);
+
+        $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql");
+        if ($rs != 0) {
+        print STDOUT "failed!\n";
+                exit_werror("SQL Update failed.");
+        }
+
+    print STDOUT "done\n";
+
-    # Rebuild system configs:
-    print STDOUT "\tRebuilding system configurations...";
@@ -725 +774 @@
-
-        print STDOUT "done\n";
-
-        # Update PMA's config.inc.php
-        print STDOUT "\tUpdating PMA's config.inc.php...";
-
-        $rs = update_pma();
-
-        if ($rs != 0) {
-        print STDOUT "failed!\n";
-                exit_werror("Updating PMA's config.inc.php failed.");
-        }
-
-        print STDOUT "\tdone\n";
-
-        push_el(\@main::el, 'patch_ispcp_rc2()', 'Ending...');
-        return 0;
-}
-
-sub patch_ispcp_rc3() {
-        push_el(\@main::el, 'patch_ispcp_rc3()', 'Ending...');
-
-        # database upgrade
-    print STDOUT "\tUpgrading database structure...";
-
-        ($rs, $rdata) = get_file("$main::cfg{'ROOT_DIR'}/engine/setup/ispcp1.0.0rc3-ispcp.sql");
-        return $rs if ($rs != 0);
-
-        $rdata =~ s/\{DATABASE\}/$main::db_name/gi;
-        $rs = store_file("/tmp/db.sql", $rdata, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-        return $rs if ($rs != 0);
-
-        $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql");
-        if ($rs != 0) {
-        print STDOUT "failed!\n";
-                exit_werror("SQL Update failed.");
-        }
-
-    print STDOUT "done\n";
-
-        push_el(\@main::el, 'patch_ispcp_rc3()', 'Ending...');

trunk/engine/setup/ispcp1.0.0rc2-ispcp.sql

@@ -21 +21 @@
-'PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'
-),(
-3
+1
-);
-

trunk/engine/setup/ispcp1.0.0rc3-ispcp.sql

@@ -13 +13 @@
-ALTER DATABASE `ispcp` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
+-- BEGIN: Regenerate config files:
+UPDATE `domain` SET `domain_status` = 'change' WHERE `domain_status` = 'ok';
+UPDATE `subdomain` SET `subdomain_status` = 'change' WHERE `subdomain_status` = 'ok';
+UPDATE `domain_aliasses` SET `alias_status` = 'change' WHERE `alias_status` = 'ok';
+UPDATE `mail_users` SET `status` = 'change' WHERE `status` = 'ok';
+-- END: Regenerate config files
+
-COMMIT;

trunk/language-files/ru_RU.po

@@ -1 +1 @@
-#
-#, fuzzy
-msgid ""
-msgstr ""
@@ -6 +5 @@
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-01 18:49+0100\n"
-7-07-06 16:03-05
-FULL NAME <EMAIL@ADDRESS
+8-03-06 00:51+03
+Grundik <grundik@grundik.spb.ru
-"Language-Team: Russian <ru_RU@li.org>\n"
-"MIME-Version: 1.0\n"
@@ -22 +21 @@
-msgstr "Russian"
-
-#, fuzzy
-msgid "ispCP Omega a Virtual Hosting Control System"
-msgstr "ispCP - Виртуальная Система Управления Хостингом"
-
-msgid "Administrator login"
-
+Администраторативный входа
-
-msgid "Login"
@@ -36 +34 @@
-
-msgid "Password"
-
+Пароль
-
-msgid "Please enter your login information"
@@ -42 +40 @@
-
-msgid "Secure Connection"
-
+Безопасное соединение
-
-msgid "Normal Connection"
-
+Обычное соединение
-
-msgid "Lost password"
-
+Восстановление пароля
-
-msgid "Retrieving lost passwords is currently not possible"
-
+Восстановление паролей недоступно
-
-msgid "ispCP - Virtual Hosting Control System"
@@ -57 +55 @@
-
-msgid "Password sent"
-
+Пароль выслан
-
-msgid "ERROR: Password was not sent"
-
+Ошибка: пароль не выслан
-
-msgid "The password was requested"
-
+Пароль запрошен
-
-msgid "Back"
@@ -80 +78 @@
-msgstr "Секретный код"
-
-
-
-
-
+
+
-
-msgid "Request password"
-
+Запросить пароль
-
-msgid "ispCP - Admin/Manage users/Add User"
-
+ispCP - Администрирование/Управление пользователями/Добавить пользователя
-
-msgid "Administrator"
@@ -95 +91 @@
-
-msgid "Incorrect username length or syntax!"
-
+Некорректное имя пользователя!
-
-msgid "Incorrect password length or syntax!"
-
+Некорректный пароль!
-
-msgid "Entered passwords do not match!"
-
+Пароли не совпадают!
-
-msgid "Incorrect email length or syntax!"
-
+Некорректный email!
-
-msgid "This user name already exist!"
-
+Такой пользователь уже есть!
-
-msgid "Empty data or wrong field!"
@@ -113 +109 @@
-
-msgid "Passwords don't match!"
-
+Пароли не совпадают!
-
-msgid "Add admin"
@@ -119 +115 @@
-
-msgid "Core data"
-Данные ядра
+Основные сведения
-
-msgid "Repeat password"
-
+Повторите пароль
-
-msgid "Email"
@@ -134 +130 @@
-
-msgid "Last name"
-
+Фамилия
-
-msgid "Gender"
-
-
-
+
+
-msgid "Male"
-
-
-
+
+
-msgid "Female"
-Вебмыло
+Женский
-
-msgid "Unknown"
@@ -178 +172 @@
-
-msgid "ispCP - Admin/Manage users/Add reseller"
-
+ispCP - Администрирование/Управление пользователями/Добавить дилера
-
-msgid "Reseller IP list is empty!"
-
+Пустой список IP для дилера!
-
-msgid "No."
@@ -190 +184 @@
-
-msgid "Label"
-
+Метка
-
-msgid "Number"
@@ -196 +190 @@
-
-msgid "Reseller"
-
-
-
+
+
-msgid "Incorrect email syntax!"
-
-
-
+
+
-msgid "Incorrect domains limit!"
-
-
-
+
+
-msgid "Incorrect subdomains limit!"
-
-
-
+
+
-msgid "Incorrect aliases limit!"
-
-
-
+
+
-msgid "Incorrect FTP accounts limit!"
-
-
-
+
+
-msgid "Incorrect mail accounts limit!"
-
-
-
+
+
-msgid "Incorrect SQL databases limit!"
-
-
-
+
+
-msgid "Incorrect SQL users limit!"
-
-
-
+
+
-msgid "Incorrect traffic limit!"
-
-
-
+
+
-msgid "Incorrect disk quota limit!"
-Incorrect <i>max disk</i> amount or syntax
+Некорректный лимит дискового пространства
-
-msgid "You must assign at least one IP number for a reseller!"
-реселей
+диле
-
-msgid "Add reseller"
-
-
-
+
+
-msgid "Domains limit<br><i>(0 unlimited)</i>"
-
-
-
+
+
-msgid "Subdomains limit<br><i>(-1 disabled, 0 unlimited)</i>"
-
-
-
+
+
-msgid "Aliases limit<br><i>(-1 disabled, 0 unlimited)</i>"
-Винтовой лимит [MB]<br><i>(
+Лимит псевдонимов<br><i>(-1 отключены, 
-
-msgid "Mail accounts limit<br><i>(-1 disabled, 0 unlimited)</i>"
-
+Лимит почтовых аккаунтов<br><i>(-1 отключены, 0 - не ограничено)</i>
-
-msgid "FTP accounts limit<br><i>(-1 disabled, 0 unlimited)</i>"
-
+Лимит FTP аккаунтов<br><i>(-1 отключены, 0 - не ограничено)</i>
-
-msgid "SQL databases limit<br><i>(-1 disabled, 0 unlimited)</i>"
-
+Лимит SQL баз<br><i>(-1 отключены, 0 - не ограничено)</i>
-
-msgid "SQL users limit<br><i>(-1 disabled, 0 unlimited)</i>"
-
+Лимит SQL пользователей<br><i>(-1 отключены, 0 - не ограничено)</i>
-
-msgid "Traffic limit [MB]<br><i>(0 unlimited)</i>"
-
+Лимит трафика<br><i>(0 - не ограничено)</i>
-
-msgid "Disk limit [MB]<br><i>(0 unlimited)</i>"
-Винтовой лимит [MB
+Лимит дискового пространства [Мб
-
-msgid "PHP"
@@ -296 +277 @@
-
-msgid "Protected areas"
-
+Защищенные области
-
-msgid "Webmail"
@@ -311 +292 @@
-
-msgid "Logo upload"
-о
+и
-
-msgid "yes"
@@ -320 +301 @@
-
-msgid "Reseller IPs"
-
+IP дилера
-
-msgid "Customer ID"
@@ -326 +307 @@
-
-msgid "ispCP - Admin/Admin Log"
-
+ispCP - Администрирование/Журнал
-
-msgid "Log is empty!"
-Лог
+Журнал
-
-#, php-format
-msgid "%s deleted the full admin log!"
-
+%s удалил весь журнал!
-
-#, php-format
-msgid "%s deleted the admin log older than two weeks!"
-
+%s очистил журнал от записей старше двух недель!
-
-#, php-format
-msgid "%s deleted the admin log older than one month!"
-
+%s очистил журнал от записей старше месяца!
-
-#, php-format
-msgid "%s deleted the admin log older than three months!"
-
+%s очистил журнал от записей старше трех месяцев!
-
-#, php-format
-msgid "%s deleted the admin log older than six months!"
-
+%s очистил журнал от записей старше шесть месяцев!
-
-#, php-format
-msgid "%s deleted the admin log older than one year!"
-
+%s очистил журнал от записей старше года!