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

4019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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