Changeset 418

Timestamp:

03/19/07 01:45:46 (2 years ago)

Author:

rats

Message:

* fixed typo: DEFAULT_ADMIN_ADDRES
- CONFIGS:

• fixed bugs #95 and #108: administrative domain created on Setup
  

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/configs/apache/httpd.conf (modified) (1 diff)
• trunk/configs/apache/parts/dmn_entry.tpl (modified) (3 diffs)
• trunk/configs/vhcs2.conf (modified) (2 diffs)
• trunk/engine/setup/vhcs2-setup (modified) (15 diffs)
• trunk/engine/setup/vhcs2-uninstall (modified) (3 diffs)
• trunk/engine/vhcs2-als-mngr (modified) (4 diffs)
• trunk/engine/vhcs2-dmn-mngr (modified) (4 diffs)
• trunk/engine/vhcs2-sub-mngr (modified) (4 diffs)
• trunk/gui/errordocs/index.php (modified) (1 diff)
• trunk/gui/include/admin-functions.php (modified) (1 diff)
• trunk/gui/include/security/core.inc.php (modified) (1 diff)

trunk/CHANGELOG

@@ -11 +11 @@
-|               * gui: disable stats-alias in client menu         |
-\_________________________________________________________________/
+
+2007-03-18 Benedikt Heintel
+        * fixed typo: DEFAULT_ADMIN_ADDRES
+        - CONFIGS:
+                * fixed bugs #95 and #108: administrative domain created on Setup
-
-2007-03-17 Benedikt Heintel

trunk/configs/apache/httpd.conf

@@ -16 +16 @@
-
-LogFormat "%B" traff
-
-#
-# GUI Location.
-#
-
-Alias /vhcs2 /var/www/vhcs2/gui
-<Directory /var/www/vhcs2/gui>
-    AllowOverride none
-    Options MultiViews IncludesNoExec FollowSymLinks
-    ErrorDocument 404 /vhcs2/errordocs/index.php
-    DirectoryIndex index.html index.php
-</Directory>
-
-<Directory /var/www/vhcs2/gui/tools/filemanager>
-    <IfModule mod_php4.c>
-        php_flag register_globals On
-        php_admin_value open_basedir "/var/www/vhcs2/gui/tools/filemanager/:/tmp/:/usr/share/php/"
-    </IfModule>
-</Directory>
-
-Alias /vhcs_images /var/www/vhcs2/gui/images
-<Directory /var/www/vhcs2/gui/images>
-    AllowOverride none
-    Options MultiViews IncludesNoExec FollowSymLinks
-</Directory>
-
-#
-# Default GUI.
-#
-
-# Temporary changed; now it's working
-# will be replaced in future
-<VirtualHost {HOST_IP}:80>
-
-    DocumentRoot /var/www/vhcs2/gui
-
-    <IfModule mod_fastcgi.c>
-           SuexecUserGroup vu2000 vu2000
-    </IfModule>
-
-    <Directory /var/www/vhcs2/gui>
-        Options Indexes Includes FollowSymLinks MultiViews
-        AllowOverride None
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-    <IfModule mod_fastcgi.c>
-        ScriptAlias /php4/ /var/www/fcgi/master/
-        <Directory "/var/www/fcgi/master">
-            AllowOverride None
-            Options +ExecCGI MultiViews Indexes
-            Order allow,deny
-            Allow from all
-        </Directory>
-    </IfModule>
-
-</VirtualHost>
-
-#

trunk/configs/apache/parts/dmn_entry.tpl

