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

98 Commits

Author SHA1 Message Date
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
Michael Kaufmann
d24056c925 fix vhost-merging of specialsettings in nginx; fixes #757 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-22 16:12:11 +01:00
Michael Kaufmann
21f6874a61 check whether there actually is quota read for a user if newly created, thx again to J-BBB 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-15 12:58:28 +01:00
Michael Kaufmann
1955b5dd32 add task to remove certificate from acme.sh when removed in froxlor; fix issue when mode of certificate generation was not reset to 'issue' and kept trying to 'renew' instead 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-10 18:34:02 +01:00
Michael Kaufmann
9c3549c604 lowercase domain-names in AcmeSh implementation to avoid https://github.com/Neilpang/acme.sh/issues/2556 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-04 11:39:06 +01:00
Michael Kaufmann
b162324ff0 fix renew-check of let's encrypt implementation, set version to 0.10.5 for bugfix release; fixes #747 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-01 14:19:06 +01:00
Michael Kaufmann
aa85c648a3 check for renewal of certificates not only if there's a task to regenerate vhosts but everytime the letsencrypt cronjob runs (which is basically obsolete due to the integration into the tasks cron but perfect for checking renewal dates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-31 21:37:54 +01:00
kionez
b0e920104f Fix fastcgi_split_path_info as https://www.nginx.com/resources/wiki/start/topics/examples/phpfcgi/ 2019-10-29 16:00:14 +01:00
kionez
299e201142 Fix fastcgi_split_path_info 2019-10-29 15:47:28 +01:00
Michael Kaufmann
7b162c4bd0 added tls-settings per domain for admins with change_serversettings-flag set; fixes #519 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-22 16:45:03 +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
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
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
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
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
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
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
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
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
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
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
Timo Stramann
04898c6114 Updating fastcgi_param 
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-09 09:40:55 +02:00
Michael Kaufmann
d5e4182878 beautification and minor fixes 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-26 07:49:17 +02:00
Michael Kaufmann
db3c95ea10 set last run of letsencrypt cron when called in webserver-cron 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-11 08:39:26 +02:00
Michael Kaufmann
8b417c044c let nginx auto-detect the best ecdh-curve to use, fixes #652 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-11 08:13:00 +02:00
Michael Kaufmann
0f0dd91246 combine Let's Encrypt cron with webserver-vhost-generation but allow manually execution using --debug/--force 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-09 07:50:11 +02:00
Michael Kaufmann
fd912dd161 combine webserver-reload command to parent class to avoid repeating code 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-09 07:13:02 +02:00
Michael Kaufmann
98325a0f40 don't need NSCD when using libnss-extrausers 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-03 18:07:02 +02:00
Michael Kaufmann
01bf814496 remove domain ssl information from acme.sh and filesystem on deletion to avoid trying to renew certificates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-01 20:32:13 +02:00
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
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
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
29365838b3 set version to 0.10.0-rc1 for upcoming release candidate 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-10 08:24:04 +02: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
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