Commit 7972151d authored by Marius Cramer's avatar Marius Cramer

Merge branch 'stable-3.0.5'

Conflicts:
	install/autoupdate.php
	install/install.php
	install/sql/incremental/upd_0078.sql
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/tpl/debian_postfix.conf.master
	install/tpl/fedora_postfix.conf.master
	install/tpl/gentoo_postfix.conf.master
	install/tpl/opensuse_postfix.conf.master
	interface/lib/classes/db_mysql.inc.php
	interface/lib/classes/remoting.inc.php
	interface/lib/classes/tform.inc.php
	interface/lib/classes/validate_reseller.inc.php
	interface/lib/config.inc.php
	interface/lib/lang/es.lng
	interface/web/admin/lib/lang/de_server_config.lng
	interface/web/admin/lib/lang/en_server_config.lng
	interface/web/admin/lib/lang/es_server_config.lng
	interface/web/admin/lib/lang/fr_server_config.lng
	interface/web/admin/lib/lang/hr_server_config.lng
	interface/web/dns/lib/lang/hr_dns_wizard.lng
	interface/web/mail/lib/lang/hr_mail_user.lng
	interface/web/mail/mail_domain_edit.php
	interface/web/mail/mail_user_edit.php
	interface/web/remote/index.php
	interface/web/sites/database_edit.php
	interface/web/sites/form/database.tform.php
	interface/web/sites/form/web_vhost_subdomain.tform.php
	interface/web/sites/lib/lang/ar_web_childdomain_list.lng
	interface/web/sites/lib/lang/ar_web_vhost_domain_list.lng
	interface/web/sites/lib/lang/cz_web_childdomain.lng
	interface/web/sites/lib/lang/cz_web_subdomain.lng
	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
	interface/web/sites/lib/lang/cz_web_vhost_domain.lng
	interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
	interface/web/sites/lib/lang/de_ftp_user.lng
	interface/web/sites/lib/lang/de_shell_user.lng
	interface/web/sites/lib/lang/en_ftp_user.lng
	interface/web/sites/lib/lang/en_web_childdomain.lng
	interface/web/sites/lib/lang/en_web_domain.lng
	interface/web/sites/lib/lang/es_ftp_user.lng
	interface/web/sites/lib/lang/es_shell_user.lng
	interface/web/sites/lib/lang/es_web_domain.lng
	interface/web/sites/lib/lang/fr_web_subdomain.lng
	interface/web/sites/lib/lang/hr_web_aliasdomain.lng
	interface/web/sites/lib/lang/hr_web_subdomain.lng
	interface/web/sites/lib/lang/hr_web_subdomain_list.lng
	interface/web/sites/lib/lang/hr_web_vhost_domain.lng
	interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
	interface/web/sites/lib/lang/se_web_subdomain.lng
	interface/web/sites/lib/lang/se_web_subdomain_list.lng
	interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
	interface/web/sites/web_aliasdomain_edit.php
	interface/web/sites/web_domain_edit.php
	interface/web/sites/web_vhost_subdomain_edit.php
	interface/web/themes/blue/ispconfig_version
	interface/web/themes/default-304/templates/admin/server_config_mail_edit.htm
	interface/web/themes/default-304/templates/admin/system_config_sites_edit.htm
	interface/web/themes/default-304/templates/dns/dns_wizard.htm
	interface/web/themes/default-304/templates/mail/spamfilter_config_mail_edit.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_advanced.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_backup.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_redirect.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_ssl.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_stats.htm
	server/conf/vhost.conf.master
	server/cron_daily.php
	server/lib/classes/db_mysql.inc.php
	server/mods-available/monitor_core_module.inc.php
