maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
4,266 Commits 6 Branches 188 Tags
b162324ff02a3279d2728b722d70acd3ccd59059
Commit Graph

1905 Commits

Author SHA1 Message Date
Michael Kaufmann
b162324ff0 fix renew-check of let's encrypt implementation, set version to 0.10.5 for bugfix release; fixes #747 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-01 14:19:06 +01:00
Michael Kaufmann
6cd061d74c set version to 0.10.4 for upcoming maintenance release; minor code formatting + adjustments 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-01 11:16:13 +01:00
Michael Kaufmann
aa85c648a3 check for renewal of certificates not only if there's a task to regenerate vhosts but everytime the letsencrypt cronjob runs (which is basically obsolete due to the integration into the tasks cron but perfect for checking renewal dates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-31 21:37:54 +01:00
Michael Kaufmann
ef6254b307 Merge pull request #679 from pquerner/#564 
Allow CIDR and Netmask in mysql_host_access; fixes #564
 2019-10-30 10:40:26 +01:00
kionez
b0e920104f Fix fastcgi_split_path_info as https://www.nginx.com/resources/wiki/start/topics/examples/phpfcgi/ 2019-10-29 16:00:14 +01:00
kionez
299e201142 Fix fastcgi_split_path_info 2019-10-29 15:47:28 +01:00
Michael Kaufmann
46982ad2dc validate that a customer gets the default ftp account created even if the admin/reseller has no more resource for ftp accounts; fixes #741 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-29 07:52:00 +01:00
Pascal
5c11eecbd7 remove code for checking ipv6 mapped ipv4 notation 2019-10-28 17:27:39 +01:00
Pascal
9689afc759 change method signature of \Froxlor\Validate\Validate::validate_ip2 2019-10-28 16:58:34 +01:00
Pascal
9c4d619840 remove inner if statement 
check ipv6 when cidr>netmask flag is set
 2019-10-28 16:32:52 +01:00
Pascal
7774e7606d dont check notated ips again 2019-10-28 16:29:53 +01:00
Pascal
2ed0cad27b #564: 
cidr notation can only be 1 through 32
 2019-10-28 16:27:54 +01:00
Pascal
686c2ae534 fix comparison 2019-10-28 16:00:43 +01:00
Pascal
faf3abe800 introduce new parameter to allow automatic convert cidr notation to netmask notation 2019-10-28 15:33:26 +01:00
Pascal
220b493a1b better readability 2019-10-28 14:16:27 +01:00
Pascal
e8d67f9711 check if ipv6 first 2019-10-28 14:07:31 +01:00
Pascal
83e932b068 switch join with implode 2019-10-28 13:26:32 +01:00
Pascal
84d1be538e block ipv6 addresses in cidr notation (mysql can't handle it) 2019-10-28 13:25:34 +01:00
Pascal
c97cdb1c0e make it more readable 2019-10-28 13:15:48 +01:00
Pascal
ffefe85fb4 Merge branch 'master' into #564 2019-10-28 12:18:55 +01:00
Michael Kaufmann
822bb2bd4d fixed deletion of default-ftp-user possible via API (not through the interface though); refs #741 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-27 16:02:32 +01:00
Michael Kaufmann
88ee76e4c9 setting version to 0.10.3 for upcoming release 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-25 14:48:13 +02:00
Michael Kaufmann
7b162c4bd0 added tls-settings per domain for admins with change_serversettings-flag set; fixes #519 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-22 16:45:03 +02:00
Michael Kaufmann
32e2d48aed fallback to /tmp/froxlor.log if file-log is activated but no file given or not writeable; fixes #737 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-22 15:06:41 +02:00
Michael Kaufmann
1fdc524171 correct permissions 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-19 11:08:55 +02:00
Michael Kaufmann
4704798379 setting version to 0.10.2 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-18 13:39:23 +02:00
Michael Kaufmann
f0b36c03ad fix registration and termination date to flip between empty-value and 0000-00-00, thx to dxd 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-17 09:35:33 +02:00
Michael Kaufmann
5cf2d32e8a reverse parameter for Domains.add() into so users have to explicitly pass the parameter if they do NOT want the default ssl-ip to be used if left empty, so it behaves like the non-ssl ipandport parameter - if left empty, the system default is being used, thx J-BBB 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-15 14:35:42 +02:00
Michael Kaufmann
9b122bc003 order tasks by type descending to create bind and webserver configs at the end of the run; cleanUp configs files after creation of certificates to minimize downtime, thx to SCD for testing 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-14 13:56:55 +02:00
Michael Kaufmann
9410356bc7 fix output of acme command when upgrading 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-14 10:12:26 +02:00
Michael Kaufmann
5d5cc3dda3 fix array to string conversion 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-13 22:49:03 +02:00
Michael Kaufmann
5680c88da0 implement DomainZones.listing() to actually return custom stored dns entries for a given domain, fixes #731 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-13 14:40:04 +02:00
Michael Kaufmann
b6367e1be1 forgot to add the ssl-default-vhostconf-domain fields in ipsandports 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-12 14:39:58 +02:00
Michael Kaufmann
93aa8bff1e add default-ssl-vhost settings and optionally allow including of non-ssl default-vhost settings, fixes #727 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-12 14:34:18 +02:00
Michael Kaufmann
057f4aaa10 Passing the and parameters in reverse order to implode has been deprecated since PHP 7.4 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-12 10:22:11 +02:00
Michael Kaufmann
f588927bc5 check for existence of certificate files created by acme.sh 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-12 08:17:04 +02:00
Michael Kaufmann
03d2a76dd0 clean up language and code for dropped let's encrypt ACMEv1 support 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-11 20:53:34 +02:00
Michael Kaufmann
0d0e557715 force Let's Encrypt ACMEv2 API, fixed #728 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-11 18:17:05 +02:00
Michael Kaufmann
fb54b887f2 remove unneeded apihelp-page code in admin/customer_index; set explicit version to api-doc URL; check for acme.sh cronjob and uninstall it, as froxlor manages that itself 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-10 16:42:32 +02:00
Michael Kaufmann
9167608794 set version to 0.10.1 for maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-10 14:55:45 +02:00
Michael Kaufmann
4543c73b4f add possibility to enable/disable api access on a per user base 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-09 11:43:22 +02:00
Michael Kaufmann
88d85fc02e fix curly bracket array access (deprecated) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-09 07:59:38 +02:00
Michael Kaufmann
6102fabcb6 allow setting http2 flag for (sub)domains in customer view, fixes #725 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-09 07:59:11 +02:00
Michael Kaufmann
d7a7412973 Merge pull request #724 from kionez/add-ssl-expirationdate 
Add expiration date to SSL certificates loaded via API request, fixes #723
 2019-10-08 18:59:27 +02:00
kionez
1b3029b826 Fix typo 2019-10-08 18:50:10 +02:00
Michael Kaufmann
26cb53c8fb correctly validate that a domain has not a certificate in Certificates.add(), refs #722 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 18:44:42 +02:00
Michael Kaufmann
b4999fcc83 Throw exception if domain used to call Certificates.get() does not have a certificate, fixes #722 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 18:01:59 +02:00
kionez
05f602d457 Fix for null expiration date and coding style 2019-10-08 17:44:41 +02:00
kionez
9ec03bade7 Add expiration date to SSL certificates loaded via API request 2019-10-08 17:32:03 +02:00
Michael Kaufmann
3a8d5a9517 correct Mysql.add phpDoc to produce correct api-doc, fixes #721 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-08 12:11:00 +02:00