Changeset 441

Timestamp:

03/27/07 00:13:36 (2 years ago)

Author:

rats

Message:

- ENGINE:

• restructured: vhcs2.conf
  
• changed: logical structure for MYSQL_PREFIX (YES = prefix; no = no prefix)
  

- GUI:

• deleted: images for old error pages: not longer supported
  

- SETUP:

• changed: Uninstaller
  

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/configs/vhcs2.conf (modified) (12 diffs)
• trunk/engine/setup/vhcs2-uninstall (modified) (15 diffs)
• trunk/engine/vhcs2-als-mngr (modified) (7 diffs)
• trunk/engine/vhcs2-dmn-mngr (modified) (7 diffs)
• trunk/gui/admin/add_reseller.php (modified) (2 diffs)
• trunk/gui/admin/add_user.php (modified) (2 diffs)
• trunk/gui/client/add_sql_database.php (modified) (2 diffs)
• trunk/gui/client/index.php (modified) (2 diffs)
• trunk/gui/client/language.php (modified) (2 diffs)
• trunk/gui/client/puser_assign2.php (modified) (2 diffs)
• trunk/gui/client/sql_add_user.php (modified) (2 diffs)
• trunk/gui/include/layout-functions.php (modified) (6 diffs)
• trunk/gui/include/login.php (modified) (3 diffs)
• trunk/gui/include/system-message.php (modified) (1 diff)
• trunk/gui/index.php (modified) (1 diff)
• trunk/gui/lostpassword.php (modified) (2 diffs)
• trunk/gui/reseller/index.php (modified) (3 diffs)
• trunk/gui/reseller/language.php (modified) (2 diffs)
• trunk/gui/reseller/orders_add.php (modified) (2 diffs)
• trunk/gui/reseller/rau3.php (modified) (1 diff)
• trunk/gui/themes/blue (deleted)

trunk/CHANGELOG

@@ -11 +11 @@
-\_________________________________________________________________/
-
-
+
+
+
+
+
+
+
+
+
+
-        - ENGINE:
-                * fixed bug #125: edited a lot of permissions

trunk/configs/vhcs2.conf

