maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,800 Commits 6 Branches 188 Tags
eae9c4d78aa654023beb54ca87bb45d9722d8e67
Commit Graph

2800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Heid
eae9c4d78a Typo correction 2016-02-10 22:23:46 +01:00
Stefan Heid
3f606cd953 Bugfix: termination-date in domain-add dialog 2016-02-10 22:16:09 +01:00
Stefan Heid
ae581c2da7 Added termination-date to domains 2016-02-10 21:22:52 +01:00
Michael Kaufmann
3244c968b5 Merge pull request #283 from nachtgeist/language 
language: add message/spelling
 2016-02-09 08:57:09 +01:00
Daniel Reichelt
dd0689c13f language: add message/spelling 
- add missing message for let's encrypt integrity check
- small spellfixes
 2016-02-09 00:33:01 +01:00
Michael Kaufmann (d00p)
e2b908ed8b correct copyright header :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-08 13:53:08 +01:00
Michael Kaufmann (d00p)
aac9ee3ba7 added auto-update from within the panel; re-organized menu-entries (meaningful) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-08 13:34:24 +01:00
Michael Kaufmann
1cd776f660 Merge pull request #281 from nachtgeist/cron_tasks_bind 
cron_tasks/bind: cleanup conditions for creation of mail-related and www DNS records
 2016-02-08 09:24:45 +01:00
Daniel Reichelt
427b7492dc cron_tasks/bind: fix conditions for mail-related records 
This patch adds isemaildomain==1 as an additional condition for the
creation of mx/imap/smtp/pop3/spf-txt records for a domain.

For the hostname entry, this depends on the system setting
dns_createmailentry.
 2016-02-08 00:28:45 +01:00
Daniel Reichelt
627e22a2e6 cron_tasks/bind: fix conditions for writing www records 
The bind cronjob awlays creates www A/AAAA records, regardless of a
domain's iswildcarddomain or wwwserveralias settings.

With this patch www records only get created if "www alias" is selected
for a domain, i.e. iswildcarddomain is disabled and wwwserveralias is
enabled.
 2016-02-08 00:28:45 +01:00
Michael Kaufmann (d00p)
7bf8b74693 Merge branch 'master' of github.com:Froxlor/Froxlor 2016-02-05 15:54:27 +01:00
Michael Kaufmann (d00p)
c7f4dc9045 fix superfluous dollar-sign 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-05 15:54:07 +01:00
Florian Aders
f8ed70c5f2 Log certificate update in syslog etc 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 17:42:00 +01:00
Florian Aders
94f34aada6 Fixed typo 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 17:26:10 +01:00
Florian Aders
2472a52fed Make some Let's encrypt settings configurable 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 17:21:48 +01:00
Florian Aders
172915b5be Store chains correctly 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 16:47:46 +01:00
Florian Aders
ae276a2a59 Fixed updater - timestamp 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 16:45:32 +01:00
Florian Aders
ae115216f6 Clearify description regading wildcars 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 13:38:40 +01:00
Florian Aders
5691b3a8db Merge pull request #280 from EleRas/master 
Added basic let's encrypt - supprt, fixes #1470
 2016-02-03 11:53:05 +01:00
Florian Aders
c9815be0c7 German translation and hint that let's enrypt is still beta 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-02 22:15:41 +01:00
Florian Aders
1814407bfd Throw exception if no challenges are returned at all 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-02 11:17:04 +01:00
Florian Aders
40f2fa432b Merge pull request #279 from heaven73/patch-3 
Update cron_tasks.php
 2016-02-01 22:00:40 +01:00
Chris Energia Positiva
e10732c058 Update cron_tasks.php 2016-02-01 21:53:07 +01:00
Florian Aders
cdb00a76ce Log cert - error in syslog/database 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 21:23:01 +01:00
Florian Aders
efc5f37850 Well, we need a new key if we don't havre one, not if we already have one 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 20:58:49 +01:00
Florian Aders
ba1181e8ff Fixed inserting of certificate if it didn't exist yet and return textbased domainkey, not ressource 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 20:47:16 +01:00
Florian Aders
6023e65f7d Corrected version 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 12:55:08 +01:00
Florian Aders
eff978e5f6 Using different texts in admin and customer interface 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 11:36:20 +01:00
Florian Aders
daf32b8ac4 Froxlor doesn't use namespaces yet :/ 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 10:19:31 +01:00
Michael Kaufmann (d00p)
5228e0f3d6 normalize path in appendOpenBasedirPath() after empty check as this results in an assert in makeCorrectDir() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-01 09:35:31 +01:00
Florian Aders
9fc47f55b8 Minor rewording 2 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 16:03:10 +01:00
Florian Aders
435edd53f2 Minor rewording 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 12:27:00 +01:00
Florian Aders
c36fb7e809 Added description on how to activate the production version of Let's Encrypt 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 12:21:21 +01:00
Florian Aders
e74a418405 Fixed description 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 12:13:15 +01:00
Florian Aders
7814499b87 Added cronjob to database and added a hint to the README 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 12:09:54 +01:00
Florian Aders
b62f4ef911 Copied ssl_redirect - integritsycheck for lets encrypt 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 11:49:33 +01:00
Florian Aders
b32c2bb994 Just a small lng - change 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 11:42:16 +01:00
Florian Aders
dd9e540ca3 inserttask(1) after updating certificates, updated install/update - SQL 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 15:19:40 +01:00
Florian Aders
272ba3f74e Display warning about wildcard - domains with let's encrypt 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:54:20 +01:00
Florian Aders
d87fc4c717 Prevent enabling let's encrypt for wildcard - domains 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:46:00 +01:00
Florian Aders
c189ad759b Add Let's Encrypt to admin - GUI 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:34:26 +01:00
Florian Aders
f3a7a9c342 Fix formfield 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:22:32 +01:00
Florian Aders
51d554ab14 Also: use the new icon 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:13:45 +01:00
Florian Aders
cb97ff0dc7 Add icon and fixed list 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:11:58 +01:00
Florian Aders
7b5a425913 Always hide the SSL - editor if using let's encrypt 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:05:12 +01:00
Florian Aders
44d08d6aa9 Add let's encrypt to customer domain - GUI 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 13:59:34 +01:00
Florian Aders
e0e1085c73 Fix your SQL, dude 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 13:14:51 +01:00
Florian Aders
67df9dbf6b Experiment with accountkeys per customer 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 13:06:42 +01:00
Florian Aders
2e7dd6f212 Changed comments to // to match the rest of Froxlor and made small improvements to the accountKey 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 10:56:08 +01:00
Florian Aders
ed2837f1db Added linebreak to logmessage of class 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-29 16:59:00 +01:00