@@ -1 +1 @@
-<VirtualHost {DMN_IP}:80>
-
-
+
+
+
-
-    ServerAdmin     root@{DMN_NAME}
@@ -17 +19 @@
-    Alias /errors   {WWW_DIR}/{DMN_NAME}/errors/
-
-    Redirect /stats http://{DMN_NAME}/awstats/awstats.pl
-
-    ErrorDocument 401 /errors/401/index.php
-    ErrorDocument 403 /errors/403/index.php
-    ErrorDocument 404 /errors/404/index.php
-    ErrorDocument 500 /errors/500/index.php
+
+    Redirect /stats http://{DMN_NAME}/awstats/awstats.pl
+    Redirect /vhcs2 http://{BASE_SERVER_VHOST}
-
-    # httpd dmn entry cgi support BEGIN.
@@ -39 +42 @@
-    <IfModule mod_php4.c>
-        <Directory {GUI_ROOT_DIR}>
-tmp/:/
+
-            php_admin_value session.save_path "{GUI_ROOT_DIR}/phptmp/"
-        </Directory>

trunk/configs/vhcs2.conf

@@ -16 +16 @@
-LOGIN_TIME_OUT = 20
-
-
+S
-
-SERVER_HOSTNAME = debian
-
-BASE_SERVER_IP = 127.0.0.1
+
+BASE_SERVER_VHOST =
-
-MR_LOCK_FILE = /tmp/vhcs2.lock
@@ -120 +122 @@
-APACHE_BACKUP_LOG_DIR = /var/log/apache2/backup
-
-CONF_FILE = /etc/apache2/sites-available/vhcs2.conf
+SITES_DIR = /etc/apache2/sites-available
-
-APACHE_CONF_DIR = /etc/apache2

trunk/engine/setup/vhcs2-setup