@@ -1 @@
-
-
-
+
+
+
+
+
+
+
+
-#
-
-BuildDate = 20070319
-
-
-
-
-
-
+
-
-VersionH = 2.4 Rhea
-
-LOGIN_TIME_OUT = 20
-
-DEFAULT_ADMIN_ADDRESS =
-
@@ -26 +25 @@
-MR_LOCK_FILE = /tmp/vhcs2.lock
-
+#
+# File system variables
+#
+
+CMD_AWK = /usr/bin/awk
+
+CMD_CHOWN = /bin/chown
+
+CMD_CAT = /bin/cat
+
+CMD_CP = /bin/cp
+
+CMD_DIFF = /usr/bin/diff
+
+CMD_DU = /usr/bin/du
+
+CMD_ECHO = /bin/echo
+
-CMD_HOSTNAME = /bin/hostname
-
-CMD_IFCONFIG = /sbin/ifconfig
-
+CMD_IPTABLES = /sbin/iptables
+
+CMD_GREP = /bin/grep
+
+CMD_GROUPADD = /usr/sbin/groupadd
+
+CMD_GROUPDEL = /usr/sbin/groupdel
+
+CMD_LN = /bin/ln
+
+CMD_MYSQL = /usr/bin/mysql
+
+CMD_MV = /bin/mv
+
+CMD_PS = /bin/ps
+
+CMD_RM = /bin/rm
+
+CMD_TAR = /bin/tar
+
-CMD_USERADD = /usr/sbin/useradd
-
-CMD_USERDEL = /usr/sbin/userdel
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-FTPD_CONF_FILE = /etc/proftpd.conf
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-#
-
@@ -91 +132 @@
-
-#
-.
+
-#
-# Either no or path to the awstats configs dir (mostly: /etc/awstats)
-AWSTATS_DIR = no
-
+AWSTSTS_ROOT_DIR = /var/www/vhcs2/engine/awstats
+
-AWSTATS_WEB_DIR = /var/www/awstats
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-APACHE_CMD = /usr/sbin/apache2
-
-APACHE_NAME = apache2
-
-APACHE_RESTART_TRY = 3
-
-APACHE_WWW_DIR = /var/www/virtual
-
-APACHE_LOG_DIR = /var/log/apache2
-
+APACHE_BACKUP_LOG_DIR = /var/log/apache2/backup
+
-APACHE_USERS_LOG_DIR = /var/log/apache2/users
-
-BACKUP_LOG_DIR = /var/log/apache2/backup
+MODS_DIR = /etc/apache2/mods-available
-
-APACHE_SITES_DIR = /etc/apache2/sites-available
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-APACHE_SUEXEC_MIN_UID = 2000
-
-APACHE_SUEXEC_MIN_GID = 2000
-
-APACHE_SUEXEC_USER_PREF = vu
-
-#
-# APACHE directory data.
-#
-
-APACHE_USER = www-data
-
@@ -149 +175 @@
-
-#
-.
+
-#
-
@@ -198 +224 @@
-CMD_NEWALIASES = /usr/bin/newaliases
-
-
-
-
-
-
-
+
+
-#
-
@@ -213 +235 @@
-
-#
-.
+
-#
-
@@ -225 +247 @@
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-# Either no or path to the amavis-daemon (mostly: /etc/init.d/amavis)
-CMD_AMAVIS = no
-
+CMD_AUTHD = /etc/init.d/courier-authdaemon
+
-CMD_FTPD = /etc/init.d/proftpd
-
+CMD_HTTPD = /usr/sbin/apache2ctl
+
+CMD_IMAP = /etc/init.d/courier-imap
+
+CMD_IMAP_SSL = /etc/init.d/courier-imap-ssl
+
+CMD_MTA = /etc/init.d/postfix
+
+CMD_NAMED = /etc/init.d/bind9
+
+CMD_POP = /etc/init.d/courier-pop
+
+CMD_POP_SSL = /etc/init.d/courier-pop-ssl
+
-CMD_VHCS2D = /etc/init.d/vhcs2_daemon
-
@@ -262 +276 @@
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-CMD_PFLOGSUM = /usr/sbin/maillogconvert.pl
@@ -289 +287 @@
-MAIL_TRAFF_LOG = mail.log
-
+PREV_TRAFF_LOG_MAX_SIZE = 10485760
+
+TRAFF_ROOT_DIR = /var/www/vhcs2/engine/traffic
+
+TOOLS_ROOT_DIR = /var/www/vhcs2/engine/tools
+
+QUOTA_ROOT_DIR = /var/www/vhcs2/engine/quota
+
+#
+# AMaViS data
+#
+
-MAIL_LOG_INC_AMAVIS = 0
-
-
-
-
-
-
-
-
-
+
+
-#
-
-USER_INITIAL_THEME = omega_original
-
-USER_INITIAL_THEME_COLOR = blue
-
-USER_LAYOUT_ID = 1
-
-VHCS_LICENSE = VHCS<sup>&reg;</sup>2.4.8 OMEGA<br />build: 2007-03-19<br />Rhea
-
-MINIMAL_FTP_UID = 2000
-
-MINIMAL_FTP_GID = 2000
-
-FTP_USERNAME_SEPARATOR = @
-
@@ -325 +321 @@
-VHCS_SUPPORT_SYSTEM_TARGET =
-
-
-
-
+
+
+
+
-MYSQL_PREFIX_TYPE =
-
@@ -345 +342 @@
-
-#
- (21.04.2005).
+
-#
-
@@ -355 +352 @@
-
-#
- (16.05.2005).
+
-#
-

trunk/engine/setup/vhcs2-uninstall