parents 466f06a5 4ca1f82d

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
<?php
$autoinstall['language'] = 'en'; // de, en (default)
$autoinstall['install_mode'] = 'standard'; // standard (default), expert
$autoinstall['hostname'] = 'server1.example.com'; // default
$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
$autoinstall['mysql_root_user'] = 'root'; // default: root
$autoinstall['mysql_root_password'] = 'howtoforge';
$autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig
$autoinstall['mysql_charset'] = 'utf8'; // default: utf8
$autoinstall['http_server'] = 'nginx'; // apache (default), nginx
$autoinstall['ispconfig_port'] = '8080'; // default: 8080
$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n
/* SSL Settings */
$autoinstall['ssl_cert_country'] = 'AU';
$autoinstall['ssl_cert_state'] = 'Some-State';
$autoinstall['ssl_cert_locality'] = 'Chicago';
$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';
$autoinstall['ssl_cert_organisation_unit'] = 'IT department';
$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];
/* optional expert mode settings, needed only for expert mode */
$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));
$autoinstall['join_multiserver_setup'] = 'n'; // y, n (default)
$autoinstall['mysql_master_hostname'] = 'master.example.com';
$autoinstall['mysql_master_root_user'] = 'root';
$autoinstall['mysql_master_root_password'] = 'howtoforge';
$autoinstall['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
$autoinstall['configure_mail'] = 'y'; // y (default), n
$autoinstall['configure_jailkit'] = 'y'; // y (default), n
$autoinstall['configure_ftp'] = 'y'; // y (default), n
$autoinstall['configure_dns'] = 'y'; // y (default), n
$autoinstall['configure_apache'] = 'y'; // y (default), n
$autoinstall['configure_nginx'] = 'y'; // y (default), n
$autoinstall['configure_firewall'] = 'y'; // y (default), n
$autoinstall['install_ispconfig_web_interface'] = 'y'; // y (default), n
/* optional update settings, needed only for updates */
$autoupdate['do_backup'] = 'yes'; // yes (default), no
$autoupdate['mysql_root_password'] = 'howtoforge';
$autoupdate['mysql_master_hostname'] = 'master.example.com';
$autoupdate['mysql_master_root_user'] = 'root';
$autoupdate['mysql_master_root_password'] = 'howtoforge';
$autoupdate['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
$autoupdate['reconfigure_permissions_in_master_database'] = 'no'; // no (default), yes
$autoupdate['reconfigure_services'] = 'yes'; // yes (default), no
$autoupdate['ispconfig_port'] = '8080'; // default: 8080
$autoupdate['create_new_ispconfig_ssl_cert'] = 'no'; // no (default), yes
$autoupdate['reconfigure_crontab'] = 'yes'; // yes (default), no
?>
\ No newline at end of file
[install]
language=en
install_mode=standard
hostname=server1.example.com
mysql_hostname=localhost
mysql_root_user=root
mysql_root_password=ispconfig
mysql_database=dbispconfig
mysql_charset=utf8
http_server=apache
ispconfig_port=8080
ispconfig_use_ssl=y
[ssl_cert]
ssl_cert_country=AU
ssl_cert_state=Some-State
ssl_cert_locality=Chicago
ssl_cert_organisation=Internet Widgits Pty Ltd
ssl_cert_organisation_unit=IT department
ssl_cert_common_name=server1.example.com
[expert]
mysql_ispconfig_user=ispconfig
mysql_ispconfig_password=afStEratXBsgatRtsa42CadwhQ
join_multiserver_setup=n
mysql_master_hostname=master.example.com
mysql_master_root_user=root
mysql_master_root_password=ispconfig
mysql_master_database=dbispconfig
configure_mail=y
configure_jailkit=y
configure_ftp=y
configure_dns=y
configure_apache=y
configure_nginx=y
configure_firewall=y
install_ispconfig_web_interface=y
[update]
do_backup=yes
mysql_root_password=ispconfig
mysql_master_hostname=master.example.com
mysql_master_root_user=root
mysql_master_root_password=ispconfig
mysql_master_database=dbispconfig
reconfigure_permissions_in_master_database=no
reconfigure_services=yes
ispconfig_port=8080
create_new_ispconfig_ssl_cert=no
reconfigure_crontab=yes
\ No newline at end of file
<?php
/*
Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
ISPConfig 3 updater.
*/
die("Autoupdate has been removed.\nPlease start the update on the shell with the command ispconfig_update.sh as root user.\n");
error_reporting(E_ALL|E_STRICT);
/*
* If the auto-updater flag is not on (the file does not exist) then cancel the auto-update!
*/
if (!file_exists('autoupdate')) {
//** The banner on the command line
echo "\n\n".str_repeat('-', 80)."\n";
echo " _____ ___________ _____ __ _ ____
|_ _/ ___| ___ \ / __ \ / _(_) /__ \
| | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
| | `--. \ __/ | | / _ \| '_ \| _| |/ _` | |_ |
_| |_/\__/ / | | \__/\ (_) | | | | | | | (_| | ___\ \
\___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
__/ |
|___/ ";
echo "\n".str_repeat('-', 80)."\n";
echo "\n\n>>This script is for internal use only! Please use update.php! \n\n";
exit;
}
//** Include the library with the basic installer functions
require_once 'lib/install.lib.php';
//** Include the library with the basic updater functions
require_once 'lib/update.lib.php';
//** Include the base class of the installer class
require_once 'lib/installer_base.lib.php';
//** Ensure that current working directory is install directory
$cur_dir = getcwd();
if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");
//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));