Changed Options directives to be compatible with apache 2.4

Marius Cramer

2014-02-17 5545f1869f43c821afae81fb0e240813e1b62d7c

Changed Options directives to be compatible with apache 2.4

 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/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

 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