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

42 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Michael Kaufmann
39d38eea8d fix missed cronlog variable usage in LetsEncrypt cron 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-15 13:58:29 +01:00
Michael Kaufmann
bfb7f28ff0 add linebreak after LogLevel 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-15 13:21:50 +01:00
Michael Kaufmann
fbcba3ef4e remove unnecessary if-statement in nginx when redirecting to https, thx to patschi; fixes #653 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-13 15:32:41 +01:00
Michael Kaufmann
73c05fb231 add setting for customzing webserver error-log level, fixes #650 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-12 17:38:46 +01:00
Michael Kaufmann
2166999fef fix logging in Nginx cron 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-26 10:23:56 +01:00
Max
2983aa5737 htpasswd only on given paths 
Only apply htpasswd rules to (sub)domains if the rule's path begins with the domain's document root.
 2019-01-14 00:18:26 +01:00
Michael Kaufmann
9e77fecc29 removed deprectated create_function statement; fixes #623 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-06 08:39:56 +01:00
Michael Kaufmann
e64e8cafa6 define logger constants in logger class 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-26 15:51:26 +01:00
Michael Kaufmann
7416a41a42 get rid of most of the checkstyle warnings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-24 13:50:45 +01:00
Michael Kaufmann
30f5902b88 fix some more checkstyle issues 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-24 13:21:35 +01:00
Michael Kaufmann
35c631946d more and more checkstyle fixes 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-24 12:59:40 +01:00
Michael Kaufmann
585d42f1b8 more checkstyle fixes 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-24 12:02:26 +01:00
Michael Kaufmann
4cd005051b fixed last remaining function calls which are class-methods now 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-23 19:34:32 +01:00
Michael Kaufmann
7f82038255 fix up some cron related things 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-22 20:01:10 +01:00
Michael Kaufmann
13aa19e5f4 got rid of all global functions, I guess 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-22 13:28:51 +01:00
Michael Kaufmann
1b090377ee even more function to class conversion 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 17:41:22 +01:00
Michael Kaufmann
97b5439c0d auto-format all files; add table-definitions to test-bootstrap file 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 12:24:07 +01:00
Michael Kaufmann
5888927239 get rid of more functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-20 12:38:18 +01:00
Michael Kaufmann
f263175802 more function reduction 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-20 09:57:00 +01:00
Michael Kaufmann
60f1db5caf LetEncrypt cronjob refactoring 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 17:31:03 +01:00
Michael Kaufmann
549ccda166 use safe_exec from class now 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 17:19:56 +01:00
Michael Kaufmann
c4024c8107 use correct makeCorrect(Dir/File) everywhere 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 17:13:41 +01:00
Michael Kaufmann
8e84a4ff44 correct use of Database use 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 16:57:03 +01:00
Michael Kaufmann
3ff20e327f removed ticketsystem; lots of work on cron stuff 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 13:09:14 +01:00
Michael Kaufmann
903b775f79 make cronjobs also classes and began to refactor the whole cronjob stuff 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 08:55:23 +01:00