diff --git a/docs/INSTALL_OPENSUSE_11_1.txt b/docs/INSTALL_OPENSUSE_11_1.txt index d50a4d0cfbed2f3e7b4e3e39418cf02e9471048f..611c3383c6d9f3886aeb707f5909ab4f48f2b184 100644 --- a/docs/INSTALL_OPENSUSE_11_1.txt +++ b/docs/INSTALL_OPENSUSE_11_1.txt @@ -130,6 +130,18 @@ yast2 -i webalizer perl-DateManip rm -f /tmp/*.rpm +6.2 Install jailkit + +cd /tmp +wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz +tar xvfz jailkit-2.5.tar.gz +cd jailkit-2.5 +./configure +make +make install +cd .. +rm -rf jailkit-2.5* + 7) Install ISPConfig 3 diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index b98c51692d3ac8b6cfbd5eb4687352959788a1f6..02c77b8cebdcfb4e8576826f1e3061bda1c57e4b 100644 --- a/install/dist/conf/centos52.conf.php +++ b/install/dist/conf/centos52.conf.php @@ -82,6 +82,11 @@ $conf['apache']['vhost_conf_dir'] = '/etc/httpd/conf/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/httpd/conf/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +//* Website base settings +$conf['web']['website_basedir'] = '/var/www'; +$conf['web']['website_path'] = '/var/www/clients/client[client_id]/web[website_id]'; +$conf['web']['website_symlinks'] = '/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/'; + //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/'; diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php index 6d6512f331e87b5022e9b1640163b26dbf4a3069..03cdfc6ebe9356fcf19254eb78acf45a35358ab2 100644 --- a/install/dist/conf/debian40.conf.php +++ b/install/dist/conf/debian40.conf.php @@ -82,6 +82,11 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +//* Website base settings +$conf['web']['website_basedir'] = '/var/www'; +$conf['web']['website_path'] = '/var/www/clients/client[client_id]/web[website_id]'; +$conf['web']['website_symlinks'] = '/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/'; + //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/'; diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php index b40f1cb68e5a080a393fa8ef6d09f090f4bb49f0..121ab611f2b65a159d380ac50db4743b522413f1 100644 --- a/install/dist/conf/fedora9.conf.php +++ b/install/dist/conf/fedora9.conf.php @@ -82,6 +82,11 @@ $conf['apache']['vhost_conf_dir'] = '/etc/httpd/conf/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/httpd/conf/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +//* Website base settings +$conf['web']['website_basedir'] = '/var/www'; +$conf['web']['website_path'] = '/var/www/clients/client[client_id]/web[website_id]'; +$conf['web']['website_symlinks'] = '/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/'; + //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/'; diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php index ff89631c97e18ce5cd77296cd53c78e3db4ee0aa..55be770adc39d4a960439e94b3b54397a28dc9e2 100644 --- a/install/dist/conf/opensuse110.conf.php +++ b/install/dist/conf/opensuse110.conf.php @@ -82,6 +82,11 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +//* Website base settings +$conf['web']['website_basedir'] = '/srv/www'; +$conf['web']['website_path'] = '/srv/www/clients/client[client_id]/web[website_id]'; +$conf['web']['website_symlinks'] = '/srv/www/[website_domain]/:/srv/www/clients/client[client_id]/[website_domain]/'; + //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/'; diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 4ce617c88366856e60c7e805fa877f90ab5c871a..c68cd88e5beb1dbc57f90ff61c2d1638a7a5fd53 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -206,6 +206,9 @@ class installer_base { $tpl_ini_array['fastcgi']['fastcgi_phpini_path'] = $conf['fastcgi']['fastcgi_phpini_path']; $tpl_ini_array['server']['hostname'] = $conf['hostname']; $tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']); + $tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir']; + $tpl_ini_array['web']['website_path'] = $conf['web']['website_path']; + $tpl_ini_array['web']['website_symlinks'] = $conf['web']['website_symlinks']; $server_ini_content = array_to_ini($tpl_ini_array); $server_ini_content = mysql_real_escape_string($server_ini_content); diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index cb6530665408e7f49572917147a397cc68275b82..463397e6b4faa496c9b2e2453fbcdd49b85b6eba 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -29,6 +29,7 @@ message_size_limit=0 getmail_config_dir=/etc/getmail [web] +website_basedir=/var/www website_path=/var/www/clients/client[client_id]/web[website_id] website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/ vhost_conf_dir=/etc/apache2/sites-available diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 06037731d7ae0a3d132ff19b2f3ea408468a0d3f..754000b8d022db48973aaa4d3926469d8e5578ae 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -284,6 +284,17 @@ $form["tabs"]['web'] = array ( ################################## # Begin Datatable fields ################################## + 'website_basedir' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'website_basedir_error_empty'), + ), + 'value' => '', + 'width' => '40', + 'maxlength' => '255' + ), 'website_path' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index 21bee81588a61c963ddad687bff0339edbaedb58..969c01f87bf7ef9b722579ad8937c1f7fec2a767 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -1,33 +1,37 @@ -