Skip to content

Commit 650935e

Browse files
committed
Merge branch 'develop' of https://git.ispconfig.org/ispconfig/ispconfig3 into 6373-el9x-support
2 parents a48f1e7 + 4662046 commit 650935e

File tree

82 files changed

+142
-68
lines changed

Some content is hidden

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

82 files changed

+142
-68
lines changed

install/dist/conf/centos70.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "5.4";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

install/dist/conf/centos72.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "5.4";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

install/dist/conf/centos80.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "7.2";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

install/dist/conf/debian100.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "7.3";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

install/dist/conf/debian110.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "7.4";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

install/dist/conf/debian90.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "7.0";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

install/dist/conf/debiantesting.conf.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
//* Main
3434
$conf['language'] = 'en';
35-
$conf['distname'] = 'debian110';
35+
$conf['distname'] = 'debian120';
3636
$conf['hostname'] = 'server1.domain.tld'; // Full hostname
3737
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
3838
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "8.1";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

install/dist/conf/ubuntu1604.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "7.0";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

install/dist/conf/ubuntu1804.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "7.2";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

install/dist/conf/ubuntu2004.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$conf['runlevel'] = '/etc';
4444
$conf['shells'] = '/etc/shells';
4545
$conf['pam'] = '/etc/pam.d';
46+
$conf['default_php'] = "7.4";
4647

4748
//* Services provided by this server, this selection will be overridden by the expert mode
4849
$conf['services']['mail'] = true;

0 commit comments

Comments
 (0)