Debian testing/unknown template is outdated
Hello.
I have two issues with current installation/update process. In particular, settings for Debian Testing no longer apply to that version (for example, older php version), and I also believe that unknown Debian version should point to Testing, which is the most correct in terms of future compatibility. For example, my existing setup is detected as such, because I'm using Testing and not Sid.
I've attached my patch below that addresses above issues. I'm not sending PR with it right away as I'm not sure if you're fine with my approach. Please review it and if you could do something similar (or just merging my patch) to address my issue above, I'd appreciate that.
--- ispconfig3_install/install/dist/conf/debiantesting.conf.php 2018-08-17 18:22:58.000000000 +0200
+++ ispconfig3_install2/install/dist/conf/debiantesting.conf.php 2019-05-20 13:17:47.644034627 +0200
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2016, Till Brehm, ISPConfig UG
+Copyright (c) 2017, Till Brehm, ISPConfig UG
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -28,11 +28,11 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-//*** Ubuntu 16.04 default settings
+//*** Ubuntu 18.04 default settings
//* Main
$conf['language'] = 'en';
-$conf['distname'] = 'ubuntu1604';
+$conf['distname'] = 'ubuntu1804';
$conf['hostname'] = 'server1.domain.tld'; // Full hostname
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
@@ -83,8 +83,8 @@ $conf['apache']['version'] = '2.4';
$conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available';
$conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled';
$conf['apache']['vhost_port'] = '8080';
-$conf['apache']['php_ini_path_apache'] = '/etc/php/7.0/apache2/php.ini';
-$conf['apache']['php_ini_path_cgi'] = '/etc/php/7.0/cgi/php.ini';
+$conf['apache']['php_ini_path_apache'] = '/etc/php/7.3/apache2/php.ini';
+$conf['apache']['php_ini_path_cgi'] = '/etc/php/7.3/cgi/php.ini';
//* Website base settings
$conf['web']['website_basedir'] = '/var/www';
@@ -99,7 +99,7 @@ $conf['web']['apps_vhost_user'] = 'ispap
$conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
-$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php/7.0/cgi/';
+$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php/7.3/cgi/';
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';
@@ -183,7 +183,7 @@ $conf['jailkit']['installed'] = false; /
$conf['jailkit']['config_dir'] = '/etc/jailkit';
$conf['jailkit']['jk_init'] = 'jk_init.ini';
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
-$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch';
+$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch /etc/localtime';
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
//* Squid
@@ -201,11 +201,11 @@ $conf['nginx']['vhost_conf_enabled_dir']
$conf['nginx']['init_script'] = 'nginx';
$conf['nginx']['vhost_port'] = '8080';
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
-$conf['nginx']['php_fpm_init_script'] = 'php7.0-fpm';
-$conf['nginx']['php_fpm_ini_path'] = '/etc/php/7.0/fpm/php.ini';
-$conf['nginx']['php_fpm_pool_dir'] = '/etc/php/7.0/fpm/pool.d';
+$conf['nginx']['php_fpm_init_script'] = 'php7.3-fpm';
+$conf['nginx']['php_fpm_ini_path'] = '/etc/php/7.3/fpm/php.ini';
+$conf['nginx']['php_fpm_pool_dir'] = '/etc/php/7.3/fpm/pool.d';
$conf['nginx']['php_fpm_start_port'] = 9010;
-$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php7.0-fpm';
+$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php7.3-fpm';
//* OpenVZ
$conf['openvz']['installed'] = false;
diff -rupN ispconfig3_install/install/lib/install.lib.php ispconfig3_install2/install/lib/install.lib.php
--- ispconfig3_install/install/lib/install.lib.php 2019-02-19 15:31:07.000000000 +0100
+++ ispconfig3_install2/install/lib/install.lib.php 2019-05-20 13:25:25.990839694 +0200
@@ -238,7 +238,7 @@ function get_distname() {
$distname = 'Debian';
$distver = 'Unknown';
$distid = 'debian60';
- $distconfid = 'debian90';
+ $distconfid = 'debiantesting';
$distbaseid = 'debian';
swriteln("Operating System: Debian or compatible, unknown version.\n");
}
Edited by Łukasz Domeradzki