Commit ce6dcf48 authored by tbrehm's avatar tbrehm

Fixed bugs in opensuse config and docs

Fixed a bug that prevented the modification of website settings of a site that the user created.
parent 782b02ac
......@@ -73,6 +73,11 @@ mysqladmin -u root password yourrootsqlpassword
mysqladmin -h ispconfig.local -u root password yourrootsqlpassword
// Install phpmyadmin
yast2 -i pwgen
rpm -i http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/noarch/phpMyAdmin-3.1.2-1.1.noarch.rpm
2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
yast2 -i amavisd-new clamav clamav-db zoo unzip unrar bzip2 unarj perl-DBD-mysql
......
......@@ -429,6 +429,11 @@ class installer_dist extends installer_base {
//* Create the logging directory for the vhost logfiles
exec('mkdir -p /var/log/ispconfig/httpd');
if(is_file('/etc/suphp/suphp.conf')) {
replaceLine('/etc/suphp.conf','php=php:/srv/www/cgi-bin/php5','x-httpd-suphp=php:/srv/www/cgi-bin/php5',0);
replaceLine('/etc/suphp.conf','docroot=','docroot=/var/clients',0);
}
// Sites enabled and avaulable dirs
exec('mkdir -p '.$conf['apache']['vhost_conf_enabled_dir']);
exec('mkdir -p '.$conf['apache']['vhost_conf_dir']);
......
......@@ -705,7 +705,7 @@ class installer_base {
if(is_file('/etc/suphp/suphp.conf')) {
replaceLine('/etc/suphp/suphp.conf','php=php:/usr/bin','x-httpd-suphp=php:/usr/bin/php-cgi',0);
replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
//replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
}
if(is_file('/etc/apache2/sites-enabled/000-default')) {
......
This diff is collapsed.
......@@ -163,7 +163,7 @@ class tform_actions {
function onUpdateSave($sql) {
global $app;
if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab())) {
if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab(),$this->id)) {
$app->db->query($sql);
if($app->db->errorMessage != '') die($app->db->errorMessage);
}
......
......@@ -54,7 +54,7 @@
</Files>
</tmpl_if>
</Directory>
<Directory {tmpl_var name='web_document_root'}>
<Directory {tmpl_var name='web_document_root'}>
Options FollowSymLinks
AllowOverride Indexes AuthConfig Limit FileInfo
Order allow,deny
......@@ -107,6 +107,10 @@
ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
Action php5-cgi /php5-cgi
AddHandler php5-cgi .php .php3 .php4 .php5
<Directory {tmpl_var name='cgi_starter_path'}>
Order allow,deny
Allow from all
</Directory>
</tmpl_if>
<tmpl_if name='php' op='==' value='fast-cgi'>
# php as fast-cgi enabled
......@@ -195,7 +199,7 @@
</Files>
</tmpl_if>
</Directory>
<Directory {tmpl_var name='web_document_root'}>
<Directory {tmpl_var name='web_document_root'}>
Options FollowSymLinks
AllowOverride Indexes AuthConfig Limit FileInfo
Order allow,deny
......@@ -216,7 +220,7 @@
</tmpl_if>
</Directory>
<tmpl_if name='cgi'op='==' value='y'>
<tmpl_if name='cgi' op='==' value='y'>
# cgi enabled
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
AddHandler cgi-script .cgi
......@@ -251,6 +255,10 @@
ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
Action php5-cgi /php5-cgi
AddHandler php5-cgi .php .php3 .php4 .php5
<Directory {tmpl_var name='cgi_starter_path'}>
Order allow,deny
Allow from all
</Directory>
</tmpl_if>
<tmpl_if name='php' op='==' value='fast-cgi'>
# php as fast-cgi enabled
......
......@@ -90,9 +90,9 @@ class shelluser_base_plugin {
//* Disable shell user temporarily if we use jailkit
if($data['new']['chroot'] == 'jailkit') {
$command = 'usermod --lock '.escapeshellcmd($data['new']['username']);
$command = 'usermod -L '.escapeshellcmd($data['new']['username']);
exec($command);
$app->log("Disabling shelluser temporarily: ".$data['new']['username'],LOGLEVEL_DEBUG);
$app->log("Disabling shelluser temporarily: ".$command,LOGLEVEL_DEBUG);
}
} else {
......
......@@ -87,7 +87,7 @@ class shelluser_jailkit_plugin {
$this->_setup_jailkit_chroot();
$command .= 'usermod --unlock '.escapeshellcmd($data['new']['username']);
$command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
exec($command);
$this->_add_jailkit_user();
......
......@@ -32,6 +32,7 @@ require("lib/config.inc.php");
require("lib/app.inc.php");
set_time_limit(0);
ini_set('error_reporting','E_ALL & ~E_NOTICE');
// make sure server_id is always an int
$conf["server_id"] = intval($conf["server_id"]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment