Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-02-18 8ddcb0d7ac2141b934c789cd7b5cf06f05e730b0

 install/dist/lib/opensuse.lib.php

@@ -677,7 +677,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);