Skip to content

Commit df1798b

Browse files
author
Till Brehm
committed
Merge branch '6828-ispconfig-extension-installer' into 'develop'
Resolve "ISPConfig Extension Installer" Closes #6828 and #6826 See merge request ispconfig/ispconfig3!1986
2 parents 7b3ce95 + e97ccce commit df1798b

Some content is hidden

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

63 files changed

+3723
-0
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,5 @@ Temporary Items
6565
/server/lib/config.inc.local.php
6666
/interface/lib/config.inc.local.php
6767
/install/existing_db.sql
68+
69+
sync_config.jsonc

‎extensions/empty.dir‎

Whitespace-only changes.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,10 @@ public function install_ispconfig()
853853
$command = 'chown -R ispconfig:ispconfig '.$install_dir.'/interface';
854854
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
855855

856+
//* chown the extensions directory to the ispconfig user and group
857+
$command = 'chown ispconfig:ispconfig '.$install_dir.'/extensions';
858+
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
859+
856860
//* chown the server files to the root user and group
857861
$command = 'chown -R root:root '.$install_dir.'/server';
858862
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,6 +1287,10 @@ public function install_ispconfig() {
12871287
$command = 'chown -R ispconfig:ispconfig '.$install_dir.'/interface';
12881288
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
12891289

1290+
//* chown the extensions directory to the ispconfig user and group
1291+
$command = 'chown ispconfig:ispconfig '.$install_dir.'/extensions';
1292+
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
1293+
12901294
//* Chmod the files and directories in the acme dir
12911295
$command = 'chmod -R 755 '.$install_dir.'/interface/acme';
12921296
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,6 +1072,10 @@ public function install_ispconfig()
10721072
$command = 'chown -R ispconfig:ispconfig '.$install_dir.'/interface';
10731073
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
10741074

1075+
//* chown the extensions directory to the ispconfig user and group
1076+
$command = 'chown ispconfig:ispconfig '.$install_dir.'/extensions';
1077+
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
1078+
10751079
//* chown the server files to the root user and group
10761080
$command = 'chown -R root:root '.$install_dir.'/server';
10771081
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

‎install/lib/installer_base.lib.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3637,6 +3637,10 @@ public function install_ispconfig() {
36373637
$command = 'chown -R ispconfig:ispconfig '.$install_dir.'/interface';
36383638
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
36393639

3640+
//* chown the extensions directory to the ispconfig user and group
3641+
$command = 'chown ispconfig:ispconfig '.$install_dir.'/extensions';
3642+
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
3643+
36403644
//* Chmod the files and directories in the acme dir
36413645
$command = 'chmod -R 755 '.$install_dir.'/interface/acme';
36423646
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ALTER TABLE `client_template` ADD `limit_database_postgresql` INT NOT NULL DEFAU
55
ALTER TABLE `server_php` ADD `php_cli_binary` varchar(255) DEFAULT NULL AFTER `php_fpm_socket_dir`;
66
ALTER TABLE `server_php` ADD `php_jk_section` varchar(255) DEFAULT NULL AFTER `php_cli_binary`;
77
ALTER TABLE `mail_domain` ADD `local_delivery` enum('n','y') NOT NULL DEFAULT 'y' AFTER `active`;
8+
ALTER TABLE `sys_remoteaction` CHANGE `action_type` `action_type` VARCHAR(64) NOT NULL;
89

910
CREATE TABLE IF NOT EXISTS `sys_message` (
1011
`message_id` int(11) unsigned NOT NULL AUTO_INCREMENT,

0 commit comments

Comments
 (0)