@@ -1 +1 @@
-#!/usr/bin/perl
-
-(tm) - Virtual Hosting Control System
+ ω (OMEGA) - Virtual Hosting Control System | Omega Version
-# Copyright (c) 2001-2006 by moleSoftware GmbH
-# http://www.molesoftware.com
@@ -31 +31 @@
-#
-
-
-
-use FindBin;
-use lib "$FindBin::Bin/..";
@@ -38 +36 @@
-
-use strict;
-
-use warnings;
-
@@ -51 +48 @@
-    my $welcome_message = <<MSG;
-
-
-
-
-
+
+
+
+
+
-
-    Please press 'Enter' to continue.
@@ -61 +59 @@
-    print STDOUT $welcome_message;
-
-
+
+
-
-    push_el(\@main::el, 'welcome_note()', 'Ending...');
@@ -115 +114 @@
-    Congratulations !
-
-2
-
-our
+ OMEGA
+
+VHCS OMEGA
-
-MSG
@@ -190 +189 @@
-    my ($fuid, $fgid) = ($main::cfg{'MTA_MAILBOX_UID_NAME'}, $main::cfg{'MTA_MAILBOX_GID_NAME'});
-
+    my ($muid, $mgid) = ($main::cfg{'APACHE_SUEXEC_MIN_UID'}, $main::cfg{'APACHE_SUEXEC_MIN_GID'});
+
-    my ($uid, $gid) = (undef, undef);
-
@@ -197 +198 @@
-    my @gdata = ();
-
-
-
+
+
+
-    @udata = getpwnam($fuid);
+    @gdata = getgrnam($fuid);
-
-    if (scalar(@udata) != 0) { # we have not this one user data;
@@ -211 +214 @@
-    }
-
-    @gdata = getgrnam($fuid);
-
-    if (scalar(@gdata) != 0) { # we have not this one group data;
-
@@ -223 +224 @@
-    }
-
+    #
+    # PHP Master
+    #
+    @udata = getpwnam($muid);
+    @gdata = getgrnam($muid);
+
+    if (scalar(@udata) != 0) { # we have not this one user data;
+
+        my $cmd = "$main::cfg{'CMD_USERDEL'} $muid";
+
+        $rs = sys_command($cmd);
+
+        return $rs if ($rs != 0);
+
+    }
+
+    if (scalar(@gdata) != 0) { # we have not this one group data;
+
+        my $cmd = "$main::cfg{'CMD_GROUPDEL'} $muid";
+
+        $rs = sys_command($cmd);
+
+        return $rs if ($rs != 0);
+
+    }
+
-    push_el(\@main::el, 'uninstall_system_users()', 'Ending...');
-
@@ -256 +283 @@
-
-    $rs = del_dir($main::cfg{'LOG_DIR'});
+
+    return $rs if ($rs != 0);
+
+    $rs = del_dir($main::cfg{'PHP_STARTER_DIR'});
-
-    return $rs if ($rs != 0);
@@ -406 +437 @@
-        return $rs if ($rs != 0);
-
-
-    }
-
@@ -433 +463 @@
-    sys_command_rs("$main::cfg{'CMD_HTTPD'} stop &> /tmp/vhcs2-uninstall-services.log");
-
+    sys_command_rs("a2dissite vhcs2.conf &> /tmp/vhcs2-uninstall-services.log");
+
-    $rs = del_file($main::cfg{'APACHE_SITES_DIR'}/vhcs2.conf);
-
-    return $rs if ($rs != 0);
-
+    sys_command_rs("a2dissite master.conf &> /tmp/vhcs2-uninstall-services.log");
+
-    $rs = del_file($main::cfg{'APACHE_SITES_DIR'}/master.conf);
-
-    return $rs if ($rs != 0);
-
+    sys_command_rs("a2dismod fastcgi &> /tmp/vhcs2-uninstall-services.log");
+
+    $rs = del_file($main::cfg{'APACHE_MODS_DIR'}/fastcgi.conf);
+
+    return $rs if ($rs != 0);
+
-    sleep(5);
-
@@ -763 +803 @@
-}
-
+################################################################################
+##                                    MAIN                                    ##
+################################################################################
+
-my $rs = undef;
-
@@ -834 +878 @@
-
-}
-

