Skip to content

Commit ce6dcf4

Browse files
committed
Fixed bugs in opensuse config and docs
Fixed a bug that prevented the modification of website settings of a site that the user created.
1 parent 782b02a commit ce6dcf4

File tree

9 files changed

+1174
-1142
lines changed

9 files changed

+1174
-1142
lines changed

docs/INSTALL_OPENSUSE_11_1.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ mysqladmin -u root password yourrootsqlpassword
7373
mysqladmin -h ispconfig.local -u root password yourrootsqlpassword
7474

7575

76+
// Install phpmyadmin
77+
yast2 -i pwgen
78+
rpm -i http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/noarch/phpMyAdmin-3.1.2-1.1.noarch.rpm
79+
80+
7681
2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
7782

7883
yast2 -i amavisd-new clamav clamav-db zoo unzip unrar bzip2 unarj perl-DBD-mysql

install/dist/lib/opensuse.lib.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,11 @@ public function configure_apache()
429429
//* Create the logging directory for the vhost logfiles
430430
exec('mkdir -p /var/log/ispconfig/httpd');
431431

432+
if(is_file('/etc/suphp/suphp.conf')) {
433+
replaceLine('/etc/suphp.conf','php=php:/srv/www/cgi-bin/php5','x-httpd-suphp=php:/srv/www/cgi-bin/php5',0);
434+
replaceLine('/etc/suphp.conf','docroot=','docroot=/var/clients',0);
435+
}
436+
432437
// Sites enabled and avaulable dirs
433438
exec('mkdir -p '.$conf['apache']['vhost_conf_enabled_dir']);
434439
exec('mkdir -p '.$conf['apache']['vhost_conf_dir']);

install/lib/installer_base.lib.php

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

706706
if(is_file('/etc/suphp/suphp.conf')) {
707707
replaceLine('/etc/suphp/suphp.conf','php=php:/usr/bin','x-httpd-suphp=php:/usr/bin/php-cgi',0);
708-
replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
708+
//replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
709709
}
710710

711711
if(is_file('/etc/apache2/sites-enabled/000-default')) {

0 commit comments

Comments
 (0)