Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into ...

Till Brehm

2014-02-18 10b13b85657e7f87333eef5360026e77d6319d80

Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

 install/dist/lib/opensuse.lib.php

@@ -652,7 +652,7 @@

        $content = rf('/etc/apache2/httpd.conf');
        if(!stristr($content, 'Include /etc/apache2/sites-enabled/')) {
            af('/etc/apache2/httpd.conf', "\n<Directory /srv/www>\n    Options FollowSymlinks\n</Directory>\n\nInclude /etc/apache2/sites-enabled/\n\n");
            af('/etc/apache2/httpd.conf', "\n<Directory /srv/www>\n    Options +FollowSymlinks\n</Directory>\n\nInclude /etc/apache2/sites-enabled/\n\n");
        }
        unset($content);


 install/dist/tpl/gentoo/apache_apps.vhost.master

@@ -15,7 +15,7 @@
    DocumentRoot {apps_vhost_dir}
    SuexecUserGroup ispapps ispapps
    <Directory {apps_vhost_dir}>
      Options Indexes FollowSymLinks MultiViews +ExecCGI
      Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
      AllowOverride AuthConfig Indexes Limit Options FileInfo
      <FilesMatch "\.ph(p[3-5]?|tml)$">
           SetHandler fcgid-script
@@ -31,7 +31,7 @@
    DocumentRoot {apps_vhost_dir}
    AddType application/x-httpd-php .php
    <Directory {apps_vhost_dir}>
      Options FollowSymLinks
      Options +FollowSymLinks
      AllowOverride None
      Order allow,deny
      Allow from all

 install/dist/tpl/gentoo/apache_ispconfig.vhost.master

@@ -14,7 +14,7 @@
    DocumentRoot /var/www/ispconfig/
    SuexecUserGroup ispconfig ispconfig
    <Directory /var/www/ispconfig/>
      Options Indexes FollowSymLinks MultiViews +ExecCGI
      Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
      AllowOverride AuthConfig Indexes Limit Options FileInfo
      <FilesMatch "\.ph(p[3-5]?|tml)$">
           SetHandler fcgid-script
@@ -30,7 +30,7 @@
    DocumentRoot /usr/local/ispconfig/interface/web/
    AddType application/x-httpd-php .php
    <Directory /usr/local/ispconfig/interface/web>
      Options FollowSymLinks
      Options +FollowSymLinks
      AllowOverride None
      Order allow,deny
      Allow from all

 install/sql/incremental/upd_0068.sql

@@ -1,4 +1,5 @@
ALTER TABLE  `dbispconfig`.`web_domain` ADD UNIQUE  `serverdomain` (  `server_id` ,  `domain` );
DROP INDEX rr ON dns_rr;
ALTER TABLE  `dns_rr` CHANGE  `name`  `name` VARCHAR( 128 ) NOT NULL ;
CREATE INDEX `rr` ON dns_rr (`zone`,`type`,`name`);

ALTER TABLE  `dns_rr` DROP KEY rr,
    CHANGE  `name`  `name` VARCHAR( 128 ) NOT NULL,
    ADD KEY `rr` (`zone`,`type`,`name`);

 install/sql/incremental/upd_0069.sql

New file
@@ -0,0 +1 @@
ALTER TABLE `cron` ADD `log` enum('n','y') NOT NULL default 'n' AFTER `run_wday`;

 install/sql/ispconfig3.sql

@@ -402,6 +402,7 @@
  `run_mday` varchar(100) NULL,
  `run_month` varchar(100) NULL,
  `run_wday` varchar(100) NULL,
  `log` enum('n','y') NOT NULL default 'n',
  `active` enum('n','y') NOT NULL default 'y',
  PRIMARY KEY  (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

 install/tpl/apache_apps.vhost.master

@@ -20,7 +20,7 @@
    AddType application/x-httpd-php .php
    <Directory {apps_vhost_dir}>
      # php_admin_value open_basedir "{apps_vhost_dir}:/usr/share:/tmp"
      Options FollowSymLinks
      Options +FollowSymLinks
      AllowOverride None
      Order allow,deny
      Allow from all
@@ -31,7 +31,7 @@
    DocumentRoot {apps_vhost_dir}
    SuexecUserGroup ispapps ispapps
    <Directory {apps_vhost_dir}>
      Options Indexes FollowSymLinks MultiViews +ExecCGI
      Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
      AllowOverride AuthConfig Indexes Limit Options FileInfo
      AddHandler fcgid-script .php
      FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php

 install/tpl/apache_ispconfig.vhost.master

@@ -18,7 +18,7 @@
    DocumentRoot /var/www/ispconfig/
    SuexecUserGroup ispconfig ispconfig
    <Directory /var/www/ispconfig/>
      Options -Indexes FollowSymLinks MultiViews +ExecCGI
      Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
      AllowOverride AuthConfig Indexes Limit Options FileInfo
      AddHandler fcgid-script .php
      FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
@@ -35,7 +35,7 @@
    AddType application/x-httpd-php .php
    <Directory /usr/local/ispconfig/interface/web>
      # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
      Options FollowSymLinks
      Options +FollowSymLinks
      AllowOverride None
      Order allow,deny
      Allow from all

 interface/lib/classes/remoting.inc.php

@@ -150,8 +150,8 @@
            return false;
        }
        if (!empty($session_id)) {
            $app->uses('remoting_lib , getconf');
            if(!empty($server_id)) {
                $app->uses('remoting_lib , getconf');
                $section_config =  $app->getconf->get_server_config($server_id, $section);
                return $section_config;
            } else {

 server/conf/apache_apps.vhost.master

@@ -34,7 +34,7 @@
    DocumentRoot {tmpl_var name='apps_vhost_dir'}
    SuexecUserGroup ispapps ispapps
    <Directory {tmpl_var name='apps_vhost_dir'}>
        Options Indexes FollowSymLinks MultiViews +ExecCGI
        Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
        AllowOverride AuthConfig Indexes Limit Options FileInfo
        AddHandler fcgid-script .php
        FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php

 server/conf/vhost.conf.master

@@ -57,7 +57,7 @@
        </IfModule>

        <Directory {tmpl_var name='web_document_root_www'}>
                Options FollowSymLinks
                Options +FollowSymLinks
                AllowOverride <tmpl_var name='allow_override'>
                <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
                Require all granted
@@ -85,7 +85,7 @@
</tmpl_if>
        </Directory>
        <Directory {tmpl_var name='web_document_root'}>
                Options FollowSymLinks
                Options +FollowSymLinks
                AllowOverride <tmpl_var name='allow_override'>
                <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
                Require all granted