@@ -37 +37 @@
-
-use strict;
-
-use warnings;
+use Socket;
-
-##############################################################################
@@ -172 +172 @@
-        my $eth = $rdata;
-
-#       my $eth = '192.168.0.128';
-
-        my $qmsg = "\n    Please enter system network address (Enter for defaults) [$eth]: ";
-
@@ -332 +330 @@
-
-                } else {
-
+
-                        return 1;
-
@@ -402 +400 @@
-
-                } else {
-
+
-                        return 1;
-
@@ -453 +451 @@
-                        $main::ua{'db_pma_password'} = $pass1;
-                } else {
+                        print STDOUT "\n    Passwords do not match!";
-                        return 1;
-                }
@@ -544 +543 @@
-        } else {
-
-
-
-
+
-
-                        $main::ua{'admin_email'} = $rdata;
-
-                } else {
-
+
-                        return 1;
-
@@ -564 +561 @@
-}
-
+ask_vhost {
+
+        my ($rs, $rdata) = (undef, undef);
+
+        push_el(\@main:el, 'ask_vhost()', 'Starting...');
+
+        my $vhost = "admin.".gethostbyaddr($main::ua{'eth'}, AF_INET);
+
+        my $qmsg = "\n    Please enter the domain name VHCS OMEGA will run on [$vhost]: ";
+
+        print STDOUT $qmsg;
+
+        $rdata = readline(\*STDIN); chop($rdata);
+
+        if (!defined($rdata) || $rdata eq '') {
+                return 1;
+        }
+        else {
+                if ($rdata =~ /^([\w][\w-]{0,253}[\w]\.)*([\w][\w-]{0,253}[\w])\.([a-zA-Z]{2,6})$/) {
+                        $main::ua{'admin_vhost'} = $rdata;
+                }
+                else {
+                        print STDOUT "\n    Vhost not valid!";
+                        return 1;
+                }
+
+        }
+
+        push_el(\@main::el, 'ask_vhost()', 'Ending...');
+
+        return 0;
+}
+
-
-sub user_dialog {
@@ -586 +616 @@
-
-        } while (check_eth() == 0);
+
+        do {
+                $rs = ask_vhost();
+
+                return $rs if ($rs != 0);
+        } while (ask_chost() == 0);
-
-        #
@@ -654 +690 @@
-
-        #push_el(\@main::el, 'user_dialog()',  "eth: $main::ua{'eth'}");
+
+        push_el(\@main::el, 'user_dialog()',  "panel_vhost: $main::ua{'admin_vhost'}");
-
-        push_el(\@main::el, 'user_dialog()',  "db_host: $main::ua{'db_host'}");
@@ -968 +1006 @@
-        return $rs if ($rs != 0);
-
+        $rs = set_conf_val('BASE_SERVER_VHOST', $main::ua{'admin_vhost'});
+
+        return $rs if ($rs != 0);
+
-        $rs = set_conf_val('DATABASE_HOST', $main::ua{'db_host'});
-
@@ -1012 +1054 @@
-        return $rs if ($rs != 0);
-
-
+S
-
-        $rs = store_conf();
@@ -1653 +1695 @@
-        }
-
+        #
+        # Master file
+        #
+
+        ($rs, $cfg_tpl) = get_file("$cfg_dir/master.conf");
+
+        return $rs if ($rs != 0);
+
+        my %tag_hash = (
+                                        '{BASE_SERVER_IP}'                      => $main::cfg{'BASE_SERVER_IP'},
+                                        '{BASE_SERVER_VHOST}'           => $main::cfg{'BASE_SERVER_VHOST'},
+                                        '{DEFAULT_ADMIN_ADDRESS}'       => $main::cfg{'DEFAULT_ADMIN_ADDRESS'},
+                                        '{ROOT_DIR}'                            => $main::cfg{'ROOT_DIR'},
+                                        '{APACHE_USERS_LOG_DIR}'        => $main::cfg{'APACHE_USERS_LOG_DIR'},
+                                        '{APACHE_LOG_DIR}'                      => $main::cfg{'APACHE_LOG_DIR'},
+                                        '{PHP_STARTER_DIR}'             => $main::cfg{'PHP_STARTER_DIR'}
+                                        );
+
+        ($rs, $cfg) = prep_tpl(\%tag_hash, $cfg_tpl);
+
+        return $rs if ($rs != 0);
+
+        $rs = store_file($main::cfg{'APACHE_SITES_DIR'}/master.conf, $cfg, 'root', 'root', 0644);
+
+        return $rs if ($rs != 0);
+
+    $rs = add_named_cfg_data($main::cfg{'BASE_SERVER_VHOST'});
+
+    return $rs if ($rs != 0);
+
+    $rs = add_named_db_data($main::cfg{'BASE_SERVER_IP'}, $main::cfg{'BASE_SERVER_VHOST'});
+
+    return $rs if ($rs != 0);
+
+        #
+        # Default vhost file
+        #
+
-        ($rs, $cfg_tpl) = get_file("$cfg_dir/httpd.conf");
-
@@ -1665 +1745 @@
-        return $rs if ($rs != 0);
-
-
-
-
+
+
+
+
+
-
-        if ( -e "/usr/sbin/a2ensite" ) {
-
-                sys_command_rs("/usr/sbin/a2ensite vhcs2.conf &> /tmp/vhcs2-setup-services.log");
+                sys_command_rs("/usr/sbin/a2ensite master.conf &> /tmp/vhcs2-setup-services.log");
-
-        }
@@ -1681 +1764 @@
-        if (-e "/usr/sbin/a2dissite") {
-
-
+       
-
-        }
@@ -1723 +1806 @@
-        return 0;
-
+}
+
+#
+# Add Bind CFG
+#
+
+sub add_named_cfg_data {
+
+    my ($base_vhost) = @_;
+
+    my ($rs, $rdata) = (undef, undef);
+
+    push_el(\@main::el, 'add_named_cfg_data()', 'Starting...');
+
+    if (!defined($dmn_data) || $dmn_data eq '') {
+        push_el(\@main::el, 'add_named_cfg_data()', 'ERROR: Undefined Input Data...');
+        return -1;
+    }
+
+    #
+    # Initial data we need;
+    #
+
+    my $conf_dir = $main::cfg{'CONF_DIR'};
+
+    my $sys_cfg = $main::cfg{'BIND_CONF_FILE'};
+
+    my $named_db_dir = $main::cfg{'BIND_DB_DIR'};
+
+
+    my $tpl_dir = "$conf_dir/bind/parts";
+
+    my $backup_dir = "$conf_dir/bind/backup";
+
+    my $working_dir = "$conf_dir/bind/working";
+
+
+    my $timestamp = time;
+
+    my $backup_cfg = "$backup_dir/named.conf.$timestamp";
+
+    my $working_cfg = "$working_dir/named.conf";
+
+    #
+    #  BEGIN/END tags, and templates needed for this config;
+    #
+
+    my ($dta_b, $dta_e, $entry_b, $entry_e, $entry) = ('', '', '', '', '');
+
+    (
+     $rs,
+     $dta_b,
+     $dta_e,
+     $entry_b,
+     $entry_e,
+     $entry
+    ) = get_tpl(
+                $tpl_dir,
+                'cfg_dta_b.tpl',
+                'cfg_dta_e.tpl',
+                'cfg_entry_b.tpl',
+                'cfg_entry_e.tpl',
+                'cfg_entry.tpl'
+               );
+
+    return $rs if ($rs != 0);
+
+    #
+    # Let's construct nedded tags and entries;
+    #
+
+    my %tag_hash = (
+                    '{DMN_NAME}' => $base_vhost,
+                    '{DB_DIR}' => $named_db_dir
+                   );
+
+    my ($entry_b_val, $entry_e_val, $entry_val) = ('', '', '');
+
+    (
+     $rs,
+     $entry_b_val,
+     $entry_e_val,
+     $entry_val
+    ) = prep_tpl(
+                 \%tag_hash,
+                 $entry_b,
+                 $entry_e,
+                 $entry
+                );
+
+    return $rs if ($rs != 0);
+
+    #
+    # Let's get Sytem and Workind config files;
+    #
+
+    my ($sys, $working) = ('', '');
+
+
+    ($rs, $sys) = get_file($sys_cfg);
+
+    return $rs  if ($rs != 0);
+
+    ($rs, $working) = get_file($working_cfg);
+
+    return $rs  if ($rs != 0);
+
+    ($rs, $rdata) = get_tag($dta_b, $dta_e, $working);
+
+    return $rs if ($rs != 0);
+
+    #
+    # Is the new domain entry exists ?
+    #
+
+    ($rs, $rdata) = get_tag($entry_b_val, $entry_e_val, $working);
+
+    if ($rs == 0) {
+
+        # Yes it exists ! Then we must delete it !
+
+        ($rs, $working) = del_tag($entry_b_val, "$entry_e_val\n", $working);
+
+        return $rs if ($rs != 0);
+
+    }
+
+    ($rs, $rdata) = get_tag($entry_b, $entry_e, $working);
+
+    return $rs if ($rs != 0);
+
+    #
+    # Let's contruct the replacement and do it;
+    #
+
+    my $entry_repl = "$entry_b_val$entry_val$entry_e_val\n$entry_b$entry_e";
+
+    ($rs, $working) = repl_tag($entry_b, $entry_e, $working, $entry_repl);
+
+    return $rs if ($rs != 0);
+
+    #
+    # Here we'll backup production config file;
+    #
+
+    $rs = sys_command("cp -p $sys_cfg $backup_cfg");
+
+    return $rs if ($rs != 0);
+
+    #
+    # Let's save working copy;
+    #
+
+    $rs = store_file($working_cfg, $working, 'root', 'root', 0644);
+
+    return $rs if ($rs != 0);
+
+    #
+    # Here we'll replace data in production config file with data in working
+    # confing file. A little workaround will be done. If working copy data does not exist
+    # in production config then we will add it;
+    #
+
+    ($rs, $rdata) = get_tag($dta_b, $dta_e, $sys);
+
+    if ($rs == 0) { # YES ! Data is here ! /in production config file/;
+
+        ($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working);
+
+        return $rs if ($rs != 0);
+
+    } elsif ($rs == -5) {
+
+        $sys .= $working;
+
+    } else {
+
+        return $rs;
+
+    }
+
+    $rs = store_file($sys_cfg, $sys, 'root', 'root', 0644);
+
+    return $rs if ($rs != 0);
+
+
+    push_el(\@main::el, 'add_named_cfg_data()', 'Ending...');
+
+    return 0;
+}
+
+#
+# Add DNS DB Data
+#
+
+sub add_named_db_data {
+
+    my ($base_ip, $base_vhost) = @_;
+
+    my ($rs, $rdata) = (undef, undef);
+
+    push_el(\@main::el, 'add_named_db_data()', 'Starting...');
+
+    if (!defined($dmn_data) || $dmn_data eq '') {
+        push_el(\@main::el, 'add_named_db_data()', 'ERROR: Undefined Input Data...');
+        return -1;
+    }
+
+    #
+    # Initial data we need;
+    #
+
+    my $conf_dir = $main::cfg{'CONF_DIR'};
+
+    my $named_db_dir = $main::cfg{'BIND_DB_DIR'};
+
+    my $sec_dns_ip = $main::cfg{'SECONDARY_DNS'};
+
+    #
+    # Any secondary DNS defined;
+    #
+
+        if (!$sec_dns_ip) {
+                $sec_dns_ip = $base_ip;
+        }
+
+    my $tpl_dir = "$conf_dir/bind/parts";
+
+    my $backup_dir = "$conf_dir/bind/backup";
+
+    my $working_dir = "$conf_dir/bind/working";
+
+
+    my $db_fname = "$base_vhost.db";
+
+
+    my $sys_cfg = "$named_db_dir/$db_fname";
+
+    my $working_cfg = "$working_dir/$db_fname";
+
+    #
+    # Let's get needed tags and templates;
+    #
+
+    my ($entry, $dns2_b, $dns2_e) = ('', '', '');
+
+    ($rs, $entry, $dns2_b, $dns2_e) = get_tpl(
+                                              $tpl_dir,
+                                              'db_master_e.tpl',
+                                              'db_dns2_b.tpl',
+                                              'db_dns2_e.tpl'
+                                             );
+
+    return $rs if ($rs != 0);
+
+        #
+        # RFC 1912
+        #
+
+        my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+
+        my $time2 = sprintf "%4d%02d%02d00",$year+1900,$mon+1,$mday;
+
+    #
+    # Let's prepare them;
+    #
+
+    my %tag_hash = (
+                    '{DMN_NAME}' => $base_vhost,
+                    '{DMN_IP}' => $base_ip,
+                    '{BASE_SERVER_IP}' => $base_ip,
+                    '{SECONDARY_DNS_IP}' => $sec_dns_ip,
+                    '{TIMESTAMP}' => $time2
+                   );
+
+    ($rs, $entry, $dns2_b, $dns2_e) = prep_tpl(
+                                               \%tag_hash,
+                                               $entry,
+                                               $dns2_b,
+                                               $dns2_e
+                                              );
+
+    return $rs if ($rs != 0);
+
+    #
+    # Let's store generated data;
+    #
+
+    $rs = store_file($working_cfg, $entry, 'root', 'root', 0644);
+
+    return $rs if ($rs != 0);
+
+    $rs = store_file($sys_cfg, $entry, 'root', 'root', 0644);
+
+    return $rs if ($rs != 0);
+
+    push_el(\@main::el, 'add_named_db_data()', 'Ending...');
+
+
+    return 0;
-}
-

