Skip to content

Commit fb3a98c

Browse files
tbrehmtbrehm
committed
Merged serveral bugfixes and new language files from stable branch (revisions 2055 - 2093)
1 parent 4b88c2b commit fb3a98c

File tree

319 files changed

+5208
-4611
lines changed

Some content is hidden

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

319 files changed

+5208
-4611
lines changed

‎docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,10 @@ apt-get -y install bind9 dnsutils
145145

146146
6) Install vlogger and webalizer
147147

148-
apt-get -y install vlogger webalizer
148+
apt-get -y install vlogger webalizer awstats
149+
150+
mkdir /usr/share/awstats/tools
151+
cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl
149152

150153

151154
7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users)

‎docs/INSTALL_DEBIAN_5.0_multiserver.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ STANDALONE_OR_INETD=standalone
2828
VIRTUALCHROOT=true
2929
[...]
3030

31-
apt-get install vlogger webalizer
31+
apt-get install vlogger webalizer awstats
32+
33+
mkdir /usr/share/awstats/tools
34+
cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl
3235

3336
apt-get install gcc make
3437

‎docs/INSTALL_DEBIAN_6.0_courier_mydns.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,10 @@ update-rc.d mydns defaults
263263

264264
6) Install vlogger and webalizer
265265

266-
apt-get -y install vlogger webalizer
266+
apt-get -y install vlogger webalizer awstats
267+
268+
mkdir /usr/share/awstats/tools
269+
cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl
267270

268271

269272
7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users)

‎docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,10 @@ apt-get -y install bind9 dnsutils
139139

140140
6) Install vlogger and webalizer
141141

142-
apt-get -y install vlogger webalizer
142+
apt-get -y install vlogger webalizer awstats
143+
144+
mkdir /usr/share/awstats/tools
145+
cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl
143146

144147

145148
7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users)

‎docs/INSTALL_OPENSUSE_11_3.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ then execute:
6464
mkdir -p /var/run/clamav
6565
ln -s /var/lib/clamav/clamd-socket /var/run/clamav/clamd
6666

67+
# On 64Bit systems, run this command to symlink the dovecot library folder. Thats for 64Bit systems only, so do not exekute the ln command on 32bit systems.
68+
69+
ln -s /usr/lib64/dovecot/modules /usr/lib/dovecot
70+
71+
6772
chkconfig --add amavis
6873
chkconfig --add clamd
6974
/etc/init.d/amavis start

‎install/dist/lib/centos52.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function configure_amavis() {
3535

3636
// amavisd user config file
3737
$configfile = 'fedora_amavisd_conf';
38-
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~');
38+
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
3939
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
4040
$content = rf("tpl/".$configfile.".master");
4141
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);

‎install/dist/lib/centos53.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function configure_amavis() {
3535

3636
// amavisd user config file
3737
$configfile = 'fedora_amavisd_conf';
38-
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~');
38+
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
3939
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
4040
$content = rf("tpl/".$configfile.".master");
4141
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public function configure_amavis() {
345345

346346
// amavisd user config file
347347
$configfile = 'fedora_amavisd_conf';
348-
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~');
348+
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
349349
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
350350
$content = rf("tpl/".$configfile.".master");
351351
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
@@ -529,7 +529,7 @@ public function configure_apache()
529529
// copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
530530
$content = rf("tpl/apache_ispconfig.conf.master");
531531
$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
532-
if(count($records) > 0) {
532+
if(is_array($records) && count($records) > 0) {
533533
foreach($records as $rec) {
534534
$content .= "NameVirtualHost ".$rec["ip_address"].":80\n";
535535
$content .= "NameVirtualHost ".$rec["ip_address"].":443\n";
@@ -579,7 +579,7 @@ public function configure_firewall()
579579
$tcp_public_services = '';
580580
$udp_public_services = '';
581581

582-
$row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id']));
582+
$row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id']));
583583

584584
if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){
585585
$tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"]));
@@ -698,6 +698,13 @@ public function install_ispconfig()
698698

699699
wf("$install_dir/server/lib/$configfile", $content);
700700

701+
//* Create the config file for remote-actions (but only, if it does not exist, because
702+
// the value is a autoinc-value and so changed by the remoteaction_core_module
703+
if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) {
704+
$content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
705+
wf($install_dir.'/server/lib/remote_action.inc.php', $content);
706+
}
707+
701708

702709
//* Enable the server modules and plugins.
703710
// TODO: Implement a selector which modules and plugins shall be enabled.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -670,14 +670,14 @@ public function install_ispconfig()
670670
//* Create the config file for ISPConfig server
671671
$this->write_config_file("$install_dir/server/lib/$configfile", $content);
672672

673-
//* Create the config file for remote-actions (but only, if it does not exist, because
674-
//* the value is a autoinc-value and so changed by the remoteaction_core_module
673+
//* Create the config file for remote-actions (but only, if it does not exist, because
674+
// the value is a autoinc-value and so changed by the remoteaction_core_module
675675
if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) {
676676
$content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
677-
$this->write_config_file("$install_dir/server/lib/remote_action.inc.php", $content);
677+
wf($install_dir.'/server/lib/remote_action.inc.php', $content);
678678
}
679679

680-
//* Enable the server modules and plugins.
680+
// Enable the server modules and plugins.
681681
// TODO: Implement a selector which modules and plugins shall be enabled.
682682
$dir = $install_dir.'/server/mods-available/';
683683
if (is_dir($dir)) {

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ public function configure_apache()
541541
//copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
542542
$content = rf("tpl/apache_ispconfig.conf.master");
543543
$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
544-
if(count($records) > 0) {
544+
if(is_array($records) && count($records) > 0) {
545545
foreach($records as $rec) {
546546
$content .= "NameVirtualHost ".$rec["ip_address"].":80\n";
547547
$content .= "NameVirtualHost ".$rec["ip_address"].":443\n";
@@ -591,7 +591,7 @@ public function configure_firewall()
591591
$tcp_public_services = '';
592592
$udp_public_services = '';
593593

594-
$row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id']));
594+
$row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id']));
595595

596596
if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){
597597
$tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"]));
@@ -710,6 +710,12 @@ public function install_ispconfig()
710710

711711
wf("$install_dir/server/lib/$configfile", $content);
712712

713+
//* Create the config file for remote-actions (but only, if it does not exist, because
714+
// the value is a autoinc-value and so changed by the remoteaction_core_module
715+
if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) {
716+
$content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
717+
wf($install_dir.'/server/lib/remote_action.inc.php', $content);
718+
}
713719

714720
//* Enable the server modules and plugins.
715721
// TODO: Implement a selector which modules and plugins shall be enabled.

0 commit comments

Comments
 (0)