Skip to content

Commit c344f48

Browse files
ms217ms217
committed
Resolve merge conflict
2 parents 73a11e9 + 46a238a commit c344f48

File tree

80 files changed

+927
-150
lines changed

Some content is hidden

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

80 files changed

+927
-150
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispc
2626
[^1]: not actively tested
2727

2828
## Supported operating systems
29-
- Debian 9 - 11, and testing
30-
- Ubuntu 16.04 - 20.04
29+
- Debian 9 - 12, and testing
30+
- Ubuntu 16.04 - 22.04
3131
- CentOS 7 and 8
3232

3333
## Auto-install script

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,12 @@ public function install_ispconfig()
10761076
if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_dev.sh');
10771077
if(!is_link('/usr/local/bin/ispconfig_update.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh');
10781078

1079+
// Install ISPConfig cli command
1080+
if(is_file('/usr/local/bin/ispc')) unlink('/usr/local/bin/ispc');
1081+
chown($install_dir.'/server/cli/ispc', 'root');
1082+
chmod($install_dir.'/server/cli/ispc', 0700);
1083+
symlink($install_dir.'/server/cli/ispc', '/usr/local/bin/ispc');
1084+
10791085
// set the fast cgi starter script to executable
10801086
// exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
10811087

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,6 +1511,12 @@ public function install_ispconfig() {
15111511
if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_dev.sh');
15121512
if(!is_link('/usr/local/bin/ispconfig_update.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update.sh');
15131513

1514+
// Install ISPConfig cli command
1515+
if(is_file('/usr/local/bin/ispc')) unlink('/usr/local/bin/ispc');
1516+
chown($install_dir.'/server/cli/ispc', 'root');
1517+
chmod($install_dir.'/server/cli/ispc', 0700);
1518+
symlink($install_dir.'/server/cli/ispc', '/usr/local/bin/ispc');
1519+
15141520
// Make executable then unlink and symlink letsencrypt pre, post and renew hook scripts
15151521
chown($install_dir.'/server/scripts/letsencrypt_pre_hook.sh', 'root');
15161522
chown($install_dir.'/server/scripts/letsencrypt_post_hook.sh', 'root');

‎install/install.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@
664664
if($conf['bind']['installed'] == true && isset($conf['bind']['init_script']) && $conf['bind']['init_script'] != '') system($inst->getinitcommand($conf['bind']['init_script'], 'restart').' &> /dev/null');
665665
//if($conf['squid']['installed'] == true && isset($conf['squid']['init_script']) && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
666666
if($conf['nginx']['installed'] == true && isset($conf['nginx']['init_script']) && $conf['nginx']['init_script'] != '') system($inst->getinitcommand($conf['nginx']['init_script'], 'restart').' &> /dev/null');
667-
if($conf['ufw']['installed'] == true && isset($conf['ufw']['init_script']) && $conf['ufw']['init_script'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null');
667+
if(isset($conf['ufw']['installed']) && $conf['ufw']['installed'] == true && isset($conf['ufw']['init_script']) && $conf['ufw']['init_script'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null');
668668
if($conf['xmpp']['installed'] == true && isset($conf['xmpp']['init_script']) && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
669669

670670

‎install/lib/installer_base.lib.php‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ public function add_database_server_record() {
436436
$tpl_ini_array['fastcgi']['fastcgi_bin'] = $conf['fastcgi']['fastcgi_bin'];
437437
$tpl_ini_array['server']['hostname'] = $conf['hostname'];
438438
$tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']);
439-
$tpl_ini_array['server']['firewall'] = ($conf['ufw']['installed'] == true)?'ufw':'bastille';
439+
$tpl_ini_array['server']['firewall'] = (@$conf['ufw']['installed'] == true)?'ufw':'bastille';
440440
$tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir'];
441441
$tpl_ini_array['web']['website_path'] = $conf['web']['website_path'];
442442
$tpl_ini_array['web']['website_symlinks'] = $conf['web']['website_symlinks'];
@@ -2615,21 +2615,23 @@ public function configure_bastille_firewall() {
26152615

26162616
$row = $this->db->queryOneRecord('SELECT * FROM ?? WHERE server_id = ?', $conf["mysql"]["database"] . '.firewall', $conf['server_id']);
26172617

2618-
if(trim($row['tcp_port']) != '' || trim($row['udp_port']) != '') {
2619-
$tcp_public_services = trim(str_replace(',', ' ', $row['tcp_port']));
2620-
$udp_public_services = trim(str_replace(',', ' ', $row['udp_port']));
2621-
} else {
2622-
$tcp_public_services = '21 22 25 53 80 110 143 443 3306 8080 10000';
2623-
$udp_public_services = '53';
2624-
}
2618+
if (!empty($row)) {
2619+
if(trim($row['tcp_port']) != '' || trim($row['udp_port']) != '') {
2620+
$tcp_public_services = trim(str_replace(',', ' ', $row['tcp_port']));
2621+
$udp_public_services = trim(str_replace(',', ' ', $row['udp_port']));
2622+
} else {
2623+
$tcp_public_services = '21 22 25 53 80 110 143 443 3306 8080 10000';
2624+
$udp_public_services = '53';
2625+
}
26252626

2626-
if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
2627-
$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']);
2628-
if($row['tcp_port'] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ? WHERE server_id = ?", ',' . intval($conf['apache']['vhost_port']), $conf['server_id']);
2629-
}
2627+
if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
2628+
$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']);
2629+
if($row['tcp_port'] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ? WHERE server_id = ?", ',' . intval($conf['apache']['vhost_port']), $conf['server_id']);
2630+
}
26302631

2631-
$content = str_replace('{TCP_PUBLIC_SERVICES}', $tcp_public_services, $content);
2632-
$content = str_replace('{UDP_PUBLIC_SERVICES}', $udp_public_services, $content);
2632+
$content = str_replace('{TCP_PUBLIC_SERVICES}', $tcp_public_services, $content);
2633+
$content = str_replace('{UDP_PUBLIC_SERVICES}', $udp_public_services, $content);
2634+
}
26332635

26342636
wf('/etc/Bastille/bastille-firewall.cfg', $content);
26352637

@@ -3823,6 +3825,12 @@ public function install_ispconfig() {
38233825
if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_dev.sh');
38243826
if(!is_link('/usr/local/bin/ispconfig_update.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update.sh');
38253827

3828+
// Install ISPConfig cli command
3829+
if(is_file('/usr/local/bin/ispc')) unlink('/usr/local/bin/ispc');
3830+
chown($install_dir.'/server/cli/ispc', 'root');
3831+
chmod($install_dir.'/server/cli/ispc', 0700);
3832+
symlink($install_dir.'/server/cli/ispc', '/usr/local/bin/ispc');
3833+
38263834
// Make executable then unlink and symlink letsencrypt pre, post and renew hook scripts
38273835
chown($install_dir.'/server/scripts/letsencrypt_pre_hook.sh', 'root');
38283836
chown($install_dir.'/server/scripts/letsencrypt_post_hook.sh', 'root');

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
ALTER TABLE `server_php` ADD `php_cli_binary` varchar(255) DEFAULT NULL AFTER `php_fpm_socket_dir`;
22
INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `active`, `ca_name`, `ca_issue`, `ca_wildcard`, `ca_iodef`, `ca_critical`) VALUES
33
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Amazon Trust Services', 'amazontrust.com', 'Y', '', 0);
4+
ALTER TABLE `web_domain` ADD `disable_symlinknotowner` enum('n','y') NOT NULL default 'n' AFTER `last_jailkit_hash`;

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2048,6 +2048,7 @@ CREATE TABLE `web_domain` (
20482048
`delete_unused_jailkit` enum('n','y') NOT NULL default 'n',
20492049
`last_jailkit_update` date NULL DEFAULT NULL,
20502050
`last_jailkit_hash` varchar(255) DEFAULT NULL,
2051+
`disable_symlinknotowner` enum('n','y') NOT NULL default 'n',
20512052
PRIMARY KEY (`domain_id`),
20522053
UNIQUE KEY `serverdomain` ( `server_id` , `ip_address`, `domain` )
20532054
) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

‎install/tpl/master_cf_amavis10025.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
# Data returning from Amavis content filtering, defaults to incomming amavis port(10026) +1
23
127.0.0.1:10025 inet n - n - - smtpd
34
-o content_filter=
45
-o local_recipient_maps=

‎install/tpl/master_cf_amavis10027.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
# Data returning from Amavis DKIM signing, defaults to incomming amavis port(10024) +1
23
127.0.0.1:10027 inet n - n - - smtpd
34
-o content_filter=
45
-o local_recipient_maps=

‎install/update.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@
554554
}
555555

556556
if($conf['services']['firewall'] && $inst->reconfigure_app('Firewall', $reconfigure_services_answer)) {
557-
if($conf['ufw']['installed'] == true) {
557+
if(isset($conf['ufw']['installed']) && $conf['ufw']['installed'] == true) {
558558
//* Configure Ubuntu Firewall
559559
$conf['services']['firewall'] = true;
560560
swriteln('Configuring Ubuntu Firewall');
@@ -691,7 +691,7 @@
691691
}
692692

693693
if($conf['services']['firewall']) {
694-
if($conf['ufw']['installed'] == true && isset($conf['ufw']['init_script']) && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
694+
if(isset($conf['ufw']['installed']) && $conf['ufw']['installed'] == true && isset($conf['ufw']['init_script']) && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
695695
}
696696
}
697697

0 commit comments

Comments
 (0)