Skip to content

Commit cc65688

Browse files
author
hellkat
committed
Merged revisions 3845-3876 and 3879-3918 from stable branch.
1 parent 6352781 commit cc65688

File tree

634 files changed

+2539
-1395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

634 files changed

+2539
-1395
lines changed

‎install/dist/lib/fedora.lib.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ public function install_ispconfig()
10241024

10251025
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
10261026
//* and create the symlink
1027-
if($this->is_update == false) {
1027+
//if($this->is_update == false) {
10281028
if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
10291029
if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
10301030
exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
@@ -1039,17 +1039,17 @@ public function install_ispconfig()
10391039
10401040
replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0);
10411041
*/
1042-
if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
1042+
//if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
10431043
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
10441044
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
10451045
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
1046-
exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
1046+
if(!is_dir('/var/www/php-fcgi-scripts/ispconfig')) exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
10471047
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
10481048
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
1049-
exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
1049+
if(!is_link('/var/www/ispconfig')) exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
10501050
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
1051-
}
1052-
}
1051+
//}
1052+
//}
10531053
}
10541054

10551055
if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
@@ -1228,7 +1228,7 @@ public function install_crontab()
12281228
$existing_cron_jobs = file('crontab.txt');
12291229

12301230
$cron_jobs = array(
1231-
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
1231+
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
12321232
);
12331233

12341234
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -1247,7 +1247,7 @@ public function install_crontab()
12471247
}
12481248

12491249
exec('touch /var/log/ispconfig/cron.log');
1250-
exec('chmod 666 /var/log/ispconfig/cron.log');
1250+
exec('chmod 660 /var/log/ispconfig/cron.log');
12511251
}
12521252

12531253
}

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,8 @@ public function configure_apps_vhost()
610610

611611
$this->write_config_file("$vhost_conf_dir/apps.vhost", $content);
612612

613-
if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
614-
{
613+
//if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
614+
//{
615615
$content = rf('tpl/apache_apps_fcgi_starter.master');
616616
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
617617
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -621,7 +621,7 @@ public function configure_apps_vhost()
621621
exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
622622
exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
623623

624-
}
624+
//}
625625
}
626626
if($conf['nginx']['installed'] == true){
627627
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
@@ -946,11 +946,11 @@ public function install_ispconfig()
946946
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
947947
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
948948
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
949-
mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
949+
@mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
950950
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
951951
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
952952
chmod('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', 0755);
953-
symlink($install_dir.'/interface/web','/var/www/ispconfig');
953+
@symlink($install_dir.'/interface/web','/var/www/ispconfig');
954954
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
955955
}
956956
}

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,7 @@ public function install_ispconfig()
10781078

10791079
wf("$vhost_conf_dir/ispconfig.vhost", $content);
10801080

1081-
if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
1081+
//if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
10821082
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
10831083
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
10841084
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -1088,7 +1088,7 @@ public function install_ispconfig()
10881088
exec('ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig');
10891089
exec('chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig');
10901090

1091-
}
1091+
//}
10921092

10931093
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
10941094
//* and create the symlink
@@ -1280,7 +1280,7 @@ public function install_crontab()
12801280
$existing_cron_jobs = file('crontab.txt');
12811281

12821282
$cron_jobs = array(
1283-
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
1283+
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
12841284
);
12851285

12861286
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -1299,7 +1299,7 @@ public function install_crontab()
12991299
}
13001300

13011301
exec('touch /var/log/ispconfig/cron.log');
1302-
exec('chmod 666 /var/log/ispconfig/cron.log');
1302+
exec('chmod 660 /var/log/ispconfig/cron.log');
13031303
}
13041304

13051305
}

‎install/lib/installer_base.lib.php‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -567,23 +567,6 @@ public function configure_mailman($status = 'insert') {
567567
}
568568
}
569569
}
570-
571-
$config_dir = $conf['mailman']['config_dir'].'/';
572-
$full_file_name = $config_dir.'virtual_to_transport.sh';
573-
574-
//* Backup exiting virtual_to_transport.sh script
575-
if(is_file($full_file_name)) {
576-
copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
577-
}
578-
579-
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
580-
chgrp($full_file_name,'list');
581-
chmod($full_file_name,0750);
582-
583-
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
584-
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
585-
586-
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
587570

588571
$virtual_domains = '';
589572
if($status == 'update')
@@ -608,8 +591,27 @@ public function configure_mailman($status = 'insert') {
608591
if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = '';
609592
$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
610593
$content = str_replace('{virtual_domains}', $virtual_domains, $content);
611-
594+
612595
wf($full_file_name, $content);
596+
597+
//* Write virtual_to_transport.sh script
598+
$config_dir = $conf['mailman']['config_dir'].'/';
599+
$full_file_name = $config_dir.'virtual_to_transport.sh';
600+
601+
//* Backup exiting virtual_to_transport.sh script
602+
if(is_file($full_file_name)) {
603+
copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
604+
}
605+
606+
if(is_dir('/etc/mailman')) {
607+
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
608+
chgrp($full_file_name,'list');
609+
chmod($full_file_name,0750);
610+
}
611+
612+
//* Create aliasaes
613+
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
614+
613615
}
614616

