Skip to content

Commit aa53fab

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' into 'stable-3.1'
add CentOS 8 detection See merge request ispconfig/ispconfig3!937
2 parents c8a7b51 + 1477f12 commit aa53fab

File tree

5 files changed

+312
-21
lines changed

5 files changed

+312
-21
lines changed

‎install/dist/conf/centos80.conf.php‎

Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
1+
<?php
2+
3+
/*
4+
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
5+
All rights reserved.
6+
7+
Redistribution and use in source and binary forms, with or without modification,
8+
are permitted provided that the following conditions are met:
9+
10+
* Redistributions of source code must retain the above copyright notice,
11+
this list of conditions and the following disclaimer.
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
* Neither the name of ISPConfig nor the names of its contributors
16+
may be used to endorse or promote products derived from this software without
17+
specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
20+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22+
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
23+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
26+
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
28+
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*/
30+
31+
//*** Fedora 9 default settings
32+
33+
//* Main
34+
$conf['language'] = 'en';
35+
$conf['distname'] = 'centos80';
36+
$conf['hostname'] = 'server1.domain.tld'; // Full hostname
37+
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
38+
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
39+
$conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error
40+
$conf['ispconfig_log_dir'] = '/var/log/ispconfig';
41+
$conf['server_id'] = 1;
42+
$conf['init_scripts'] = '/etc/init.d';
43+
$conf['runlevel'] = '/etc';
44+
$conf['shells'] = '/etc/shells';
45+
$conf['pam'] = '/etc/pam.d';
46+
47+
//* Services provided by this server, this selection will be overridden by the expert mode
48+
$conf['services']['mail'] = true;
49+
$conf['services']['web'] = true;
50+
$conf['services']['dns'] = true;
51+
$conf['services']['file'] = true;
52+
$conf['services']['db'] = true;
53+
$conf['services']['vserver'] = true;
54+
55+
//* MySQL
56+
$conf['mysql']['installed'] = false; // will be detected automatically during installation
57+
$conf['mysql']['init_script'] = 'mariadb';
58+
$conf['mysql']['host'] = 'localhost';
59+
$conf['mysql']['ip'] = '127.0.0.1';
60+
$conf['mysql']['port'] = '3306';
61+
$conf['mysql']['database'] = 'dbispconfig';
62+
$conf['mysql']['admin_user'] = 'root';
63+
$conf['mysql']['admin_password'] = '';
64+
$conf['mysql']['charset'] = 'utf8';
65+
$conf['mysql']['ispconfig_user'] = 'ispconfig';
66+
$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
67+
$conf['mysql']['master_slave_setup'] = 'n';
68+
$conf['mysql']['master_host'] = '';
69+
$conf['mysql']['master_database'] = 'dbispconfig';
70+
$conf['mysql']['master_admin_user'] = 'root';
71+
$conf['mysql']['master_admin_password'] = '';
72+
$conf['mysql']['master_ispconfig_user'] = '';
73+
$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));
74+
75+
//* Apache
76+
$conf['apache']['installed'] = false; // will be detected automatically during installation
77+
$conf['apache']['user'] = 'apache';
78+
$conf['apache']['group'] = 'apache';
79+
$conf['apache']['init_script'] = 'httpd';
80+
$conf['apache']['version'] = '2.2';
81+
$conf['apache']['vhost_conf_dir'] = '/etc/httpd/conf/sites-available';
82+
$conf['apache']['vhost_conf_enabled_dir'] = '/etc/httpd/conf/sites-enabled';
83+
$conf['apache']['vhost_port'] = '8080';
84+
$conf['apache']['php_ini_path_apache'] = '/etc/php.ini';
85+
$conf['apache']['php_ini_path_cgi'] = '/etc/php.ini';
86+
87+
//* Website base settings
88+
$conf['web']['website_basedir'] = '/var/www';
89+
$conf['web']['website_path'] = '/var/www/clients/client[client_id]/web[website_id]';
90+
$conf['web']['website_symlinks'] = '/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/';
91+
92+
//* Apps base settings
93+
$conf['web']['apps_vhost_ip'] = '_default_';
94+
$conf['web']['apps_vhost_port'] = '8081';
95+
$conf['web']['apps_vhost_servername'] = '';
96+
$conf['web']['apps_vhost_user'] = 'ispapps';
97+
$conf['web']['apps_vhost_group'] = 'ispapps';
98+
99+
//* Fastcgi
100+
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/';
101+
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
102+
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';
103+
104+
//* Postfix
105+
$conf['postfix']['installed'] = false; // will be detected automatically during installation
106+
$conf['postfix']['config_dir'] = '/etc/postfix';
107+
$conf['postfix']['init_script'] = 'postfix';
108+
$conf['postfix']['user'] = 'postfix';
109+
$conf['postfix']['group'] = 'postfix';
110+
$conf['postfix']['vmail_userid'] = '5000';
111+
$conf['postfix']['vmail_username'] = 'vmail';
112+
$conf['postfix']['vmail_groupid'] = '5000';
113+
$conf['postfix']['vmail_groupname'] = 'vmail';
114+
$conf['postfix']['vmail_mailbox_base'] = '/var/vmail';
115+
116+
//* Mailman
117+
$conf['mailman']['installed'] = false; // will be detected automatically during installation
118+
$conf['mailman']['config_dir'] = '/etc/mailman';
119+
$conf['mailman']['init_script'] = 'mailman';
120+
121+
//* Getmail
122+
$conf['getmail']['installed'] = false; // will be detected automatically during installation
123+
$conf['getmail']['config_dir'] = '/etc/getmail';
124+
$conf['getmail']['program'] = '/usr/bin/getmail';
125+
126+
//* Courier
127+
$conf['courier']['installed'] = false; // will be detected automatically during installation
128+
$conf['courier']['config_dir'] = '/etc/authlib';
129+
$conf['courier']['courier-authdaemon'] = 'courier-authlib';
130+
$conf['courier']['courier-imap'] = 'courier-imap';
131+
$conf['courier']['courier-imap-ssl'] = '';
132+
$conf['courier']['courier-pop'] = '';
133+
$conf['courier']['courier-pop-ssl'] = '';
134+
135+
//* Dovecot
136+
$conf['dovecot']['installed'] = false; // will be detected automatically during installation
137+
$conf['dovecot']['config_dir'] = '/etc/dovecot';
138+
$conf['dovecot']['init_script'] = 'dovecot';
139+
140+
//* SASL
141+
$conf['saslauthd']['installed'] = false; // will be detected automatically during installation
142+
$conf['saslauthd']['config'] = '/etc/sysconfig/saslauthd';
143+
$conf['saslauthd']['init_script'] = 'saslauthd';
144+
145+
//* Amavisd
146+
$conf['amavis']['installed'] = false; // will be detected automatically during installation
147+
$conf['amavis']['config_dir'] = '/etc/amavisd';
148+
$conf['amavis']['init_script'] = 'amavisd';
149+
150+
//* Rspamd
151+
$conf['rspamd']['installed'] = false; // will be detected automatically during installation
152+
$conf['rspamd']['config_dir'] = '/etc/rspamd';
153+
$conf['rspamd']['init_script'] = 'rspamd';
154+
155+
//* ClamAV
156+
$conf['clamav']['installed'] = false; // will be detected automatically during installation
157+
$conf['clamav']['init_script'] = 'clamd@amavisd';
158+
159+
//* Pureftpd
160+
$conf['pureftpd']['installed'] = false; // will be detected automatically during installation
161+
$conf['pureftpd']['config_dir'] = '/etc/pure-ftpd';
162+
$conf['pureftpd']['init_script'] = 'pure-ftpd';
163+
164+
//* MyDNS
165+
$conf['mydns']['installed'] = false; // will be detected automatically during installation
166+
$conf['mydns']['config_dir'] = '/etc';
167+
$conf['mydns']['init_script'] = 'mydns';
168+
169+
//* PowerDNS
170+
$conf['powerdns']['installed'] = false; // will be detected automatically during installation
171+
$conf['powerdns']['database'] = 'powerdns';
172+
$conf["powerdns"]["config_dir"] = '/etc/powerdns/pdns.d';
173+
$conf['powerdns']['init_script'] = 'pdns';
174+
175+
//* BIND DNS Server
176+
$conf['bind']['installed'] = false; // will be detected automatically during installation
177+
$conf['bind']['bind_user'] = 'named';
178+
$conf['bind']['bind_group'] = 'named';
179+
$conf['bind']['bind_zonefiles_dir'] = '/var/named';
180+
$conf['bind']['named_conf_path'] = '/etc/named.conf';
181+
$conf['bind']['named_conf_local_path'] = '/etc/named.conf.local';
182+
$conf['bind']['init_script'] = 'named';
183+
184+
//* Jailkit
185+
$conf['jailkit']['installed'] = false; // will be detected automatically during installation
186+
$conf['jailkit']['config_dir'] = '/etc/jailkit';
187+
$conf['jailkit']['jk_init'] = 'jk_init.ini';
188+
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
189+
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';
190+
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
191+
192+
//* Squid
193+
$conf['squid']['installed'] = false; // will be detected automatically during installation
194+
$conf['squid']['config_dir'] = '/etc/squid';
195+
$conf['squid']['init_script'] = 'squid';
196+
197+
//* Nginx
198+
$conf['nginx']['installed'] = false; // will be detected automatically during installation
199+
$conf['nginx']['user'] = 'nginx';
200+
$conf['nginx']['group'] = 'nginx';
201+
$conf['nginx']['config_dir'] = '/etc/nginx';
202+
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
203+
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
204+
$conf['nginx']['init_script'] = 'nginx';
205+
$conf['nginx']['vhost_port'] = '8080';
206+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
207+
$conf['nginx']['php_fpm_init_script'] = 'php-fpm';
208+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini';
209+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d';
210+
$conf['nginx']['php_fpm_start_port'] = 9010;
211+
$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm';
212+
213+
//* vlogger
214+
$conf['vlogger']['config_dir'] = '/etc';
215+
216+
//* cron
217+
$conf['cron']['init_script'] = 'crond';
218+
$conf['cron']['crontab_dir'] = '/etc/cron.d';
219+
$conf['cron']['wget'] = '/usr/bin/wget';
220+
221+
//* OpenVZ
222+
$conf['openvz']['installed'] = false;
223+
224+
?>

