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

4056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
036ec68651 fix unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-13 21:59:01 +01:00
Michael Kaufmann
8cebcc8a5d allow DnsZone functions only if dns-editor is enabled AND the customer is allowed to use it 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-13 21:51:24 +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
fca7b95579 meh it's february already :P 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-12 17:42:36 +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
d0fb77f3e9 Merge pull request #648 from princeofnaxos/Fix-english-typos 
Corrections to the English texts
 2019-02-11 16:18:50 +01:00
Edwin Boersma
32cf6dfaef Re-added missing line. 2019-02-11 16:17:17 +01:00
Michael Kaufmann
8ab86a05b2 disable settings in 'froxlor vhost settings' that wont have any effect if no IP/port has the 'create vHost container' option enabled; fixes #642 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-11 16:08:34 +01:00
Edwin Boersma
79b913131e Corrections to the English texts 2019-02-11 15:59:29 +01:00
Michael Kaufmann
8fd910a92e use correct settings-class 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-10 22:54:05 +01:00
Michael Kaufmann
2ce1a5abb5 ups, where did they go? :P 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-10 22:49:32 +01:00
Michael Kaufmann
8448a7141a do not add task 11 (delete domain from pdns db) if namserver is disabled and dns-server is not PowerDNS 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-09 11:56:15 +01:00
Michael Kaufmann
21f9a24780 remove 'change_date' field from pdns-records table as it is being removed in pdns >=4.2; fixes #645 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-08 07:59:02 +01:00
Michael Kaufmann
1b5e31e59d fallback to default froxlor newsfeed when no custom newsfeed (rss) is given if newsfeed is shown on customer dashboard 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-07 10:05:41 +01:00
Michael Kaufmann
03afbc902d fix static method not being declared as such 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-02 09:05:14 +01:00
Michael Kaufmann
83b760a43b add missing description for task 11 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-01 14:17:54 +01:00
Michael Kaufmann
c0e67dc240 fix incorrect usage of class-constant 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-30 12:32:06 +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
Michael Kaufmann
7bb7cc6a00 fix isbinddomain/zonefile field saving when editing domain, fixes #639 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-22 08:29:13 +01:00
Michael Kaufmann
8b96912ab4 correctly use system-setting of default-ttl, thx to K1rk 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-17 09:26:04 +01:00
Michael Kaufmann
de33ec509b move_to_admin is not a binary value, fixes #637 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-16 19:21:50 +01:00
Michael Kaufmann
5ecb43ba73 correct increasing/decreasing of admin-resources 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-16 15:14:22 +01:00
Michael Kaufmann
97ff3485b7 fix deletion of admins; fixes #638 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-16 10:59:32 +01:00
Michael Kaufmann
98daef7224 Merge pull request #635 from heavygale/patch-3 
htpasswd only on configured paths
 2019-01-14 06:31:42 +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
9a906427e7 ensure the replacing of the stdsubdomain url on update is encoded correctly 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-11 08:55:55 +01:00
Michael Kaufmann
7841eebf08 correct handling of storeSettingHostname when system.stdsubdomain is changed; refs #633 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-11 00:06:44 +01:00
Michael Kaufmann
b4597d54af create full dns zone if main-but-subdomain has dns enabled but maindomain to that domain does not, fixes #632 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-08 12:52:10 +01:00
Michael Kaufmann
19ffc9587a issubof Parameter in Domains.add and Domains.update is not boolean 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-08 11:18:53 +01:00
Michael Kaufmann
bbe0a0b3a5 Merge pull request #630 from princeofnaxos/master 
Corrections to the Dutch translations
 2019-01-07 11:12:37 +01:00
Edwin Boersma
0d30f71097 Corrections to the Dutch translations 2019-01-07 11:06:25 +01:00
Michael Kaufmann
0cc5693180 damn typo 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-06 08:54:49 +01:00
Michael Kaufmann
045a62a9db remove duplcate visible-field in admin-edit formfield; fixes #625 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-06 08:48:24 +01:00
Michael Kaufmann
725372b6ae add 4th parameter $step to Admins::increaseUsage(); fixes #628 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-06 08:45:24 +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
44c47fa6eb Merge pull request #629 from PHPGangsta/composer_sugg 
added ext-apcu and ext-readline to composer.json suggest block
 2019-01-05 16:22:07 +01:00
Michael Kliewe
448de78ea5 added ext-apcu and ext-readline to composer.json suggest block 2019-01-05 13:31:26 +01:00
Michael Kaufmann
f3859052e5 fix getParamListFromDoc() for api doc 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-05 07:56:55 +01:00
Michael Kaufmann
2b4199e558 drop ADSP support, fixes #622 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-04 20:58:20 +01:00
Michael Kaufmann
b7585585dc also include table-definitions in external api.php 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-02 18:46:38 +01:00
Michael Kaufmann
92b133b11d fix Froxlor::listFunction() api-call after namespacing 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-01-02 18:36:01 +01:00
Michael Kaufmann
5dda57458a fix incorrect variable 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-28 15:18:56 +01:00