Skip to content

Commit e6d68c2

Browse files
committed
Several improvements for opensuse.
1 parent 65bfb95 commit e6d68c2

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

docs/INSTALL_OPENSUSE_11_1.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ chkconfig --add clamd
8282

8383
2.1) Install apache2
8484

85-
yast2 -i apache2
85+
yast2 -i apache2 apache2-mod_fcgid
86+
87+
rpm -i http://download.opensuse.org/repositories/server:/php/server_database_apache_openSUSE_11.0/i586/suphp-0.6.2-10.41.i586.rpm
8688

8789
3) Install PHP5 modules (1 line!):
8890

@@ -94,6 +96,8 @@ a2enmod suexec
9496
a2enmod rewrite
9597
a2enmod ssl
9698
a2enmod actions
99+
a2enmod suphp
100+
a2enmod fcgid
97101

98102
chkconfig --add apache2
99103
/etc/init.d/apache2 start

install/dist/lib/opensuse.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ public function configure_apache()
435435

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

server/conf/vhost.conf.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
<Directory /var/www/{tmpl_var name='domain'}>
2+
<Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
33
AllowOverride None
44
Order Deny,Allow
55
Deny from all

server/plugins-available/apache2_plugin.inc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ function update($event_name,$data) {
447447
$vhost_data = $data["new"];
448448
$vhost_data["web_document_root"] = $data["new"]["document_root"]."/web";
449449
$vhost_data["web_document_root_www"] = $web_config["website_basedir"]."/".$data["new"]["domain"]."/web";
450+
$vhost_data["web_basedir"] = $web_config["website_basedir"];
450451

451452
// Check if a SSL cert exists
452453
$ssl_dir = $data["new"]["document_root"]."/ssl";

0 commit comments

Comments
 (0)