trunk/engine/setup/vhcs2-uninstall

@@ -2 +2 @@
-
-# VHCS(tm) - Virtual Hosting Control System
-4
+6
-# http://www.molesoftware.com
+# Copyright (c) 2006-2007 by isp Control Panel
+# http://isp-control.net
-#
-#
@@ -24 +26 @@
-#
-#
-
+ω 
-#
-
+
+
-
-
@@ -430 +433 @@
-    sys_command_rs("$main::cfg{'CMD_HTTPD'} stop &> /tmp/vhcs2-uninstall-services.log");
-
-
+
+
+
+
+
-
-    return $rs if ($rs != 0);

trunk/engine/vhcs2-als-mngr

@@ -2 +2 @@
-
-# VHCS(tm) - Virtual Hosting Control System
-4
+6
-# http://www.molesoftware.com
+# Copyright (c) 2006-2007 by isp Control Panel
+# http://isp-control.net
-#
-#
@@ -24 +26 @@
-#
-#
-
+ω 
-#
-
+
+
-
-
@@ -1059 +1062 @@
-
-
-CONF_FILE'}
+SITES_DIR'}/vhcs2.conf
-
-    my $working_cfg = "$working_dir/vhcs2.conf";
@@ -1398 +1401 @@
-
-
-CONF_FILE'}
+SITES_DIR'}/vhcs2.conf
-
-    my $working_cfg = "$working_dir/vhcs2.conf";

