maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,180 Commits 6 Branches 188 Tags
1f0b90ceef6b7a24b786e04ec6d9bddfea41e9fe
Commit Graph

575 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
c3753478f2 add newline after custom options to avoid possible syntax error in apache-config, thx to J-BBB for testing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-07-14 09:14:37 +02:00
Michael Kaufmann (d00p)
3d2cb879b0 actually use the new setting for custom directory options file content, refs #1638 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-07-14 08:36:14 +02:00
Michael Kaufmann (d00p)
1c369e5503 add possibility to disable web or traffic cron by setting the max-percentage value to 0, fixes #1639 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-07-14 07:58:56 +02:00
Michael Kaufmann (d00p)
83f40401be fix change_date for PDNS records 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-07-11 09:15:21 +02:00
Michael Kaufmann (d00p)
7ec777c9dd put index back in location-context; try_files not really necessary if not using PHP, also eases use of proxy_pass users; thx to karstenk 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-06-20 09:55:27 +02:00
Michael Kaufmann (d00p)
5e9e2996d7 avoid php-5.6 operator 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-06-19 22:08:17 +02:00
Daniel Reichelt
b4f90730cc unify "reloading" the dns daemon 2016-06-18 02:33:03 +02:00
Daniel Reichelt
50317da185 dns: no separate zonefiles for ismainbutsubto domains 3/3 
replace iteration over $domains array by recursive walkDomainList()
 2016-06-18 02:33:02 +02:00
Daniel Reichelt
631e36f4d5 dns: no separate zonefiles for ismainbutsubto domains 2/3 
rewrite getDomainList() to contain parent-relations
 2016-06-18 01:47:16 +02:00
Daniel Reichelt
a400fc9c65 dns: no separate zonefiles for ismainbutsubto domains 1/3 
move log message
 2016-06-18 01:47:12 +02:00
Daniel Reichelt
bd36145ad6 cron_traffic: replace echo by log message 2016-06-15 16:15:34 +02:00
Michael Kaufmann (d00p)
88ccf5b869 don't generate unnecessary php-related vhost-entries when php is disabled, thx to karstenk 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-06-14 07:29:38 +02:00
Michael Kaufmann (d00p)
c2b0714b4a powerdns needs the 'whole' record (., e.g. sub.example.com) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-19 13:49:22 +02:00
Michael Kaufmann (d00p)
5c1079e04b Add change_date value to the pdns-record entries 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-19 12:09:04 +02:00
Michael Kaufmann (d00p)
257f65bd1b add powerdns config-templates for distros 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-19 10:29:17 +02:00
Michael Kaufmann (d00p)
96ff346e54 fix powerdns-config template 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-19 09:28:46 +02:00
Michael Kaufmann (d00p)
1ce5cf6c00 various fixes for dns with froxlor-hostname 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-17 09:12:39 +02:00
Michael Kaufmann (d00p)
f7441df895 add missing file inclusion 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-17 08:43:02 +02:00
Michael Kaufmann (d00p)
69443d95d5 add support for power-dns (untested); most config-templates missing for pdns; create SPF/DKIM entries only if domain is emaildomain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-17 08:30:02 +02:00
Michael Kaufmann (d00p)
11e923453e Merge remote-tracking branch 'origin/master' into dns-editor 2016-05-16 19:59:27 +02:00
Daniel Reichelt
6e2b1773a3 LE: support alias domains 
LE CSRs are triggered for the aliasdomain target domain on

* domain deletion

* domain creation

* domain editing when
  * the aliasdomain target changes (CSR triggered both for old and new
    target)
  * wwwalias is disabled or enabled
  * letsencrypt is disabled or enabled (domain-local)

fixes #1597
 2016-05-16 17:35:51 +02:00
Daniel Reichelt
f3e05742b5 LE: change semantics of setting.letsencryptreuseold 
Previously setting.letsencryptreuseold determined wheter both a domain's
private key and a CSR should be re-generated.

Preparing support of alias domains in LE certificates, this is changed to
only determine the re-generation of the private key. CSRs now are always
re-generated.
 2016-05-16 17:35:51 +02:00
