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

4065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
13bfd62ac5 move validateUrl function to correct file 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-05 06:50:06 +02:00
Michael Kaufmann
97703e7a0c add a few tests for Settings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-05 06:39:44 +02:00
Michael Kaufmann
13086d91d8 only validate and process ip-list if given at all 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-04 15:14:51 +02:00
Michael Kaufmann
b7a10fdeda fix vhost(parts)-merging in nginx cron, fixes #669 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-03 11:59:56 +02:00
Michael Kaufmann
6806f896d6 fix proftp path of rhel/centos config template, fixes #636 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-31 08:02:03 +02:00
Michael Kaufmann
87a2f86365 do not set default ssl-ips if the frontend values are left empty; if default ssl-ips are specified, preset them in the form when adding a domain, fixes #697 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-30 17:44:08 +02:00
Michael Kaufmann
a647d48fbe fix up testing/production switch and challengepath for lets encrypt, fixes #696 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-27 17:48:33 +02:00
Michael Kaufmann
35e14fde14 set version to 0.10.0-rc2 for second release candidate 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.0-rc2 		2019-05-27 11:47:58 +02:00
Michael Kaufmann
68f55f9596 dont allow bootstrap.php file from tests/ to be called via browser 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-27 08:33:36 +02:00
Michael Kaufmann
3fec579f85 Merge pull request #683 from discordier/hotfix/pcre-maillog 
Fixes #682 - mail log parsing regex character group
 2019-05-13 20:03:49 +02:00
Christian Schiffler
e2d69c664a Fixes #682 - mail log parsing regex character group 
The mail log parsing regex was incorrectly using a character group of `\A`
 2019-05-13 19:53:55 +02:00
Michael Kaufmann
72016a5735 fix integrity-check language-file entries 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-07 14:03:37 +02:00
Michael Kaufmann
eba163fc4a Merge pull request #677 from pquerner/#646 
allow auth basic in URL, fixes #646
 2019-04-30 07:14:48 +02:00
Michael Kaufmann
8df6654ad0 Merge pull request #676 from pquerner/#675 
use correct validate-ip function in \Froxlor\Validate\Validate::validateUrl, fixes #675
 2019-04-30 07:09:20 +02:00
Pascal
1a5e43b6f7 fixes #646 
change regex by using well tested regex from here:
https://mathiasbynens.be/demo/url-regex

by @diegoperini
https://gist.github.com/dperini/729294
 2019-04-30 00:08:32 +02:00
Pascal
c4c7f4b636 fixes #675 
fix call to static method
 2019-04-29 23:39:10 +02:00
Michael Kaufmann
9aa0de16be Merge branch 'foliengriller-annotationsAPI' 2019-04-26 12:24:15 +02:00
Michael Kaufmann
cb636fe2c9 Merge branch 'annotationsAPI' of https://github.com/foliengriller/Froxlor into foliengriller-annotationsAPI 2019-04-26 12:23:58 +02:00
Michael Kaufmann
f93dc5643f fix error that wildcard-domains and lets-encrypt are not possible when using ACMEv2; fixes #674 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 14:20:02 +02:00
Michael Kaufmann
974b151d02 add Debian 10 (Buster) and Ubuntu 18.04 (Bionic) config-templates for TESTING 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 14:04:15 +02:00
Michael Kaufmann
8835dd0b65 remove deprecated config-templates for Ubuntu 12.04 (Precise); mark Debian 7 (Jessie) and Ubuntu 14.04 (Trusty) as deprecated 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 14:03:39 +02:00
Michael Kaufmann
626b791c67 remove recursor options in powerdns config template for gentoo, as recursion has been removed in pdns >=4.1.0; fixes #673 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 13:56:42 +02:00
Michael Kaufmann
82508587b3 update mysql-table engines to InnoDB; fixes #671 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 13:31:18 +02:00
Michael Kaufmann
0d7fa5728c fix auto-delete of cetificates when no domain exists anylonger, thx to an error-report 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-14 08:13:34 +02:00
Michael Kaufmann
29365838b3 set version to 0.10.0-rc1 for upcoming release candidate 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.0-rc1 		2019-04-10 08:24:04 +02:00
Michael Kaufmann
13ac7ef66c Merge pull request #666 from sokai/sokai-patch-1 
logrotate snipet: (more) GDPR ‚compliant‘; fixes #665
 2019-03-16 18:10:19 +01:00
