Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2014-03-06 1838fd1c4b1ceae77c852fe25e97a30592d44a69

 install/tpl/apache_ispconfig.vhost.master

@@ -4,10 +4,10 @@
# for the ISPConfig controlpanel
######################################################

{vhost_port_listen} Listen {vhost_port}
NameVirtualHost *:{vhost_port}
<tmpl_var name="vhost_port_listen"> Listen <tmpl_var name="vhost_port">
NameVirtualHost *:<tmpl_var name="vhost_port">

<VirtualHost _default_:{vhost_port}>
<VirtualHost _default_:<tmpl_var name="vhost_port">>
  ServerAdmin webmaster@localhost
  
  <FilesMatch "\.ph(p3?|tml)$">
@@ -22,8 +22,12 @@
      AllowOverride AuthConfig Indexes Limit Options FileInfo
      AddHandler fcgid-script .php
      FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
      <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
     Require all granted
     <tmpl_else>
      Order allow,deny
      Allow from all
     </tmpl_if>
    </Directory>
    IPCCommTimeout  7200
   MaxRequestLen 15728640
@@ -37,8 +41,12 @@
      # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
      Options +FollowSymLinks
      AllowOverride None
      <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
     Require all granted
     <tmpl_else>
      Order allow,deny
      Allow from all
     </tmpl_if>
     php_value magic_quotes_gpc        0
    </Directory>
  </IfModule>
@@ -52,22 +60,30 @@
  </IfModule>

  # SSL Configuration
  {ssl_comment}SSLEngine On
  {ssl_comment}SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt
  {ssl_comment}SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key
  {ssl_bundle_comment}SSLCACertificateFile /usr/local/ispconfig/interface/ssl/ispserver.bundle
  <tmpl_var name="ssl_comment">SSLEngine On
  <tmpl_var name="ssl_comment">SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt
  <tmpl_var name="ssl_comment">SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key
  <tmpl_var name="ssl_bundle_comment">SSLCACertificateFile /usr/local/ispconfig/interface/ssl/ispserver.bundle

</VirtualHost>

<Directory /var/www/php-cgi-scripts>
    AllowOverride None
   <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
   Require all denied
   <tmpl_else>
    Order Deny,Allow
    Deny from all
   </tmpl_if>
</Directory>

<Directory /var/www/php-fcgi-scripts>
    AllowOverride None
    <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
   Require all denied
   <tmpl_else>
    Order Deny,Allow
    Deny from all
   </tmpl_if>
</Directory>