maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
5,162 Commits 6 Branches 188 Tags
cc83099670a7675145dfccb65a85d13e67a40b22
Commit Graph

2528 Commits

Author SHA1 Message Date
Michael Kaufmann
5cf2d32e8a reverse parameter for Domains.add() into so users have to explicitly pass the parameter if they do NOT want the default ssl-ip to be used if left empty, so it behaves like the non-ssl ipandport parameter - if left empty, the system default is being used, thx J-BBB 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-15 14:35:42 +02:00
Michael Kaufmann
9b122bc003 order tasks by type descending to create bind and webserver configs at the end of the run; cleanUp configs files after creation of certificates to minimize downtime, thx to SCD for testing 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-14 13:56:55 +02:00
Michael Kaufmann
9410356bc7 fix output of acme command when upgrading 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-14 10:12:26 +02:00
Michael Kaufmann
5d5cc3dda3 fix array to string conversion 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-13 22:49:03 +02:00
Michael Kaufmann
5680c88da0 implement DomainZones.listing() to actually return custom stored dns entries for a given domain, fixes #731 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-13 14:40:04 +02:00
Michael Kaufmann
b6367e1be1 forgot to add the ssl-default-vhostconf-domain fields in ipsandports 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-12 14:39:58 +02:00
Michael Kaufmann
93aa8bff1e add default-ssl-vhost settings and optionally allow including of non-ssl default-vhost settings, fixes #727 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-12 14:34:18 +02:00
Michael Kaufmann
057f4aaa10 Passing the and parameters in reverse order to implode has been deprecated since PHP 7.4 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-12 10:22:11 +02:00
Michael Kaufmann
f588927bc5 check for existence of certificate files created by acme.sh 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-12 08:17:04 +02:00
Michael Kaufmann
03d2a76dd0 clean up language and code for dropped let's encrypt ACMEv1 support 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-11 20:53:34 +02:00
Michael Kaufmann
0d0e557715 force Let's Encrypt ACMEv2 API, fixed #728 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-11 18:17:05 +02:00
Michael Kaufmann
fb54b887f2 remove unneeded apihelp-page code in admin/customer_index; set explicit version to api-doc URL; check for acme.sh cronjob and uninstall it, as froxlor manages that itself 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-10 16:42:32 +02:00
Michael Kaufmann
9167608794 set version to 0.10.1 for maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-10 14:55:45 +02:00
Michael Kaufmann
4543c73b4f add possibility to enable/disable api access on a per user base 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-09 11:43:22 +02:00
Michael Kaufmann
88d85fc02e fix curly bracket array access (deprecated) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-09 07:59:38 +02:00
Michael Kaufmann
6102fabcb6 allow setting http2 flag for (sub)domains in customer view, fixes #725 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-09 07:59:11 +02:00
Michael Kaufmann
d7a7412973 Merge pull request #724 from kionez/add-ssl-expirationdate 
Add expiration date to SSL certificates loaded via API request, fixes #723
 2019-10-08 18:59:27 +02:00