trunk/engine/vhcs2-als-mngr

@@ -1646 +1646 @@
-    my $www_dir = $main::cfg{'APACHE_WWW_DIR'};
-
+        my $httpd_gid = $main::cfg{'APACHE_GROUP'};
+
-    my ($sys_uid, $sys_gid) = get_dmn_suexec_user($dmn_id);
-
@@ -1660 +1662 @@
-                   "$www_dir/$als_name",
-                   $sys_user,
-sys_group
+httpd_gid
-                   0770
-                  );
@@ -1687 +1689 @@
-                   "$www_dir/$als_name/logs",
-                   $sys_user,
-sys_group
+httpd_gid
-                   0770
-                  );
@@ -1696 +1698 @@
-                   "$www_dir/$als_name/phptmp",
-                   $sys_user,
-sys_group
+httpd_gid
-                   0770
-                  );
@@ -1705 +1707 @@
-                   "$www_dir/$als_name/backups",
-                   $sys_user,
-sys_group
+httpd_gid
-                   0770
-                  );
@@ -1764 +1766 @@
-                               "\n",
-                               $sys_user,
-sys_group
+httpd_gid
-                               0660
-                              );
@@ -1774 +1776 @@
-                               "\n",
-                               $sys_user,
-sys_group
+httpd_gid
-                               0660
-                              );

trunk/engine/vhcs2-dmn-mngr

@@ -1755 +1755 @@
-        my $conf_dir = $main::cfg{'CONF_DIR'};
-
+        my $httpd_gid = $main::cfg{'APACHE_GROUP'};
+
-        my ($sys_uid, $sys_gid) = get_dmn_suexec_user($dmn_id);
-
@@ -1811 +1813 @@
-                                        "$www_dir/$dmn_name",
-                                        $sys_user,
-sys_group
+httpd_gid
-                                        0770
-                                        );
@@ -1838 +1840 @@
-                                        "$www_dir/$dmn_name/logs",
-                                        $sys_user,
-sys_group
+httpd_gid
-                                        0770
-                                        );
@@ -1847 +1849 @@
-                                        "$www_dir/$dmn_name/phptmp",
-                                        $sys_user,
-sys_group
+httpd_gid
-                                        0770
-                                        );
@@ -1856 +1858 @@
-                                        "$www_dir/$dmn_name/backups",
-                                        $sys_user,
-sys_group
+httpd_gid
-                                        0770
-                                        );
@@ -1915 +1917 @@
-                                                                "\n",
-                                                                $sys_user,
-sys_group
+httpd_gid
-                                                                0640
-                                                                );
@@ -1925 +1927 @@
-                                                                "\n",
-                                                                $sys_user,
-sys_group
+httpd_gid
-                                                                0640
-                                                                );

trunk/gui/admin/add_reseller.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-include '../include/vhcs-lib.php';
@@ -239 +241 @@
-
-                        $user_def_lang = $_SESSION['user_def_lang'];
-_color
+
-                        $user_logo = 0;
-

trunk/gui/admin/add_user.php

@@ -1 +1 @@
-<?php
-/   -------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-include '../include/vhcs-lib.php';
@@ -130 +130 @@
-
-                                $user_def_lang = $_SESSION['user_def_lang'];
-_color
+
-                                $user_logo = 0;
-

trunk/gui/client/add_sql_database.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-include '../include/vhcs-lib.php';
@@ -38 +39 @@
-{
-  global $cfg;
-no
+yes
-    $tpl -> assign('MYSQL_PREFIX_YES', '');
-  } else {

trunk/gui/client/index.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-function gen_num_limit_msg($num, $limit) {
@@ -391 +393 @@
-} else {
-
-_color
+
-
-                $user_def_lang = $_SESSION['user_def_lang'];

trunk/gui/client/language.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-include '../include/vhcs-lib.php';
@@ -67 +68 @@
-} else {
-
-_color
+
-
-