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

4050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michael Kaufmann
7d3577d649 fix superfluous ssl_key directive in dovoecot for stretch and xenial 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-18 19:14:48 +01:00
Michael Kaufmann
a8fb0a6d88 check for non-empty required field 'name' in hosting plans, which are still not fully migrated to API, refs #658 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-18 13:07:58 +01:00
Michael Kaufmann
8d628daf83 fix update of acmesh class in cronjobs_run 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 21:41:19 +01:00
Michael Kaufmann
010f30bc9e check for upgrade of acme.sh prior to issue/renew certifice, refs #657 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 20:48:11 +01:00
Michael Kaufmann
2273a11978 remove unneeded let's encrypt settings; self-update acme.sh only once a day 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 20:36:18 +01:00
Michael Kaufmann
5c36b79277 honor setting for let's encrypt key size if needed 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 19:47:51 +01:00
Michael Kaufmann
f5127eccd1 outsource acmesh-command to reduce duplicate code 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 19:43:12 +01:00
Michael Kaufmann
e962f76b32 Merge branch 'master' of github.com:Froxlor/Froxlor 2019-02-17 19:34:33 +01:00
Michael Kaufmann
6d8521d8dc Merge pull request #657 from patschi/patch-1 
Run acme.sh upgrade just once when cron starts
 2019-02-17 19:34:21 +01:00
Patrik Kernstock
7b231bb755 Run acme.sh upgrade just once when cron starts 
Only run acme.sh upgrade command once when cronjob starts, and not everytime when there's a certificate going to be renewed.
 2019-02-17 19:30:03 +01:00
Michael Kaufmann
459cbcc0dd keep re-use old-key setting for Let's Encrypt 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 19:25:23 +01:00
Michael Kaufmann
44433ef86e only variables can be passed by reference 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 18:24:31 +01:00
Michael Kaufmann
cb8e83bdfa use new AcmeSh class also in froxlor.sql 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 17:56:14 +01:00
Michael Kaufmann
84eec155de only empty the certificates if there's actually something to empty 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 16:57:03 +01:00
Michael Kaufmann
73a059b318 usinng acme.sh for issuing Let's Encrypt certificates now; please test thoroughly; fixes #651 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 16:17:35 +01:00