kionez
1b3029b826 Fix typo 2019-10-08 18:50:10 +02:00
Michael Kaufmann
26cb53c8fb correctly validate that a domain has not a certificate in Certificates.add(), refs #722 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 18:44:42 +02:00
Michael Kaufmann
b4999fcc83 Throw exception if domain used to call Certificates.get() does not have a certificate, fixes #722 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 18:01:59 +02:00
kionez
05f602d457 Fix for null expiration date and coding style 2019-10-08 17:44:41 +02:00
kionez
9ec03bade7 Add expiration date to SSL certificates loaded via API request 2019-10-08 17:32:03 +02:00
Michael Kaufmann
3a8d5a9517 correct Mysql.add phpDoc to produce correct api-doc, fixes #721 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 12:11:00 +02:00
Michael Kaufmann
557b28a69d more php-7.4 compatibility 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 12:08:36 +02:00
Michael Kaufmann
0f1c5506e2 do not create username@domain ftp user if the default-ftp-user is being created in Ftps.add, fixes #720 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 12:04:10 +02:00
Michael Kaufmann
c6a93fa336 fix possible php-7.4 notice 'Trying to access array offset on value of type bool' 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 11:26:05 +02:00
Michael Kaufmann
466ea0fa99 show update steps for version updates (forgot that once or twice); add fallback for file deletion if exec() is not allowed; fix php7.4 warnings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 10:54:08 +02:00
Michael Kaufmann
8f850ee7f3 simplify config-templates for cronjob setup 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-06 22:54:54 +02:00
Michael Kaufmann
55d21e475d set low timeout for version-check and output message if check is not possible (due to connection error, downtime of server, etc.) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-06 18:53:30 +02:00
Michael Kaufmann
fa3e3da7ac only flush privileges if anything at all happened 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-06 14:47:04 +02:00
Michael Kaufmann
98f0839664 Merge branch 'master' of github.com:Froxlor/Froxlor 2019-10-06 09:01:15 +02:00
Michael Kaufmann
eb5ea51da1 add explicit tlsv1.3 ciphersuite setting (used for apache-only as of now) 2019-10-04 17:43:11 +02:00
Michael Kaufmann
4b555b4ef2 set version to 0.10.0 for upcoming stable release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-03 12:35:42 +02:00
Michael Kaufmann
1657af8719 updating external libraries prior to release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-03 12:31:27 +02:00
Michael Kaufmann
cc04e44031 add possibility to add customer using a hosting-plan instead of specifying resources 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-27 12:54:43 +02:00
Michael Kaufmann
eabad4917b correct try_files in NginxFcgi, fixes #717 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-26 09:50:13 +02:00
Bobselp
13ab7a598b fix MysqlHandler user field 
See lib/Froxlor/FroxlorLogger.php:152
 2019-09-25 20:03:16 +02:00
Bobselp
31cebccd5d fix calc, add check if quota is enabled 2019-09-24 18:16:07 +02:00
Bobselp
14914fce44 Get mailbox size with maildirsize file 2019-09-23 21:08:16 +02:00
Bobselp
6ca68f6a2d fix missing namespaces in PowerDNS cron 
Some getDB calls were missing the `\Froxlor\Dns\` prefix
 2019-09-22 17:59:21 +02:00
Michael Kaufmann
fd4d3cbcfd specify pop3_logout_format explicitly for dovecot to satisfy maillogparser 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-19 13:06:32 +02:00
Michael Kaufmann
75f49e2ee2 added HostingPlans ApiCommand + unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-16 12:31:02 +02:00
Michael Kaufmann
aca22a9c94 only add lets encrypt certificate if cert is valid; display acme.sh output if --debug is specified 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-15 15:40:13 +02:00
Michael Kaufmann
5a8ae0f75f do not log multiple times due to pushing log-handlers multiple times 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-15 13:49:40 +02:00
Michael Kaufmann
1b968c885b remove old files from 0.9.x to avoid conflicts and errors; change mod_proxy-usage and ACMEv2 default values to true 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-15 10:28:19 +02:00
Michael Kaufmann
dc3f159c90 correctly trigger re-generation of let's encrypt certificates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-15 10:22:25 +02:00
Michael Kaufmann
6ebb8dabc4 re-create certificate if SAN list or domain changes 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-12 12:30:47 +02:00
Timo Stramann
8e9ddd3d50 Remove unnecessary slash for SSL redirect 
Remove slash after hostname since requests directly to the hostname do not require a slash at the end and all other content goes to `$request_uri` which starts with shlash, hence no longer doubleslashes on hostname only queries.
 2019-08-18 16:07:59 +02:00
Timo Stramann
bd6aba8875 Updating another fastcgi_param SCRIPT_FILENAME 
Use $request_filename instead of $document_root$fastcgi_script_name as described in: https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/#use-request-filename-for-script-filename
 2019-08-17 13:04:18 +02:00
Michael Kaufmann
58f6b558df Merge pull request #709 from TimoStramann/patch-1 
Updating fastcgi_param SCRIPT_FILENAME
 2019-08-17 07:51:12 +02:00