Skip to content

Commit f7022f9

Browse files
helmohelmo
committed
Merge branch 'stable-3.1' into 'patch-ci-test-install'
# Conflicts: # .gitlab-ci.yml
2 parents 9e6a611 + 5dbcd93 commit f7022f9

File tree

2,425 files changed

+28434
-11793
lines changed

Some content is hidden

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

2,425 files changed

+28434
-11793
lines changed

‎.git-scripts/syntax.sh‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#!/bin/bash
2+
3+
IFS=$'\n'
4+
EX=0
5+
ERRS="" ;
6+
WARNS="" ;
7+
ERRCNT=0 ;
8+
WARNCNT=0 ;
9+
10+
OUTCNT=0 ;
11+
FILECNT=0 ;
12+
DONECNT=0 ;
13+
14+
CMD="find . -type f \( -name \"*.php\" -o -name \"*.lng\" \) -print" ;
15+
16+
if [[ "$1" == "commit" ]] ; then
17+
CMD="git diff-tree --no-commit-id --name-only -r ${CI_COMMIT_SHA} | grep -E '\.(php|lng)$'" ;
18+
fi
19+
20+
FILECNT=$(eval "${CMD} | wc -l") ;
21+
22+
for F in $(eval "$CMD") ; do
23+
if [[ ! -e "${F}" || ! -f "${F}" ]] ; then
24+
continue ;
25+
fi
26+
R=$(php -d error_reporting=E_ALL -d display_errors=On -l "$F" 2>/dev/null) ;
27+
RET=$? ;
28+
R=$(echo "${R}" | sed "/^$/d")
29+
if [ $RET -gt 0 ] ; then
30+
EX=1 ;
31+
echo -n "E" ;
32+
ERRS="${ERRS}${F}:"$'\n'"${R}"$'\n\n' ;
33+
ERRCNT=$((ERRCNT + 1)) ;
34+
else
35+
if [[ "$R" == "Deprecated: "* ]] ; then
36+
echo -n "W" ;
37+
WARNS="${WARNS}${F}:"$'\n'"${R}"$'\n\n' ;
38+
WARNCNT=$((WARNCNT + 1)) ;
39+
else
40+
echo -n "." ;
41+
fi
42+
fi
43+
OUTCNT=$((OUTCNT + 1)) ;
44+
DONECNT=$((DONECNT + 1)) ;
45+
if [ $OUTCNT -ge 40 ] ; then
46+
OUTCNT=0 ;
47+
echo "[${DONECNT}/${FILECNT}]" ;
48+
fi
49+
done
50+
51+
echo ""
52+
echo "--------------------------";
53+
echo "${DONECNT} Files done"
54+
echo "${ERRCNT} Errors"
55+
if [ $ERRCNT -gt 0 ] ; then
56+
echo "${ERRS}"
57+
echo ""
58+
fi
59+
60+
echo "${WARNCNT} Warnings"
61+
if [ $WARNCNT -gt 0 ] ; then
62+
echo ""
63+
echo "${WARNS}"
64+
echo ""
65+
fi
66+
67+
exit $EX

‎.gitlab-ci.yml‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Defines stages which are to be executed
22
stages:
33
- syntax
4+
- syntax_diff
45
- test
56

67
#
@@ -9,18 +10,45 @@ stages:
910

1011
syntax:lint:
1112
stage: syntax
12-
image: bobey/docker-gitlab-ci-runner-php7
13+
image: edbizarro/gitlab-ci-pipeline-php:7.2
1314
allow_failure: false
1415
only:
1516
- schedules
1617
- web
1718
- merge_requests
1819

1920
script:
20-
- composer require overtrue/phplint
2121
- echo "Syntax checking PHP files"
22-
- echo "For more information http://www.icosaedro.it/phplint/"
23-
- vendor/bin/phplint
22+
- bash ./.git-scripts/syntax.sh
23+
24+
25+
syntax_diff:lint:
26+
stage: syntax
27+
image: edbizarro/gitlab-ci-pipeline-php:7.2
28+
allow_failure: false
29+
only:
30+
- web
31+
- pushes
32+
- branches
33+
34+
script:
35+
- echo "Syntax checking PHP files"
36+
- bash ./.git-scripts/syntax.sh commit
37+
38+
#syntax:lint:
39+
# stage: syntax
40+
# image: edbizarro/gitlab-ci-pipeline-php:7.2
41+
# allow_failure: false
42+
# only:
43+
# - schedules
44+
# - web
45+
# - merge_requests
46+
#
47+
# script:
48+
# - composer require overtrue/phplint
49+
# - echo "Syntax checking PHP files"
50+
# - echo "For more information http://www.icosaedro.it/phplint/"
51+
# - vendor/bin/phplint
2452

2553

2654
test:install:

‎.phplint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
path: ./
2-
jobs: 10
2+
jobs: 5
33
cache: .phplint-cache
44
extensions:
55
- php

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The master branch is used for code (mostly new features) that shall go into the
1212
* Magic quotes is gone, get used to it now. config = magic_quotes_gpc() Everything must be quoted
1313
* Don't use ereg, split and other old function -> gone in PHP 5.4
1414
* Don't use features that are not supported in PHP 5.3, for compatibility with LTS OS releases, ISPConfig must support PHP 5.3+
15-
* Don't use shorttags. A Shorttag is <? and that is confusing with <?xml -> always usw <?php
15+
* Don't use shorttags. A Shorttag is <? and that is confusing with <?xml -> always use <?php
1616
* Don't use namespaces
1717
* Column names in database tables and database table names are in lowercase
1818
* Classes for the interface are located in interface/lib/classes/ and loaded with $app->uses() or $app->load() functions.
@@ -123,4 +123,4 @@ $web_config = $app->getconf->get_server_config($server_id,'web');
123123

124124
# Learn about the form validators
125125
There are form validators in interface/lib/classes/tform.inc.php to make validating forms easier.
126-
Read about: REGEX,UNIQUE,NOTEMPTY,ISEMAIL,ISINT,ISPOSITIVE,ISIPV4,CUSTOM
126+
Read about: REGEX,UNIQUE,NOTEMPTY,ISEMAIL,ISINT,ISPOSITIVE,ISIPV4,ISIPV6,ISIP,CUSTOM

‎install/dist/conf/centos70.conf.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,11 @@
147147
$conf['amavis']['config_dir'] = '/etc/amavisd';
148148
$conf['amavis']['init_script'] = 'amavisd';
149149

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+
150155
//* ClamAV
151156
$conf['clamav']['installed'] = false; // will be detected automatically during installation
152157
$conf['clamav']['init_script'] = 'clamd@amavisd';

‎install/dist/conf/centos72.conf.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,11 @@
147147
$conf['amavis']['config_dir'] = '/etc/amavisd';
148148
$conf['amavis']['init_script'] = 'amavisd';
149149

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+
150155
//* ClamAV
151156
$conf['clamav']['installed'] = false; // will be detected automatically during installation
152157
$conf['clamav']['init_script'] = 'clamd@amavisd';

‎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+
?>

0 commit comments

Comments
 (0)