Daniel Reichelt
b366f04743
re-assign new main domain to remaining mainbutsubto-domains
2016-09-17 08:13:10 +02:00
Daniel Reichelt
f3c74bd718
remove unused code
2016-09-17 08:10:32 +02:00
Daniel Reichelt
8e1a1043a5
don't limit this query to emaildomains
...
...to catch possibly existing orphaned entries in the mail-user/mail-
forwarding tables
2016-09-17 08:10:31 +02:00
Michael Kaufmann
1664896062
Merge pull request #388 from nachtgeist/cleanups
...
Cleanups
2016-09-16 19:05:41 +02:00
Daniel Reichelt
ec474e2b4c
fix "Could not find class 'System'" exceptions
2016-09-16 18:53:29 +02:00
Daniel Reichelt
84ee5a2192
cron/apache: remove echo'ed messages
...
they already get logged
2016-09-16 18:53:28 +02:00
Michael Kaufmann
a24db0ca6d
Merge pull request #387 from nachtgeist/dashboard
...
display system hostname and some memory info on dashboard
2016-09-16 09:36:27 +02:00
Daniel Reichelt
56c8e90700
display system hostname and some memory info on dashboard
...
hostname may be useful in situations where several froxlors are
reverse-proxied on a single webserver
2016-09-16 09:16:19 +02:00
Michael Kaufmann
e9d438f8cf
Merge pull request #386 from nachtgeist/issue-1650
...
fix #1650
2016-09-16 08:00:51 +02:00
Daniel Reichelt
41e769d681
cron/nginx: remove ssl_client_certificate
...
Adding the CA certificate to an nginx vhost via ssl_client_certificate is
outright wrong. Moreover, the CA certificate data is already written to
the certificate file itself (class.DomainSSL.php:83-85).
fixes #1650
2016-09-16 07:51:18 +02:00
Daniel Reichelt
d8b6d87ade
cron/nginx: remove echo'ed messages
...
they already get logged
2016-09-16 07:51:17 +02:00
Michael Kaufmann
506c5ac27a
Merge pull request #385 from nachtgeist/master
...
fix variable identifier in HttpConfigBase::getMyPath()
2016-09-13 12:41:05 +02:00
Daniel Reichelt
c6ba9df18a
fix variable identifier in HttpConfigBase::getMyPath()
2016-09-13 12:01:09 +02:00
Michael Kaufmann (d00p)
4229d8dda4
make path to acme.conf global alias file customizable
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-09-12 11:49:07 +02:00
Michael Kaufmann (d00p)
3b157a8c66
do not hide unavailable options, just disable them so people can see what is actually possible but just not available due to webserver-usage or other settings
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-09-12 11:23:29 +02:00
Michael Kaufmann (d00p)
b8c2047379
try to implement ssl-redirect for froxlor-vhost; combine various settings that are froxlor-vhost related into its own category, fixes #1480
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-09-11 17:48:08 +02:00
Michael Kaufmann
28461de7bc
Merge pull request #384 from jakoch/patch-1
...
fix error, when trying to call function logAction() on undefin…
2016-09-11 13:09:03 +02:00
Jens A. Koch
c51840e760
bugfix for error, when trying to call function logAction() on undefined var $cronlog
2016-09-11 12:00:26 +02:00
Michael Kaufmann
a21d19bdcd
Merge pull request #383 from nachtgeist/le-1652
...
LE: don't re-use old CSRs, always generate new ones; LE: change log level to LOG_INFO; fixes #1652
2016-09-11 08:13:03 +02:00
Michael Kaufmann
6c4d9ccbf7
Merge pull request #382 from nachtgeist/warnings
...
fix "undefined index" warnings
2016-09-11 08:12:12 +02:00
Daniel Reichelt
d56afda274
fix "undefined index" warnings
...
PHP Notice: Undefined index: parentdomainid in
[…]/froxlor/lib/classes/webserver/class.DomainSSL.php on line 49
2016-09-11 02:27:43 +02:00
Daniel Reichelt
b8bfd7ff4c
LE: don't re-use old CSRs, always generate new ones
...
fixes #1652
2016-09-11 00:51:42 +02:00
Daniel Reichelt
d1a3defef0
LE: change log level to LOG_INFO
2016-09-11 00:51:41 +02:00
Michael Kaufmann (d00p)
08f36243e9
only renew froxlor.panel LE cert if required
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-09-08 12:28:43 +02:00
Michael Kaufmann (d00p)
e4887362ec
added let's encrypt for froxlor vhost - untested for now, testers are welcome
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-09-05 17:01:10 +02:00
Roman Schmerold
290d06e2c4
Merge pull request #379 from oliverrahner/patch-1
...
Letsencrypt: only update registration when necessary
2016-09-05 07:13:42 +02:00
Oliver Rahner
9260319ac1
Letsencrypt: only update registration when necessary
...
if no Terms of Service are presented by the ACME server when registering, don't update registration
2016-09-04 21:27:23 +02:00
Michael Kaufmann
78ab90f469
Merge pull request #378 from oliverrahner/patch-1
...
Remove dependency on hard coded agreement URL for Let's Encrypt
2016-09-02 07:42:26 +02:00
Oliver Rahner
34767a14d5
Remove dependency on hard coded agreement URL for Let's Encrypt
...
Change the process to first create a new registration, which delivers the current TOS url in the response's header, then modify the newly created registration to accept the agreement.
2016-08-31 16:35:59 +02:00
Michael Kaufmann (d00p)
d7388f20e6
fix idna convert for >=php-5.6 users when customers want to add a subdomain with an idna-encoded domain
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-31 15:12:01 +02:00
Michael Kaufmann
8f488d7701
Merge pull request #377 from oliverrahner/patch-1
...
do not die after token self check
2016-08-29 10:47:23 +02:00
Oliver Rahner
7f56e98009
do not die after token self check
...
We have to finish the challenge request so that the auth does not linger in state "pending", but goes to "invalid". See https://forum.froxlor.org/index.php/topic/13463-lets-encrypt-zertifikate-werden-nicht-erneuert/#entry32895
2016-08-29 10:46:21 +02:00
Michael Kaufmann (d00p)
a840905166
set version specific user-agent in lescript like we do in ajax stuff
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-28 14:07:13 +02:00
Michael Kaufmann
3757db28f4
Merge pull request #376 from w6g23/LE-UserAgent
...
Set a User Agent in the HTTP request fetching the LE challenge URI
2016-08-28 14:04:01 +02:00
w6g23
d31589ba99
Set a User Agent in the HTTP request fetching the LE challenge URI for self check
...
A rule (e.g. Wordpress plugin iThemes) might block requests with empty
User Agents.
2016-08-28 12:59:09 +02:00
Michael Kaufmann (d00p)
45b6d8d571
add possibility to allow customers to select a shell for their ftp-users, with great thanks to KAPPER NETWORK-COMMUNICATIONS GmbH - kapper.net
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-26 10:46:15 +02:00
Michael Kaufmann
11b2d0e1d2
Merge pull request #375 from micw/master
...
Added unit (MiB) to email quota label
2016-08-26 09:44:03 +02:00
Michael Wyraz
d7fc9cde57
Added unit (MiB) to email quota label
2016-08-26 09:42:38 +02:00
Michael Kaufmann (d00p)
b162fb6e99
avoid double encoding of Punycode as with php-5.6 the 'new' idna class throws exceptions, thx to housequake
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-26 09:41:19 +02:00
Michael Kaufmann (d00p)
2f6e34d878
do not ssl-redirect when let's encrypt tries to validate the domain, fixes #1649
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-25 22:08:32 +02:00
Michael Kaufmann
a47ab55cdd
Merge pull request #374 from micw/master
...
append wildcards to search if user did not enter any
2016-08-23 07:27:39 +02:00
Michael Wyraz
dd4cfebe75
append wildcards to search if user did not enter any
2016-08-22 15:55:13 +02:00
Michael Kaufmann (d00p)
818268482e
fix typo
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-20 22:09:48 +02:00
Michael Kaufmann (d00p)
8431a82f2c
check for correct extension for auto-update feature, fixes #1648
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-20 09:16:33 +02:00
Michael Kaufmann (d00p)
2444158bbb
do not truncate pdns tables, instead just remove entries that are related to froxlor-managed domains; this allows the admin to create custom zones/records in pdns if needed/wanted
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-12 09:45:26 +02:00
Michael Kaufmann (d00p)
003005f295
keep compatibility and do not generate pdns records/zone when custom zonefile is set
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-07 17:56:03 +02:00
Michael Kaufmann (d00p)
731427255e
fix call to undefined method pdns::_generateDomainConfig() in PowerDNS cronjob when using custom zone-file in a domain
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-07 17:22:28 +02:00
Michael Kaufmann (d00p)
468d20ee57
really reuse old csr if given + code formatting
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-06 09:32:03 +02:00
Michael Kaufmann (d00p)
d994379130
do not idna-encode already encoded domain when addin a new email address (only an issue when using >=php-5.6
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-06 07:41:06 +02:00
Michael Kaufmann (d00p)
cd806b19f7
update let's encrypt subscriber agreement to v1.1.1
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-06 07:40:14 +02:00