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

4395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
8dace6eca5 remove special characters from name when generating extrausers file 
add froxlor hostname to 2fa-qrcode; refs #814

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-28 07:59:37 +02:00
Michael Kaufmann
78fc4f84b2 add optional dns validation for let's encrypt activated domains; fixes #817 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-14 10:28:33 +02:00
Michael Kaufmann
9018404faa Double check whether installation of acme.sh worked when not installed yet and do not continue if not; fixes #823 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-14 08:10:36 +02:00
Michael Kaufmann
8bdd843bd9 fix renew of froxlors own letsencrypt certificate; fix only variables should be passed by reference in BackupCron; fix possible notice or double inclusion of language file in ReportsCron 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-08 09:07:48 +02:00
Michael Kaufmann
0d35f5cb29 restructure acmesh implementation and let acme.sh take care of renewing the certificates itself; fixes #792, fixes #816 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-04 18:04:39 +02:00
Michael Kaufmann
6815c1c20b Merge pull request #821 from chrschn/master 
Fix renewal of ECC/ECDSA certificates.
 2020-03-29 23:52:34 +02:00
Christian Schneider
048e6c13ae Fix renewal of ECC/ECDSA certificates. 
The ACME v2 implementation uses separate directoies for ECC and on-ECC
certificates. The renew command for a domain checks if an ECC directory
exists (having a "_ecc" suffix) and refuses the command unless the
"--ecc" flag was specified.

Confusingly, this flag is only required to *renew* an ECC certificate,
but not to issue it.

This fixes https://github.com/Froxlor/Froxlor/issues/820.
 2020-03-29 22:36:26 +02:00
Michael Kaufmann
aedb829a74 Merge pull request #819 from HBerni/hberni-p0002 
fixed parsing due to changes in dovecots default mail_log_prefix
 2020-03-21 17:36:00 +01:00
HBerni
4745581720 fixed parsing due to changes in dovecots default mail_log_prefix 
regex supports old and new default format now
(see https://wiki2.dovecot.org/Upgrading/2.3)
 2020-03-21 16:39:01 +01:00
Michael Kaufmann
489ccbe07a fix removing ip address if ip is set as system-ipaddress but there are other entries of that ip with a different port 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-12 07:01:26 +01:00
Michael Kaufmann
a46e7a3bc4 set correct umask to create user config in installation 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-10 07:48:35 +01:00
Michael Kaufmann
a4431e25d3 remove ssl-certificates connected to domains that are being deleted when deleting a customer; fixes #818 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-10 07:36:22 +01:00
Michael Kaufmann
1fe9f1e9d6 fix language strings for cron cmdline setting and fallback to php binary if no setting is found 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-08 10:30:33 +01:00
Michael Kaufmann
13767df562 set version to 0.10.15 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.15 		2020-03-08 07:39:39 +01:00
Michael Kaufmann
02c5f80854 correct chmod value for userdata.inc.php file to be written on installation; fixes #815 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-08 07:35:19 +01:00
Michael Kaufmann
d7550ae58a fix deactivated check in api 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.14 		2020-03-06 22:10:01 +01:00
Michael Kaufmann
cf2c7fa31c deny api access to deactivated users with valid api-key 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-06 22:03:41 +01:00
Michael Kaufmann
32b6285589 set version to 0.10.14 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-06 20:47:20 +01:00
Michael Kaufmann
7e361274c5 forgot one escapeshellarg() and enhanced security on userdata.inc.php creation when installing 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-06 20:44:17 +01:00
Michael Kaufmann
62ce21c9ec secure shell-execution of mysqldump on installation if given database-name exists 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-04 19:35:57 +01:00
Michael Kaufmann
6b09720ef8 use unpredictable tmpfile-name in installation if lib/userdata.inc.php cannot be written due to permission 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-04 19:34:18 +01:00
Michael Kaufmann
8807ae7dad allow private ip ranges in ips-and-ports as some configurations require that; fixes #802 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-02 09:51:44 +01:00
Michael Kaufmann
5f3f208534 remove superfluous comma in sql query which causes invalid sql 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-01 09:16:47 +01:00
Michael Kaufmann
f11ceacf89 store ace-string of domain besides idn-converted string to have correct sorting in the frontend; fixes #809 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-29 09:50:29 +01:00
Michael Kaufmann
26e43077c2 make customer firstname,name,company and customer-no available for all templates; fixes #808 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-29 08:16:55 +01:00
Michael Kaufmann
d6c8b92523 add Froxlor.integrityCheck() API call to externally run integrity/consistency check, fixes #801 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-15 07:30:56 +01:00
Michael Kaufmann
03450dcfa2 fix listing of customer email addresses if 'domain' section is hidden via settings, fixes #803 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-15 07:25:23 +01:00
Michael Kaufmann
f39aab6f32 disable sslsessiontickets-option in domain-add/edit if globally disabled in the settings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-15 07:11:28 +01:00
Michael Kaufmann
7f999302fa do not require enabled vhost-container for froxlor-vhost to change sslsessiontickets-setting 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-14 19:26:06 +01:00
Michael Kaufmann
8294985588 require set password complexity for admins too when resetting password; display correct error message if password complexity is not satisfied 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-08 10:03:41 +01:00
Michael Kaufmann
a7653551b2 set version to 0.10.13 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.13 		2020-02-07 16:37:06 +01:00
Michael Kaufmann
734c02e33f update php-fpm defaults; update paths for current stable php-7.3; read froxlor default php.ini from file rather then using phpconfig with id=1; fixes #796 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-31 13:17:49 +01:00
Michael Kaufmann
ace18cb7c9 use correct default-versions for configuration-step to disable mod_php for debian buster and ubuntu bionic 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-31 12:58:04 +01:00
Michael Kaufmann
1270204cd9 fix wrongly initialized resource-usage when re-calculating it; fixes #797 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-31 09:49:29 +01:00
Michael Kaufmann
2831923708 Merge pull request #795 from lpedretti/master 
Fixed the case that the spf record is not inserted with it's quotes, and so the condition fails and 2 spf records are inserted in the domain
 2020-01-24 16:58:10 +01:00
Leonardo Pedretti
6b1ae648b4 Fixed the case that the spf record is not inserted with it's quotes, and so the condition fails and 2 spf records are inserted in the domain 2020-01-23 11:59:28 -03:00
Michael Kaufmann
6c43f1bc56 fix Domains.update() if called as admin/reseller without change_serversettings privileges, thx to rseffner 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-22 09:14:07 +01:00
Michael Kaufmann
2e273a41b5 fix IpsAndPorts when checking for system.ipaddress in update() and delete() 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-19 10:45:48 +01:00
Michael Kaufmann
2004bbe38d dont access db result arrays directly without checking whether it's false due to an error (php7.4 related) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-19 10:13:28 +01:00
Michael Kaufmann
e44e07784f validate nameserver ip-addresses for binds allow-transfer block; fixes #791 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-19 10:08:06 +01:00
Michael Kaufmann
8d6275e1aa set version to 0.10.12 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.12 		2020-01-10 17:41:20 +01:00
Michael Kaufmann
f21d4f8770 when not using awstats, disable awstats-related settings; add minor tweaks to unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-10 16:44:13 +01:00
Michael Kaufmann
fc97b4d4e9 Merge pull request #786 from patschi/logformat-awstats 
Allow configuring awstats LogFormat
 2020-01-10 16:32:33 +01:00
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