maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,558 Commits 6 Branches 188 Tags
5f29b2cc4ad7c0a15535afc70015bb7f2fa2ddf7
Commit Graph

3558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Petermann
5f29b2cc4a Fixed class.lescript_v2.php to work with ACMEv2 
When requesting a certificate for multiple Domains/SANs, the request must be done in a single order.
 2018-09-18 00:53:51 +02:00
Michael Kaufmann
164f1a921e Merge pull request #570 from markuspetermann/patch-1 
Fixed class.lescript_v2.php to work with ACMEv2
 2018-09-15 13:25:01 +02:00
markuspetermann
94c4d52476 Fixed class.lescript_v2.php to work with ACMEv2 
As GET /document never returns any Reply-Nonce Header, getLastNonce() caused an infinite loop.
The Content-Type for v2 must be application/jose+json.
 2018-09-15 12:41:27 +02:00
Michael Kaufmann
b777053133 allow a higher amount of diskspace and traffic to be entered in the forms, fixes #560 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-08-15 10:59:16 +02:00
Michael Kaufmann
d0c2888508 Merge pull request #494 from xelaz/master 
extend nginx letsencrypt (.well-known) redirect regex to https
 2018-08-15 08:03:45 +02:00
Michael Kaufmann
ff8afef614 Merge pull request #563 from Froxlor/revert-561-patch-1 
Revert "acme challenges can include hyphens (-)"
 2018-08-12 18:11:45 +02:00
Michael Kaufmann
a28b2e8115 Revert "acme challenges can include hyphens (-)" 2018-08-12 18:11:36 +02:00
Michael Kaufmann
b0e348a2c5 Merge pull request #561 from oliverrahner/patch-1 
acme challenges can include hyphens (-)
 2018-08-12 17:09:03 +02:00
Oliver Rahner
512abda38d acme challenges can include hyphens (-) 
made a small adjustment so that acme challenges like "CrgFuFZU-U7mwXxjjHZi8if851XGVjdPRtWN91LTWmM" also don't get redirected
 2018-08-09 16:33:27 +02:00
Michael Kaufmann
1690cadab9 show link to clear plaintext email account passwords if enabled; set store-plaintext-passwords default to 'off'; fixes #557 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-07-10 09:47:01 +02:00
Michael Kaufmann
436d141bd1 fix ticket access when posting answer 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-21 07:52:11 +02:00
Michael Kaufmann
aa881560cc deny access to tickets not owned by current user, thx to chbi 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-19 21:46:11 +02:00
Michael Kaufmann
06ef81cc5b adjust year in copyright in std-customer-index file, thx to demlak 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-17 09:41:31 +02:00
Michael Kaufmann
4a99e4ba57 Merge pull request #556 from nachtgeist/master 
fix triggering an LE CSR when changing www on a main domain, fixes #526
 2018-06-05 07:52:03 +02:00
Daniel Reichelt
2ba4137e7d fix triggering an LE CSR when changing www on a main domain 
Prior to this, LE CSRs were triggered only when the wwwserveralias was
changed on alias domains, but not on main domains.

Fixes #526
 2018-06-05 06:51:20 +02:00
