maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
4,502 Commits 6 Branches 188 Tags
a37d795ff3c5e53c7b0521f7c841341000b36d76
Commit Graph

4502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrik Kernstock
05051309c7 Merge branch 'master' into logformat-awstats 2020-01-09 23:24:26 +00:00
Patrik Kernstock
0f025a6627 Language file update 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2020-01-09 23:21:11 +00:00
Michael Kaufmann
f6f5765b54 avoid settig more than one catchall address for one domain in Emails.update(), thx to mrairstone 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-09 14:45:51 +01:00
Michael Kaufmann
ac82aa80d2 correct logfiles_format migration; only needed if setting is non-empty 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-09 14:14:04 +01:00
Michael Kaufmann
57503d9c6e try to touch logfile from settings in order for is_writable to work correctly, thx to rubberduck 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-09 14:10:50 +01:00
Michael Kaufmann
f55ad16d82 Merge pull request #785 from patschi/logformat 
Allow using more advanced webserver LogFormat
 2020-01-09 09:16:03 +01:00
Patrik Kernstock
ea7834c1d1 Added small notice to lng for awstats LogFormat 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2020-01-08 22:08:15 +00:00
Patrik Kernstock
b355711de9 Improvements as suggested by @d00p 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2020-01-08 22:08:15 +00:00
Michael Kaufmann
a5287726a4 fix issue in PhpHelper::trimArray() returning an empty array, fixes #751 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-03 23:32:21 +01:00
Patrik Kernstock
b393c7d6e6 Merge branch 'master' into logformat 2020-01-03 22:32:45 +01:00
Michael Kaufmann
dd2782771a set version to 0.10.11 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.11 		2020-01-03 13:24:31 +01:00
Michael Kaufmann
25d0bbb766 switch from algo26-matthias/idna-covert to our own fork as we cannot update to >2.1 without having a minimum requirement for php-7.2 but we need a few fixes for php-7.4 support later on 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-03 12:48:01 +01:00
Michael Kaufmann
b4dedca3db Update README.md 2020-01-02 13:53:22 +01:00
Patrik Kernstock
09aed61dbf Merge branch 'master' into logformat-awstats 2020-01-02 12:44:35 +01:00
Patrik Kernstock
ca39501530 Fixed awstats_logformat field for new installs 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2020-01-02 12:39:25 +01:00
Patrik Kernstock
28fd88e53e Merge branch 'master' into logformat 2020-01-02 12:31:51 +01:00
Michael Kaufmann
e01c2e02fb fix update query for new fpm-custom_config value, refs #783 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-02 12:28:48 +01:00
Michael Kaufmann
762bfae61a Merge pull request #783 from patschi/phpfpm-custom-settings 
Ability to add custom config to PHPFPM version
 2020-01-02 10:19:19 +01:00
Patrik Kernstock
a4d4e16efc Small comment added to escaping double-quote 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 22:46:03 +01:00
Patrik Kernstock
7f83ad31f4 Fixed dbversion in SQL/Froxlor.php 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 22:30:54 +01:00
Patrik Kernstock
e143ba4577 Allow configuring awstats LogFormat 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 22:29:29 +01:00
Patrik Kernstock
6799a56ba1 Allow using more advanced LogFormat 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 20:18:52 +01:00
Patrik Kernstock
484fe8acbc Fixed db_DBVERISON in Froxlor.php 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 17:22:37 +01:00
Patrik Kernstock
550af5b943 Fixed german lng, fixed db_version in SQL 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 17:18:17 +01:00
Patrik Kernstock
7ae59477af New update step, changed order of lang strings 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 16:14:26 +01:00
Michael Kaufmann
acefa41806 Merge pull request #781 from patschi/accesslog-logtype 
Use logtype for access_log for IPsAndPorts too
 2019-12-31 16:01:42 +01:00