Michael Kaufmann
6764747fa9 use system.defaultttl setting also for SOA record; fixes #667 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-03-16 18:09:21 +01:00
sokai
91df02916c logrotate snipet: GDPR ‚compliance‘ 
see: https://github.com/Froxlor/Froxlor/issues/665
 2019-03-16 13:08:44 +01:00
sokai
bf400fc5f8 logrotate snipet: GDPR ‚compliance‘ 
see: https://github.com/Froxlor/Froxlor/issues/665
 2019-03-16 13:07:49 +01:00
sokai
6cd73c9ebf logrotate snipet: GDPR ‚compliance‘ 
see: https://github.com/Froxlor/Froxlor/issues/665
 2019-03-16 13:07:14 +01:00
sokai
ed9ab39c5e logrotate snipet: GDPR ‚complieance‘ 
see: https://github.com/Froxlor/Froxlor/issues/665
 2019-03-16 13:05:54 +01:00
sokai
678bd1bcdc logrotate snipet: GDPR ‚complieance‘ 
see: https://github.com/Froxlor/Froxlor/issues/665
 2019-03-16 13:05:11 +01:00
sokai
90fe548901 logrotate snipet: GDPR ‚complieance‘ 
see: https://github.com/Froxlor/Froxlor/issues/665
 2019-03-16 13:04:26 +01:00
sokai
a158d4bfb9 logrotate snipet: GDPR ‚complieance‘ 
see https://github.com/Froxlor/Froxlor/issues/665
 2019-03-16 13:02:01 +01:00
Michael Kaufmann
4028e3ba5c testing with new IdnaConverter seems to require php-7.1 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-03-10 17:16:59 +01:00
Michael Kaufmann
f7d24e8870 IdnaConverter repository changed url 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-03-10 17:13:51 +01:00
Michael Kaufmann
b1bbb1847d put log_format directive in correct context (http-context only); refs #663 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-03-08 13:23:38 +01:00
Michael Kaufmann
fb6e231f77 avoid passing non-variable as reference 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-03-01 10:40:01 +01:00
Michael Kaufmann
5786644c76 fix installation for current development for now; fixes #661 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-25 17:13:13 +01:00
Michael Kaufmann
51efba0a8d Check for SSL enabled vhost-container for ssl-related settings in froxlor-vhost-settings; fixes #642 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-24 09:03:03 +01:00
Michael Kaufmann
2f38de90e5 use DbManager for updating the password of a mysql-db 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-24 08:52:50 +01:00
Michael Kaufmann
410bfe2c97 fix typo in phpdoc 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-22 12:59:11 +01:00
Michael Kaufmann
cfae5b7516 fix deleting of certificate when certificate is froxor-vhost-certificate 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-21 14:18:00 +01:00
Michael Kaufmann
6e81c235d9 fix SAN domains for froxlor-vhost-aliases in let's encrypt 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-21 13:51:34 +01:00
Michael Kaufmann
0257149316 fix generation of serveralias in froxlor vhost 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-21 13:41:23 +01:00
Michael Kaufmann
ef331ccc81 Add setting to specify domain aliases for the froxlor-vhost (and add them to the SAN list of let's encrypt certificates if enabled) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-21 12:54:53 +01:00
Michael Kaufmann
b187114c50 output real names in libnss-extrausers passwd file, fixes #659 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-21 10:31:05 +01:00
Michael Kaufmann
fdefd4f1fe fix re-enabling of database users after being deactivated, fixes #660 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-21 10:19:58 +01:00
Michael Kaufmann
4ec32c0972 set keysize to the former default and the default from installation 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-19 10:26:33 +01:00
Michael Kaufmann
111e9bf64b fix typo for getting Settings of lets encrypt keysize when not using ECC 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-19 09:58:28 +01:00