Daniel Reichelt
72835c56ad trim trailing whitespace 2018-06-05 06:51:10 +02:00
Michael Kaufmann
b80bdcbc4f forgot to add version file 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-29 15:54:44 +02:00
Michael Kaufmann
c1e62e6be7 get rid of serialization completely to avoid possible code execution, fixes #555 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-29 15:47:41 +02:00
Michael Kaufmann
10330f8a7a fix fallback redirect code when customredirect is enabled and default is selected 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 17:44:36 +02:00
Michael Kaufmann
18fb422a69 correct order of settings 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 14:50:52 +02:00
Michael Kaufmann
f8236dff7b fix not quite correctly webserver-log-piping 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 14:44:59 +02:00
Michael Kaufmann
bad680cfdb enhancements for webserver-log settings 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 13:23:37 +02:00
Michael Kaufmann
5a070d6d91 add settings to customize webserver logs 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 11:36:13 +02:00
Robert Förster (Dessa)
07a3f76568 remove wheezy configs 2018-05-10 16:42:27 +02:00
Michael Kaufmann
67b95a301b check only for existing .conf files when trying to find out whether a fpm pool config directory is empty; fixes #543 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-06 14:38:18 +02:00
Michael Kaufmann
6f9187d1bb Merge branch 'master' of github.com:Froxlor/Froxlor 2018-04-25 12:29:41 +02:00
Michael Kaufmann
84b8cda7ac allow usage of up to 255 characters in a txt record, fixes #548 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-04-25 12:29:30 +02:00
Michael Kaufmann
75616cc727 fix typo in german language file 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-04-25 12:27:59 +02:00
Michael Kaufmann
b3d018c506 corrected usage of default redirect code from settings; fixes #546 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-04-25 12:27:40 +02:00
Robert Förster (Dessa)
2508d855e3 deprecate precise, as xenial configs are now available 2018-04-03 13:12:32 +02:00
Erik
a21f3c5a3f added xenial.xml (#533) 
* added xenial.xml

* fixed touch commands as in commit 3c802038f2

* changed a2dismod php to a2dismod php7.0

* fixed overlooked a2dismod php to a2dismod php7.0
 2018-04-03 12:59:14 +02:00
Michael Kaufmann
20d9be537a Merge pull request #542 from d00p/patch-1 
Update README.md
 2018-03-29 13:11:11 +02:00
Michael Kaufmann
30d39d622d Update README.md 2018-03-29 13:10:33 +02:00
Michael Kaufmann (d00p)
e58192edc2 show whether curl extension is installed when trying to check for a new version in admin-dashboard 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-29 11:11:39 +02:00
Michael Kaufmann (d00p)
be0099bf01 add duplicate check to switch-server-ip script 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-16 09:18:02 +01:00
Michael Kaufmann (d00p)
724e88b94f rename handler php5-fastcgi to php-fastcgi, just cosmetics; fixes #536 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 11:37:45 +01:00
Michael Kaufmann (d00p)
3c802038f2 split touch-command for multiple files into single ones, fixes #535 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 11:35:03 +01:00
Michael Kaufmann (d00p)
38b57117e2 minor fixes in froxlor-sql file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-13 10:40:45 +01:00
Michael Kaufmann (d00p)
349fa7a761 avoid possible undefined index if no issuer-organisation is set in a certificate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 10:22:50 +01:00
Michael Kaufmann (d00p)
7b52c0c78c fix default value of panel.no_robots settings; add phpdoc for Database-class-methods 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-08 17:03:17 +01:00
Michael Kaufmann (d00p)
cd5cef51e8 allow config and settings json file for config-services.php to be downloaded from a remote url 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 21:07:08 +01:00
Michael Kaufmann (d00p)
a621fd3b09 run cronjob at the end of config-services script (when using --apply), thx v3ng 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 11:05:26 +01:00
Michael Kaufmann (d00p)
0c43c5d2b5 backport config-services --import-settings parameter from 0.10.0 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 10:52:57 +01:00
Michael Kaufmann
aff6d82321 Merge pull request #531 from Crease29/patch-1 
Link domains to HTTPS in certificate list
 2018-03-04 12:11:12 +01:00
Kai Neuwerth
91cecf8c1e Link domains to HTTPS in certificate list 
As an admin I want to check if the certificate of a website is working.
Therefore I click on the domain in the SSL certificate list and have to prepend "https" to the URL later.
In this case I'd link the domain to HTTPS initially.
 2018-03-04 11:43:50 +01:00
Michael Kaufmann
26c3c8e6f0 Merge pull request #527 from JB1985/patch-2 
Update german.lng.php
 2018-03-03 14:58:38 +01:00
Michael Kaufmann
08814f8c9a Merge pull request #530 from michaelzangl/fix-hostname-error-message 
Fix hostname error message
 2018-03-03 14:57:22 +01:00
Michael Kaufmann
632eb98df9 Merge pull request #529 from michaelzangl/fix-installer-path 
Froxlor installer: Use same file path for chmod.
 2018-03-03 13:05:59 +01:00
Michael Zangl
909c983aec Fix invalidhostname error message (de). 2018-03-03 11:49:58 +01:00
Michael Zangl
8642254175 Fix invalidhostname error message. 2018-03-03 11:48:26 +01:00