615617
public function configure_postfix($options = '') {
@@ -732,11 +734,13 @@ public function configure_postfix($options = '') {
732734
touch($config_dir.'/body_checks');
733735

734736
//* Create the mailman files
735-
exec('mkdir -p /var/lib/mailman/data');
737+
if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
736738
if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
737739
exec('postalias /var/lib/mailman/data/aliases');
738740
if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
739741
exec('postmap /var/lib/mailman/data/virtual-mailman');
742+
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
743+
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
740744

741745
//* Make a backup copy of the main.cf file
742746
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
@@ -1921,16 +1925,16 @@ public function install_ispconfig() {
19211925
symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
19221926
}
19231927
}
1924-
if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
1928+
//if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
19251929
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
19261930
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
19271931
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
1928-
mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
1932+
@mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
19291933
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
19301934
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
1931-
symlink($install_dir.'/interface/web','/var/www/ispconfig');
1935+
@symlink($install_dir.'/interface/web','/var/www/ispconfig');
19321936
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
1933-
}
1937+
//}
19341938
}
19351939

19361940
if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
@@ -2116,7 +2120,7 @@ public function install_crontab() {
21162120
$existing_cron_jobs = file('crontab.txt');
21172121

21182122
$cron_jobs = array(
2119-
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> '.$conf['ispconfig_log_dir'].'/cron.log'
2123+
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
21202124
);
21212125

21222126
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -2135,7 +2139,7 @@ public function install_crontab() {
21352139
}
21362140

21372141
touch($conf['ispconfig_log_dir'].'/cron.log');
2138-
chmod($conf['ispconfig_log_dir'].'/cron.log', 0666);
2142+
chmod($conf['ispconfig_log_dir'].'/cron.log', 0660);
21392143

21402144
}
21412145

‎install/sql/incremental/upd_0035.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ INSERT INTO `sys_theme` (`var_id`, `tpl_name`, `username`, `logo_url`) VALUES (N
2020
-- --------------------------------------------------------
2121

2222
ALTER TABLE `web_domain` ADD `ssl_key` MEDIUMTEXT NOT NULL AFTER `ssl_bundle`;
23-
ALTER TABLE `mail_user` ADD `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER `disablelda`
23+
ALTER TABLE `mail_user` ADD `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER `disablelda`;
2424

2525

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ CREATE TABLE `client_template` (
296296
`limit_shell_user` int(11) NOT NULL default '0',
297297
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no',
298298
`limit_webdav_user` int(11) NOT NULL default '0',
299-
`limit_aps` int(11) NOT NULL DEFAULT '0',
299+
`limit_aps` int(11) NOT NULL DEFAULT '-1',
300300
`limit_dns_zone` int(11) NOT NULL default '-1',
301301
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
302302
`limit_dns_record` int(11) NOT NULL default '-1',
@@ -2169,6 +2169,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
21692169
-- Dumping data for table `sys_config`
21702170
--
21712171

2172-
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5');
2172+
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.1');
21732173

21742174
SET FOREIGN_KEY_CHECKS = 1;

‎install/tpl/apache_ispconfig.conf.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
5050

5151
Alias /awstats-icon "/usr/share/awstats/icon"
5252

53+
NameVirtualHost *:80
54+
NameVirtualHost *:443

‎install/tpl/apache_ispconfig.vhost.master‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,19 @@ NameVirtualHost *:{vhost_port}
2828
IPCCommTimeout 7200
2929
</IfModule>
3030

31-
# <IfModule mod_php5.c>
32-
# DocumentRoot /usr/local/ispconfig/interface/web/
33-
# AddType application/x-httpd-php .php
34-
# <Directory /usr/local/ispconfig/interface/web>
35-
# # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
36-
# Options FollowSymLinks
37-
# AllowOverride None
38-
# Order allow,deny
39-
# Allow from all
40-
# php_value magic_quotes_gpc 0
41-
# </Directory>
42-
# </IfModule>
31+
<IfModule mpm_itk_module>
32+
DocumentRoot /usr/local/ispconfig/interface/web/
33+
AssignUserId ispconfig ispconfig
34+
AddType application/x-httpd-php .php
35+
<Directory /usr/local/ispconfig/interface/web>
36+
# php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
37+
Options FollowSymLinks
38+
AllowOverride None
39+
Order allow,deny
40+
Allow from all
41+
php_value magic_quotes_gpc 0
42+
</Directory>
43+
</IfModule>
4344

4445
# ErrorLog /var/log/apache2/error.log
4546
# CustomLog /var/log/apache2/access.log combined

‎install/tpl/config.inc.php.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
Copyright (c) 2007 - 2012, Till Brehm, projektfarm Gmbh
3+
Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without modification,
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
5656

5757
//** Application
5858
define('ISPC_APP_TITLE', 'ISPConfig');
59-
define('ISPC_APP_VERSION', '3.0.5');
59+
define('ISPC_APP_VERSION', '3.0.5.1');
6060
define('DEVSYSTEM', 0);
6161

6262

‎install/tpl/nginx_apps.vhost.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ server {
4646
fastcgi_pass unix:{fpm_socket};
4747
fastcgi_index index.php;
4848
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
49-
fastcgi_param PATH_INFO $fastcgi_script_name;
49+
#fastcgi_param PATH_INFO $fastcgi_script_name;
5050
fastcgi_buffer_size 128k;
5151
fastcgi_buffers 256 4k;
5252
fastcgi_busy_buffers_size 256k;

0 commit comments

Comments
 (0)