maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,996 Commits 6 Branches 188 Tags
3294bbf9b42d41721fb60a2b24ff0617aedc234c
Commit Graph

2996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Reichelt
e327a39eac cron tasks: bind: refactor zone creation 
cron_tasks/bind: refactor zone creation

DNS records for subdomains managed as main domains (i.e. have
ismainbutsubto>1) get written to separate zone files for each subdomain.
This does not play well with hidden-master setups, where a quering DNS
server would only request a transfer of the topmost parent zone and ignore
SOA records therein to initiate the potentially required transfers of
subzones.

This patch changes how zonefiles are created, so that DNS records of
"ismainbutsubto>1"-domains end up within the zone of the topmost parent
domain. Obviously this relies on correctly set ismainbutsubto-fields of
all subdomains managed as main domain in Froxlor.

Refactoring summary:

- Previously _generateDomainConfig() would be called for each customer
  domain, handle writing the zone file and accumulate the bind config
  data.

  Now writing the zone files is decoupled and both _generateDomainConfig()
  and generateZone() get called from the main loop over the customer
  domains.

- The main loop over customer domains only considers
  "ismainbutsubto==0"-domains, children are handled via recursion within
  walkDomainList() according to the previously collected relations of
  direct children.

- The recursion accumulates the zone data, storing it in $_bind_conf_file
  (which is now a private member) until it gets written to a zone file.
  The resulting structure is written to the debugHandler.

  -- For "ismainbutsubto==0"-domains, generateZone() returns a SOA record
  and further applicable records as usual.

  -- For "ismainbutsubto>0"-domains, generateZone() returns a "$ORIGIN
  $domain"-line and further applicable records as usual. This now excludes
  NS records, since they're no longer required.

- The boolean parameter $froxlorhost=true to _generateDomainConfig() and
  generateZone() was replaced by the additional field
  $hostname_arr['froxlorhost']
 2016-02-08 22:43:57 +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
Florian Aders
d45e9e63e6 Fixed a few obvious bugs 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-29 16:52:58 +01:00
Florian Aders
4f0c1894a3 Initial version of let's encrypt renewal cron 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-29 14:29:30 +01:00
Michael Kaufmann
a3032fc62a Merge pull request #278 from hph86/prevent_dir_traversal_in_paths 
prevent directory traversal in paths
 2016-01-29 07:43:22 +01:00
Hanno Heinrichs
6eeaf66e2c prevent directory traversal in paths 2016-01-28 22:40:54 +01:00