Daniel Reichelt
712aebb864 LE: improve SQL readability 2016-05-16 17:35:51 +02:00
Daniel Reichelt
0ae0178b4c LE: PSR-2 formatting 2016-05-16 17:35:51 +02:00
Michael Kaufmann (d00p)
68fa0e6576 let createDomainZone() return the DnsZone object for better use later 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-15 09:56:48 +02:00
Michael Kaufmann (d00p)
11eb08e031 add enabled-flag; enable dns-editor for customers; add german translations; few more fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-13 13:27:33 +02:00
Michael Kaufmann (d00p)
4a4acc5c01 fix constructor of DnsBase 2016-05-12 14:32:41 +02:00
Michael Kaufmann (d00p)
899663350d fix handling of DKIM multi-line entries; outsource some code to new DnsBase class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-12 13:36:17 +02:00
Michael Kaufmann (d00p)
68d579b629 add SPF and DKIM stuff to DNS 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-12 09:36:33 +02:00
Michael Kaufmann (d00p)
0404618c24 add experimental bind-cron for testing purposes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-11 18:10:17 +02:00
Michael Kaufmann (d00p)
9b5ce83e8b add testing-bind-cron for new dns-stuff (not activated); added main-but-subdomain-stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-11 16:11:23 +02:00
Michael Kaufmann (d00p)
6369e160b8 fix nscd group cache clearing call; refs #1570 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-09 21:33:07 +02:00
Michael Kaufmann (d00p)
5e09d56871 clear nscd group cache after adding a new customer to avoid permission issues of webserver; fixes #1570 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-09 08:27:01 +02:00
Michael Kaufmann (d00p)
0e79e8d670 fix default_server parameter for listen-statement in nginx since this changed since ngninx-0.8.21; fixes #1621 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-09 08:08:59 +02:00
Michael Kaufmann (d00p)
941a25ec9d avoid possible weird behaviour when resultset changes while running (if possible at all) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-05 08:43:28 +02:00
Michael Kaufmann (d00p)
7c44c5ea75 handle exit of forked backup-cronjob correctly 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
c8bbefb2bb add simple backup-function for customers (testing state) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:18 +02:00
Michael Kaufmann (d00p)
28f0c3eac4 only include acme.conf to vhosts if system has ssl and LE enabled (might not exist if not) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-15 15:09:11 +02:00
Michael Kaufmann (d00p)
84f1d94ad6 check for php-curl installed when cron_letsencrypt runs; format source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-11 08:02:18 +02:00
Daniel Reichelt
576c94f83c fix #1615 2016-04-10 02:59:22 +02:00
eis_os
032a991b8f Simplify master cronjob 2016-03-31 15:02:04 +02:00
Michael Kaufmann (d00p)
579854f5a5 handle the case when gethostbynamel() returns false to act like gethostbyname() in support for multi homed name servers 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-11 21:23:26 +01:00
Kay Zumbusch
641ee1f8a6 added check for invalid responses from gethostbynamel 
fixed indent
 2016-03-09 21:01:47 +01:00
Kay Zumbusch
52448571ea added support for multi homed name servers 2016-03-09 20:40:41 +01:00
Daniel Reichelt
c458ed8b0c cron/LE: fix superfluous CSRs 
Depending on the data present, the LE cronscript may cause multiple
entries per domain in domain_ssl_settings.

This is due to $updcert_stmt interfering with the outer loop
while ($certrow = $stmt->fetch()): PDO's DB cursor sees rows newly created
by $updcert_stmt within the loop. As a consequence this also leads to
superfluous CSRs, thus increasing the certificate limit counter on the LE
side.

Solution: manifest the result of @$certificates_stmt@ on the PHP side in
its entirety prior to entering the outer loop.
 2016-03-08 08:21:09 +01:00
Andreas Grundler
d3bf80342d use $return['chain'] instead of $return['fullchain'] for ssl_cert_chainfile 2016-03-06 14:10:24 +01:00
Michael Kaufmann (d00p)
f9d949f90c Revert "Merge pull request #318 from Churro/froxlorMerge_33ab67a" 
This reverts commit 4f2ee129fd, reversing
changes made to f284d67843.
 2016-03-03 23:38:02 +01:00
Michael Kaufmann (d00p)
f6e519d779 Revert "Merge pull request #326 from Churro/froxlorMerge_vhostTemplates" 
This reverts commit 319668d384, reversing
changes made to aa592c7369.

Conflicts:
	install/froxlor.sql
	install/updates/froxlor/0.9/update_0.9.inc.php
	lib/version.inc.php
 2016-03-03 23:31:19 +01:00
Michael Kaufmann (d00p)
d6f42dc88c make letsencrypt cron log to the customer system-log, it might contain important information 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-02 15:20:30 +01:00
Michael Kaufmann (d00p)
573fd69c95 avoid unknown variable if there are no domains in domain-list 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-28 22:04:57 +01:00