trunk/engine/vhcs2-dmn-mngr

@@ -587 +587 @@
-
-        #
- template fix by Puuhis ;)
+
-        #
-
@@ -950 +950 @@
-         '{DMN_NAME}' => $dmn_name,
-         '{DMN_IP}' => $dmn_ip,
+         '{BASE_SERVER_VHOST}' => $main::cfg{'BASE_SERVER_VHOST'},
-         '{WWW_DIR}' => $main::cfg{'APACHE_WWW_DIR'},
-         '{STARTER_DIR}' => $main::cfg{'PHP_STARTER_DIR'},
@@ -1103 +1104 @@
-
-
-CONF_FILE'}
+SITES_DIR'}/vhcs2.conf
-
-    my $working_cfg = "$working_dir/vhcs2.conf";
@@ -1468 +1469 @@
-
-
-CONF_FILE'}
+SITES_DIR'}/vhcs2.conf
-
-    my $working_cfg = "$working_dir/vhcs2.conf";

trunk/engine/vhcs2-sub-mngr

@@ -2 +2 @@
-
-# VHCS(tm) - Virtual Hosting Control System
-4
+6
-# http://www.molesoftware.com
+# Copyright (c) 2006-2007 by isp Control Panel
+# http://isp-control.net
-#
-#
@@ -24 +26 @@
-#
-#
-
+ω 
-#
-www.vhcs
-
+isp-control
+
-
-use FindBin;
@@ -837 +839 @@
-
-
-$main::cfg{'APACHE_CONF_FILE'}
+"$main::cfg{'APACHE_SITES_DIR'}/vhcs2.conf"
-
-    my $timestamp = time;
@@ -1127 +1129 @@
-
-
-$main::cfg{'APACHE_CONF_FILE'}
+"$main::cfg{'APACHE_SITES_DIR'}/vhcs2.conf"
-
-    my $timestamp = time;

trunk/gui/errordocs/index.php

@@ -1 +1 @@
-<html>
- <head>
-
+OMEGA 
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link href="/vhcs2/themes/omega_original/css/vhcs.css" rel="stylesheet" type="text/css">

trunk/gui/include/admin-functions.php

@@ -1664 +1664 @@
-
-
-
-
-
+S
+
+S
-        if ($send_log_to != '') {
-
-                global $cfg, $default_hostname, $default_base_server_ip, $Version, $VersionH, $BuildDate, $admin_login;
-
-
+S
-                $default_hostname =  $cfg['SERVER_HOSTNAME'];
-                $default_base_server_ip =  $cfg['BASE_SERVER_IP'];

trunk/gui/include/security/core.inc.php

@@ -179 +179 @@
-
-        // And send the email...
-'], $subject, $mail_text, sprintf("From: %s", $cfg['DEFAULT_ADMIN_ADDRE
+S'], $subject, $mail_text, sprintf("From: %s", $cfg['DEFAULT_ADMIN_ADDRES
-}
-