‎install/dist/lib/centos80.lib.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
/*
4+
Copyright (c) 2014, Till Brehm, ISPConfig UG
5+
All rights reserved.
6+
7+
Redistribution and use in source and binary forms, with or without modification,
8+
are permitted provided that the following conditions are met:
9+
10+
* Redistributions of source code must retain the above copyright notice,
11+
this list of conditions and the following disclaimer.
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
* Neither the name of ISPConfig nor the names of its contributors
16+
may be used to endorse or promote products derived from this software without
17+
specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
20+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22+
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
23+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
26+
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
28+
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*/
30+
31+
require_once realpath(dirname(__FILE__)) . '/centos_base.lib.php';
32+
33+
class installer extends installer_centos {
34+
35+
protected $clamav_socket = '/var/run/clamd.amavisd/clamd.sock';
36+
37+
// everything else is inherited from installer_centos class
38+
}
39+
40+
?>

‎install/lib/install.lib.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,15 @@ function get_distname() {
341341
$distid = 'centos72';
342342
}
343343
swriteln("Operating System: CentOS $var\n");
344+
} elseif(stristr($content, 'CentOS Linux release 8')) {
345+
$distname = 'CentOS';
346+
$distver = 'Unknown';
347+
$distbaseid = 'fedora';
348+
$distid = 'centos80';
349+
$var=explode(" ", $content);
350+
$var=explode(".", $var[3]);
351+
$var=$var[0].".".$var[1];
352+
swriteln("Operating System: CentOS $var\n");
344353
} else {
345354
$distname = 'Redhat';
346355
$distver = 'Unknown';

‎server/lib/classes/cron.d/100-monitor_system_update.inc.php‎

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -160,28 +160,38 @@ public function onRunJob() {
160160
*/
161161
$data['output'] = shell_exec('zypper lu');
162162
} elseif(file_exists('/etc/redhat-release')) {
163-
/*
164-
* update and find the upgrade.
165-
* if there is any output, then there is a needed update
166-
*/
167-
$aptData = shell_exec('yum -q list updates');
168-
if ($aptData == '') {
169-
/* There is nothing to update! */
170-
$state = 'ok';
171-
} else {
172-
/*
173-
* There is something to update! this is in most cases not critical, so we can
174-
* do a system-update once a month or so...
175-
*/
176-
$state = 'info';
177-
}
178-
179-
/*
180-
* Fetch the output
181-
*/
182-
$data['output'] = shell_exec('yum -q list updates');
163+
/*
164+
* update and find the upgrade.
165+
* if there is any output, then there is a needed update
166+
*/
167+
168+
/* try to figure out the default package manager first */
169+
if(file_exists('/usr/bin/dnf') && (is_link('/usr/bin/yum'))) {
170+
$rhPkgMgr = 'dnf';
171+
} elseif(file_exists('/usr/bin/dnf') && (!file_exists('/usr/bin/yum')) || (!is_link('/usr/bin/yum'))) {
172+
$rhPkgMgr = 'dnf';
173+
} else {
174+
$rhPkgMgr = 'yum';
175+
}
176+
177+
$aptData = shell_exec($rhPkgMgr. ' -q list updates');
178+
if ($aptData == '') {
179+
/* There is nothing to update! */
180+
$state = 'ok';
181+
} else {
182+
/*
183+
* There is something to update! this is in most cases not critical, so we can
184+
* do a system-update once a month or so...
185+
*/
186+
$state = 'info';
187+
}
188+
189+
/*
190+
* Fetch the output
191+
*/
192+
$data['output'] = shell_exec($rhPkgMgr. ' -q list updates');
183193

184-
} else {
194+
} else {
185195
/*
186196
* It is not Debian/Ubuntu, so there is no data and no state
187197
*

‎server/lib/classes/monitor_tools.inc.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,14 @@ function get_distname() {
319319
} else {
320320
$distid = 'centos72';
321321
}
322+
} elseif(stristr($content, 'CentOS Linux release 8')) {
323+
preg_match_all('/([0-9]{1,2})\.?([0-9]{0,2})\.?([0-9]*)/', $content, $version);
324+
$distname = 'CentOS';
325+
$distver = is_array($version)? implode('.', array_filter(array($version[1][0],$version[2][0],$version[3][0]),'strlen')) :'Unknown';
326+
$distbaseid = 'fedora';
327+
$var=explode(" ", $content);
328+
$var=explode(".", $var[3]);
329+
$var=$var[0].".".$var[1];
322330
} else {
323331
$distname = 'Redhat';
324332
$distver = 'Unknown';

0 commit comments

Comments
 (0)