Changeset 193

Timestamp:

11/28/06 00:36:01 (2 years ago)

Author:

rats

Message:

- CONFIGS:

• apache2-parts: added "IfModule? mod_fastcgi" tag
  

- ENGINE:

• vhcs2-dmn-mngr: Added Comments
  
• vhcs2-dmn-mngr: check wether awstats is enabled or not
  
• vhcs2-dmn-mngr: FastCGI enhangements
  

- MAKEFILES:

• edited them for FastC
  

Files:

• trunk/CHANGELOG (modified) (2 diffs)
• trunk/Makefile (modified) (3 diffs)
• trunk/configs/apache/fastcgi.conf (modified) (1 diff)
• trunk/configs/apache/parts/als_entry.tpl (modified) (2 diffs)
• trunk/configs/apache/parts/dmn_entry.tpl (modified) (2 diffs)
• trunk/configs/apache/parts/sub_entry.tpl (modified) (4 diffs)
• trunk/configs/vhcs2.conf (modified) (1 diff)
• trunk/engine/vhcs2-dmn-mngr (modified) (21 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-VHCS 2.4.8 ω Omega Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2006-11-27 Benedikt Heintel
+        - CONFIGS:
+                * apache2-parts: added "IfModule mod_fastcgi" tag
+        - ENGINE:
+                * vhcs2-dmn-mngr: Added Comments
+                * vhcs2-dmn-mngr: check wether awstats is enabled or not
+                * vhcs2-dmn-mngr: FastCGI enhangements
+        - MAKEFILES:
+                * edited them for FastCGI
+
+        @TODO:
+                - FastCGI:
+                        * Copy files on install/update
+                        * Check, if 2 php.ini-files are allowed and working
+                        * apache: check if stats are working with FastCGI
+                - AWStats:
+                        * apache: set statsdir if awstats is enabled
+                        * gui: disable stats-alias in client-menu
-
-2006-11-26 Roland Haeder
@@ -14 +33 @@
-        - ENGINE:
-                * Modified dmn-mngr for creating FastCGI files
-
-        @TODO:
-                - FastCGI:
-                        * Copy files on install/update
-                        * Modifie dmn-mngr for working
-                - AWStats:
-                        * dmn-mngr: check whether awstats is enabled or not
-                        * apache: set statsdir if awstats is enabled
-
-2006-11-24 Benedikt Heintel

trunk/Makefile

@@ -1 @@
-
+
-INST_PREF=/tmp/vhcs-2.4.8
-
@@ -15 +15 @@
-
-SYSTEM_VIRTUAL=$(INST_PREF)/var/www/virtual
+
+SYSTEM_FCGI=$(INST_PREF)/var/www/fcgi
-
-SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
@@ -33 +35 @@
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_LOG)/vhcs2-arpl-msgr
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_VIRTUAL)
+        $(SYSTEM_MAKE_DIRS) $(SYSTEM_FCGI)
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_MAIL_VIRTUAL)
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_APACHE_BACK_LOG)
-
- 
- 
- 
+
+
+
-        cd ./keys && $(MAKE) install
-
+
-uninstall:
-
-        cd ./tools && $(MAKE) uninstall
- 
- 
- 
+
+
+
-        cd ./keys && $(MAKE) uninstall
-
+
-        rm -rf $(SYSTEM_CONF)
-        rm -rf $(SYSTEM_ROOT)
-        rm -rf $(SYSTEM_LOG)
-        rm -rf $(SYSTEM_VIRTUAL)
+        rm -rf $(SYSTEM_FCGI)
-        rm -rf $(SYSTEM_MAIL_VIRTUAL)
-        rm -rf $(SYSTEM_APACHE_BACK_LOG)
-        rm -rf ./*~
-        

trunk/configs/apache/fastcgi.conf

@@ +1 @@
+#
+# @TODO: Test, if the php4.ini and php5.ini would work
+#
+
-<IfModule mod_fastcgi.c>
-
-
-
+
+
-
-
+  
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-</IfModule>

trunk/configs/apache/parts/als_entry.tpl

@@ -5 +5 @@
-    #Group {SUEXEC_GROUP}
-    #
-
-
+
-    SuexecUserGroup {SUEXEC_USER} {SUEXEC_GROUP}
-    #
-
-    ServerAdmin     root@{ALS_NAME}
@@ -31 +29 @@
-    # httpd als entry redirect entry BEGIN.
-    # httpd als entry redirect entry END.
-
+
-    # httpd als entry cgi support BEGIN.
-    # httpd als entry cgi support END.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            php_admin_value open_basedir "{GUI_ROOT_DIR}/:/etc/vhcs2/:/proc/:{WWW_DIR}/:/tmp/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-            php_admin_value session.save_path "/tmp/"
-          </IfModule
-Directory
+        </Directory
+IfModule
-
-    # httpd als entry PHP2 support BEGIN.

trunk/configs/apache/parts/dmn_entry.tpl

@@ -2 +2 @@
-
-    #
-
-
+ 
+ 
-    #
-
-    #
-    SuexecUserGroup {SUEXEC_USER} {SUEXEC_GROUP}
-    #
-
-    ServerAdmin     root@{DMN_NAME}
@@ -34 +32 @@
-    # httpd dmn entry cgi support END.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            php_admin_value open_basedir "{GUI_ROOT_DIR}/:/etc/vhcs2/:/proc/:{WWW_DIR}/:/tmp/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-            php_admin_value session.save_path "/tmp/"
-          </IfModule
-Directory
+        </Directory
+IfModule
-
-    # httpd dmn entry PHP2 support BEGIN.

trunk/configs/apache/parts/sub_entry.tpl

@@ -5 +5 @@
-    #Group {SUEXEC_GROUP}
-    #
-
+
-    #
-    SuexecUserGroup {SUEXEC_USER} {SUEXEC_GROUP}
@@ -12 +12 @@
-    ServerAdmin     root@{DMN_NAME}
-    DocumentRoot    {WWW_DIR}/{DMN_NAME}{MOUNT_POINT}/htdocs
-
+
-    ServerName      {SUB_NAME}
-    ServerAlias     www.{SUB_NAME} {SUB_NAME} *.{SUB_NAME}
-
+
-    ErrorLog        {APACHE_USERS_LOG_DIR}/{SUB_NAME}-error.log
-    TransferLog     {APACHE_USERS_LOG_DIR}/{SUB_NAME}-access.log
-
+
-    CustomLog       {APACHE_LOG_DIR}/{DMN_NAME}-traf.log traff
-    CustomLog       {APACHE_LOG_DIR}/{DMN_NAME}-combined.log combined
@@ -38 +38 @@
-    # httpd sub entry cgi support END.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            php_admin_value open_basedir "{GUI_ROOT_DIR}/:/etc/vhcs2/:/proc/:{WWW_DIR}/:/tmp/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-            php_admin_value session.save_path "/tmp/"
-IfModule
-Directory
+Directory
+IfModule
-
-    # httpd sub entry PHP2 support BEGIN.
-    # httpd sub entry PHP2 support END.
-
+
-    <Directory {WWW_DIR}/{DMN_NAME}{MOUNT_POINT}/htdocs>
-        # httpd sub entry PHP support BEGIN.
@@ -64 +74 @@
-        Allow from all
-    </Directory>
-
+
-</VirtualHost>

trunk/configs/vhcs2.conf

@@ -295 +295 @@
-USER_LAYOUT_ID = 1
-
-08-15
+11-30
-
-MINIMAL_FTP_UID = 2000

trunk/engine/vhcs2-dmn-mngr

@@ -1748 +1748 @@
-        my $starter_dir = $main::cfg{'PHP_STARTER_DIR'};
-
-
+
+
-
-        my $conf_dir = $main::cfg{'CONF_DIR'};
@@ -1768 +1769 @@
-        #
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        if (!(-e "$starter_dir/master")) {
@@ -2015 +2017 @@
-        }
-
+        # Should be created on install! (delete if okay)
-        #
-        # fastcgi.conf for apache
@@ -2043 +2046 @@
-
-        #
- for every domain
+/php-fcgi-starter for "master" (FCGI-Server)
-        #
-$dmn_name/php
+master/php5
-
-                my $ini_tpl = '';
-
-
-
-
-
+
+
+
+
+
-                $ini_tpl =~ s/{PEAR_DIR}/$pear_dir/gi;
-
-
+
-
-                ($rs, $rdata) = store_file(
-$dmn_name/php
+master/php5
-                                                                        $ini_tpl,
-                                                                        $sys_user,
@@ -2067 +2070 @@
-                return $rs if ($rs != 0);
-
+                $ini_tpl = '';
+
+                ($rs, $ini_tpl) = get_file("$conf_dir/fcgi/parts/php4.ini");
+
+                return $rs if ($rs != 0);
+
+                $ini_tpl =~ s/{WWW_DIR}/$www_dir/gi;
+                $ini_tpl =~ s/{PEAR_DIR}/$pear_dir/gi;
+                $ini_tpl =~ s/{DMN_NAME}/master/gi;
+
+                ($rs, $rdata) = store_file(
+                                                                        "$starter_dir/master/php4.ini",
+                                                                        $ini_tpl,
+                                                                        $sys_user,
+                                                                        $sys_group,
+                                                                        0640
+                                                                        );
+
+                return $rs if ($rs != 0);
+
-        }
-
-        #
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        #
-        if (!(-e "$starter_dir/$dmn_name/php5-fcgi-starter")) {
@@ -2076 +2146 @@
-                my $starter_tpl = '';
-
-php
+fcgi
-
-                return $rs if ($rs != 0);
@@ -2093 +2163 @@
-                return $rs if ($rs != 0);
-
+                $starter_tpl = '';
+
+                ($rs, $starter_tpl) = get_file("$conf_dir/fcgi/parts/php4-fcgi-starter.tpl");
+
+                return $rs if ($rs != 0);
+
+                $starter_tpl =~ s/{PHP_STARTER_DIR}/$starter_dir/gi;
+                $starter_tpl =~ s/{DMN_NAME}/$dmn_name/gi;
+
+                ($rs, $rdata) = store_file(
+                                                                        "$starter_dir/$dmn_name/php4-fcgi-starter",
+                                                                        $starter_tpl,
+                                                                        $sys_user,
+                                                                        $sys_group,
+                                                                        0750
+                                                                        );
+
+                return $rs if ($rs != 0);
+
-        }
-
@@ -2134 +2223 @@
-        my $starter_dir = $main::cfg{'PHP_STARTER_DIR'};
-
-
+
+
-
-        my $conf_dir = $main::cfg{'CONF_DIR'};
@@ -2203 +2293 @@
-        }
-
+        # Should be created on install! (delete if okay)
-        #
-        # fastcgi.conf for apache
@@ -2231 +2322 @@
-
-        #
-5
+
-        #
-
+5
-
-                my $ini_tpl = '';
-
-php/parts/php
+fcgi/parts/php5
-
-                return $rs if ($rs != 0);
@@ -2246 +2337 @@
-
-                ($rs, $rdata) = store_file(
-
+5
-                                                                        $ini_tpl,
-                                                                        $sys_user,
@@ -2255 +2346 @@
-                return $rs if ($rs != 0);
-
+                $ini_tpl = '';
+
+                ($rs, $ini_tpl) = get_file("$conf_dir/fcgi/parts/php4.ini");
+
+                return $rs if ($rs != 0);
+
+                $ini_tpl =~ s/{WWW_DIR}/$www_dir/gi;
+                $ini_tpl =~ s/{PEAR_DIR}/$pear_dir/gi;
+                $ini_tpl =~ s/{DMN_NAME}/master/gi;
+
+                ($rs, $rdata) = store_file(
+                                                                        "$starter_dir/master/php4.ini",
+                                                                        $ini_tpl,
+                                                                        $sys_user,
+                                                                        $sys_group,
+                                                                        0640
+                                                                        );
+
+                return $rs if ($rs != 0);
+
-        }
-
@@ -2261 +2372 @@
-                my $starter_tpl = '';
-
-php
+fcgi
-
-                return $rs if ($rs != 0);
@@ -2278 +2389 @@
-                return $rs if ($rs != 0);
-
+                $starter_tpl = '';
+
+                ($rs, $starter_tpl) = get_file("$conf_dir/fcgi/parts/php4-fcgi-starter.tpl");
+
+                return $rs if ($rs != 0);
+
+                $starter_tpl =~ s/{PHP_STARTER_DIR}/$starter_dir/gi;
+                $starter_tpl =~ s/{DMN_NAME}/master/gi;
+
+                ($rs, $rdata) = store_file(
+                                                                        "$starter_dir/master/php4-fcgi-starter",
+                                                                        $starter_tpl,
+                                                                        $sys_user,
+                                                                        $sys_group,
+                                                                        0750
+                                                                        );
+
+                return $rs if ($rs != 0);
+
-        }
-
-        #
-every
+the
-        #
-
+5
-
-                my $ini_tpl = '';
-
-php/parts/php
+fcgi/parts/php5
-
-                return $rs if ($rs != 0);
@@ -2296 +2426 @@
-
-                ($rs, $rdata) = store_file(
-
+5
-                                                                        $ini_tpl,
-                                                                        $sys_user,
-                                                                        $sys_group,
-6
+4
-                                                                        );
-
-                return $rs if ($rs != 0);
-
+                $ini_tpl = '';
+
+                ($rs, $ini_tpl) = get_file("$conf_dir/fcgi/parts/php4.ini");
+
+                return $rs if ($rs != 0);
+
+                $ini_tpl =~ s/{WWW_DIR}/$www_dir/gi;
+                $ini_tpl =~ s/{PEAR_DIR}/$pear_dir/gi;
+                $ini_tpl =~ s/{DMN_NAME}/$dmn_name/gi;
+
+                ($rs, $rdata) = store_file(
+                                                                        "$starter_dir/$dmn_name/php4.ini",
+                                                                        $ini_tpl,
+                                                                        $sys_user,
+                                                                        $sys_group,
+                                                                        0640
+                                                                        );
+
+                return $rs if ($rs != 0);
-        }
-
@@ -2314 +2463 @@
-                my $starter_tpl = '';
-
-php
+fcgi
-
-                return $rs if ($rs != 0);
@@ -2323 +2472 @@
-                ($rs, $rdata) = store_file(
-                                                                        "$starter_dir/$dmn_name/php5-fcgi-starter",
+                                                                        $starter_tpl,
+                                                                        $sys_user,
+                                                                        $sys_group,
+                                                                        0750
+                                                                        );
+
+                return $rs if ($rs != 0);
+
+                $starter_tpl = '';
+
+                ($rs, $starter_tpl) = get_file("$conf_dir/fcgi/parts/php4-fcgi-starter.tpl");
+
+                return $rs if ($rs != 0);
+
+                $starter_tpl =~ s/{PHP_STARTER_DIR}/$starter_dir/gi;
+                $starter_tpl =~ s/{DMN_NAME}/$dmn_name/gi;
+
+                ($rs, $rdata) = store_file(
+                                                                        "$starter_dir/$dmn_name/php4-fcgi-starter",
-                                                                        $starter_tpl,
-                                                                        $sys_user,
@@ -3497 +3665 @@
-    my $rs = undef;
-
+    my $awstats_dir = $main::cfg{'AWSTATS_DIR'};
+
-    push_el(\@main::el, 'dmn_add_data()', 'Starting...');
-
@@ -3519 +3689 @@
-    return $rs if ($rs != 0);
-
-
-
-
-
+
+
+
+
+
+
-
-#     $rs = dmn_add_crontab_data($dmn_data);
@@ -3567 +3739 @@
-    return $rs if ($rs != 0);
-
-
-
-
-
+
+
+
+
+
+
-
-    push_el(\@main::el, 'dmn_change_data()', 'Ending...');
@@ -3611 +3785 @@
-    return $rs if ($rs != 0);
-
-
-
-
-
+
+
+
+
+
+
-
-#     $rs = dmn_del_crontab_data($dmn_data);