Patrik Kernstock
b39c8029cd Merge branch 'master' into phpfpm-custom-settings 2019-12-31 15:51:27 +01:00
Patrik Kernstock
69ff416361 Fixed SQL, minor comments/lng updates 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 15:34:46 +01:00
Michael Kaufmann
3eb1718fe0 add option to disable SSL sessiontickets globally for older systems, fixes #784 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-31 12:27:35 +01:00
Michael Kaufmann
37c434d4fc testsystem does not listen on socket for mysql 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-31 09:29:09 +01:00
Michael Kaufmann
1eb14d7564 update composer-dependencies; add connection-test to Mysqls.update() when changing passwords; validate ssl-certificates to avoid private/public key mismatch and a failed webserver start, fixes #778 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-31 09:23:28 +01:00
Michael Kaufmann
1c17df69d2 Merge pull request #782 from patschi/fix-dhparams-indent 
Fix dhparam indent
 2019-12-31 08:11:40 +01:00
Patrik Kernstock
c61b3b73bd Ability to add custom config to PHPFPM version 
Addresses #643

Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 05:48:36 +01:00
Patrik Kernstock
18c87baec8 Fix dhparam indent 2019-12-31 03:53:12 +01:00
Patrik Kernstock
631b2b59a5 Use logtype for access_log for IPsAndPorts too 2019-12-31 03:51:19 +01:00
Michael Kaufmann
1e0510a43d fix SysLog.delete(), SysLog.listing() and SysLog.listingCount() when called as admin/reseller withouth customers_see_all permission 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-21 15:12:51 +01:00
Michael Kaufmann
e62f675c4c apply 'notryfiles', 'writeaccesslog' and 'writeerrorlog' flags to subdomains when editing a domain 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-18 08:44:02 +01:00
Michael Kaufmann
fe389ab208 setting version to 0.10.10 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.10 		2019-12-13 16:23:43 +01:00
Michael Kaufmann
63d915804a lowercase domainnames when adding new (sub)domain to avoid issues with certificates on filesystem 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-11 20:12:51 +01:00
Michael Kaufmann
466c09137b add new 'ssl-enabled' flag for domains and subdomains so ssl can be deactivated (by a customer too) even if there are ssl-ip/ports assigned; introduce new honorcipherorder and sessiontickets flags for more control over ssl-related settings on a per domain base (admin only); fixes #767 and fixes #769 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-10 10:21:35 +01:00
Michael Kaufmann
3a738b7070 fix mysql8 issue with group by and sorting within; fixes #774 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-08 10:43:12 +01:00
Michael Kaufmann
5ee9d3064a add new API function Froxlor.generatePassword() to return a random password based on froxlor settings regarding min-length, included characters, etc.; fixes #768 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-06 11:51:40 +01:00
Michael Kaufmann
adb5c6734a set version to 0.10.9 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.9 		2019-12-06 10:20:01 +01:00
Michael Kaufmann
7dff46b63e set production Lets Encrypt endpoint as default in settings like the installation does; do nat-sorting only on username-related fields, fixes #765 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-05 07:52:11 +01:00
Michael Kaufmann
12883bafd6 check for valid result when reading database usage from information_schema; fixes #766 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-04 07:15:28 +01:00
Michael Kaufmann
c2b88200f0 Merge pull request #763 from RipClaw2971/bugfix 
SQL error in lib/Froxlor/Api/Commands/Certificates.php
 2019-11-29 19:52:13 +01:00
Andreas Grundler
634199780b Bugfix 2019-11-29 19:22:43 +01:00
Michael Kaufmann
e0275840ab set version to 0.10.8 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.8 		2019-11-29 17:14:02 +01:00
Michael Kaufmann
bae8c86901 fix removing of ssl-ip-relation to domain if no ssl-ip is selected via interface, thx to Patient Nr0 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-27 18:32:27 +01:00
Michael Kaufmann
e8be3ee643 use correct apiendpoint for lets encrypt; pass debug-flag onto acme.sh; fixes #762 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-27 07:42:23 +01:00