Skip to content

Commit c29ebd0

Browse files
author
Till Brehm
committed
Merge branch '6373-el9x-support' into 'develop'
Resolve "Add support for RHEL 9 and compatible clones" Closes #6373 See merge request ispconfig/ispconfig3!1656
2 parents 4662046 + c69cf27 commit c29ebd0

File tree

6 files changed

+388
-107
lines changed

6 files changed

+388
-107
lines changed

install/dist/conf/centos72.conf.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
3030

31-
//*** Fedora 9 default settings
31+
//*** RHEL 7 derivatives default settings
3232

3333
//* Main
3434
$conf['language'] = 'en';

install/dist/conf/centos80.conf.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
3030

31-
//*** Fedora 9 default settings
31+
//*** RHEL 8 derivatives default settings
3232

3333
//* Main
3434
$conf['language'] = 'en';
Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
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+
//*** RHEL 9 derivatives default settings
32+
33+
//* Main
34+
$conf['language'] = 'en';
35+
$conf['distname'] = 'centos90';
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+
$conf['default_php'] = "8.0";
47+
48+
//* Services provided by this server, this selection will be overridden by the expert mode
49+
$conf['services']['mail'] = true;
50+
$conf['services']['web'] = true;
51+
$conf['services']['dns'] = true;
52+
$conf['services']['file'] = true;
53+
$conf['services']['db'] = true;
54+
$conf['services']['vserver'] = true;
55+
56+
//* MySQL
57+
$conf['mysql']['installed'] = false; // will be detected automatically during installation
58+
$conf['mysql']['init_script'] = 'mariadb';
59+
$conf['mysql']['host'] = 'localhost';
60+
$conf['mysql']['ip'] = '127.0.0.1';
61+
$conf['mysql']['port'] = '3306';
62+
$conf['mysql']['database'] = 'dbispconfig';
63+
$conf['mysql']['admin_user'] = 'root';
64+
$conf['mysql']['admin_password'] = '';
65+
$conf['mysql']['charset'] = 'utf8';
66+
$conf['mysql']['ispconfig_user'] = 'ispconfig';
67+
$conf['mysql']['ispconfig_password'] = md5(random_bytes(20));
68+
$conf['mysql']['master_slave_setup'] = 'n';
69+
$conf['mysql']['master_host'] = '';
70+
$conf['mysql']['master_port'] = '3306';
71+
$conf['mysql']['master_database'] = 'dbispconfig';
72+
$conf['mysql']['master_admin_user'] = 'root';
73+
$conf['mysql']['master_admin_password'] = '';
74+
$conf['mysql']['master_ispconfig_user'] = '';
75+
$conf['mysql']['master_ispconfig_password'] = md5(random_bytes(20));
76+
77+
//* Apache
78+
$conf['apache']['installed'] = false; // will be detected automatically during installation
79+
$conf['apache']['user'] = 'apache';
80+
$conf['apache']['group'] = 'apache';
81+
$conf['apache']['init_script'] = 'httpd';
82+
$conf['apache']['version'] = '2.2';
83+
$conf['apache']['vhost_conf_dir'] = '/etc/httpd/conf/sites-available';
84+
$conf['apache']['vhost_conf_enabled_dir'] = '/etc/httpd/conf/sites-enabled';
85+
$conf['apache']['vhost_port'] = '8080';
86+
$conf['apache']['php_ini_path_apache'] = '/etc/php.ini';
87+
$conf['apache']['php_ini_path_cgi'] = '/etc/php.ini';
88+
89+
//* Website base settings
90+
$conf['web']['website_basedir'] = '/var/www';
91+
$conf['web']['website_path'] = '/var/www/clients/client[client_id]/web[website_id]';
92+
$conf['web']['website_symlinks'] = '/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/';
93+
94+
//* Apps base settings
95+
$conf['web']['apps_vhost_ip'] = '_default_';
96+
$conf['web']['apps_vhost_port'] = '8081';
97+
$conf['web']['apps_vhost_servername'] = '';
98+
$conf['web']['apps_vhost_user'] = 'ispapps';
99+
$conf['web']['apps_vhost_group'] = 'ispapps';
100+
101+
//* AWStats settings
102+
$conf['awstats']['pl'] = '/usr/share/awstats/wwwroot/cgi-bin/awstats.pl';
103+
104+
//* Fastcgi
105+
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/';
106+
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
107+
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';
108+
109+
//* Postfix
110+
$conf['postfix']['installed'] = false; // will be detected automatically during installation
111+
$conf['postfix']['config_dir'] = '/etc/postfix';
112+
$conf['postfix']['init_script'] = 'postfix';
113+
$conf['postfix']['user'] = 'postfix';
114+
$conf['postfix']['group'] = 'postfix';
115+
$conf['postfix']['vmail_userid'] = '5000';
116+
$conf['postfix']['vmail_username'] = 'vmail';
117+
$conf['postfix']['vmail_groupid'] = '5000';
118+
$conf['postfix']['vmail_groupname'] = 'vmail';
119+
$conf['postfix']['vmail_mailbox_base'] = '/var/vmail';
120+
121+
//* Mailman
122+
$conf['mailman']['installed'] = false; // will be detected automatically during installation
123+
$conf['mailman']['config_dir'] = '/etc/mailman';
124+
$conf['mailman']['init_script'] = 'mailman';
125+
126+
//* Getmail
127+
$conf['getmail']['installed'] = false; // will be detected automatically during installation
128+
$conf['getmail']['config_dir'] = '/etc/getmail';
129+
$conf['getmail']['program'] = '/usr/bin/getmail';
130+
131+
//* Courier
132+
$conf['courier']['installed'] = false; // will be detected automatically during installation
133+
$conf['courier']['config_dir'] = '/etc/authlib';
134+
$conf['courier']['courier-authdaemon'] = 'courier-authlib';
135+
$conf['courier']['courier-imap'] = 'courier-imap';
136+
$conf['courier']['courier-imap-ssl'] = '';
137+
$conf['courier']['courier-pop'] = '';
138+
$conf['courier']['courier-pop-ssl'] = '';
139+
140+
//* Dovecot
141+
$conf['dovecot']['installed'] = false; // will be detected automatically during installation
142+
$conf['dovecot']['config_dir'] = '/etc/dovecot';
143+
$conf['dovecot']['init_script'] = 'dovecot';
144+
145+
//* SASL
146+
$conf['saslauthd']['installed'] = false; // will be detected automatically during installation
147+
$conf['saslauthd']['config'] = '/etc/sysconfig/saslauthd';
148+
$conf['saslauthd']['init_script'] = 'saslauthd';
149+
150+
//* Amavisd
151+
$conf['amavis']['installed'] = false; // will be detected automatically during installation
152+
$conf['amavis']['config_dir'] = '/etc/amavisd';
153+
$conf['amavis']['init_script'] = 'amavisd';
154+
155+
//* Rspamd
156+
$conf['rspamd']['installed'] = false; // will be detected automatically during installation
157+
$conf['rspamd']['config_dir'] = '/etc/rspamd';
158+
$conf['rspamd']['init_script'] = 'rspamd';
159+
160+
//* ClamAV
161+
$conf['clamav']['installed'] = false; // will be detected automatically during installation
162+
$conf['clamav']['init_script'] = 'clamd@amavisd';
163+
164+
//* Pureftpd
165+
$conf['pureftpd']['installed'] = false; // will be detected automatically during installation
166+
$conf['pureftpd']['config_dir'] = '/etc/pure-ftpd';
167+
$conf['pureftpd']['init_script'] = 'pure-ftpd';
168+
169+
//* MyDNS
170+
$conf['mydns']['installed'] = false; // will be detected automatically during installation
171+
$conf['mydns']['config_dir'] = '/etc';
172+
$conf['mydns']['init_script'] = 'mydns';
173+
174+
//* PowerDNS
175+
$conf['powerdns']['installed'] = false; // will be detected automatically during installation
176+
$conf['powerdns']['database'] = 'powerdns';
177+
$conf["powerdns"]["config_dir"] = '/etc/powerdns/pdns.d';
178+
$conf['powerdns']['init_script'] = 'pdns';
179+
180+
//* BIND DNS Server
181+
$conf['bind']['installed'] = false; // will be detected automatically during installation
182+
$conf['bind']['bind_user'] = 'named';
183+
$conf['bind']['bind_group'] = 'named';
184+
$conf['bind']['bind_zonefiles_dir'] = '/var/named';
185+
$conf['bind']['named_conf_path'] = '/etc/named.conf';
186+
$conf['bind']['named_conf_local_path'] = '/etc/named.conf.local';
187+
$conf['bind']['init_script'] = 'named';
188+
189+
//* Jailkit
190+
$conf['jailkit']['installed'] = false; // will be detected automatically during installation
191+
$conf['jailkit']['config_dir'] = '/etc/jailkit';
192+
$conf['jailkit']['jk_init'] = 'jk_init.ini';
193+
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
194+
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';
195+
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
196+
197+
//* Squid
198+
$conf['squid']['installed'] = false; // will be detected automatically during installation
199+
$conf['squid']['config_dir'] = '/etc/squid';
200+
$conf['squid']['init_script'] = 'squid';
201+
202+
//* Nginx
203+
$conf['nginx']['installed'] = false; // will be detected automatically during installation
204+
$conf['nginx']['user'] = 'nginx';
205+
$conf['nginx']['group'] = 'nginx';
206+
$conf['nginx']['config_dir'] = '/etc/nginx';
207+
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
208+
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
209+
$conf['nginx']['init_script'] = 'nginx';
210+
$conf['nginx']['vhost_port'] = '8080';
211+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
212+
$conf['nginx']['php_fpm_init_script'] = 'php-fpm';
213+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini';
214+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d';
215+
$conf['nginx']['php_fpm_start_port'] = 9010;
216+
$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm';
217+
218+
//* vlogger
219+
$conf['vlogger']['config_dir'] = '/etc';
220+
221+
//* cron
222+
$conf['cron']['init_script'] = 'crond';
223+
$conf['cron']['crontab_dir'] = '/etc/cron.d';
224+
$conf['cron']['wget'] = '/usr/bin/wget';
225+
226+
//* OpenVZ
227+
$conf['openvz']['installed'] = false;
228+
229+
// AppArmor
230+
$conf['apparmor']['installed'] = false;
231+
232+
?>

install/dist/lib/centos90.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+
?>

0 commit comments

Comments
 (0)