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

494 Commits

Author SHA1 Message Date
Michael Kaufmann
8807ae7dad allow private ip ranges in ips-and-ports as some configurations require that; fixes #802 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-02 09:51:44 +01:00
Michael Kaufmann
26e43077c2 make customer firstname,name,company and customer-no available for all templates; fixes #808 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-29 08:16:55 +01:00
Patrik Kernstock
05051309c7 Merge branch 'master' into logformat-awstats 2020-01-09 23:24:26 +00:00
Patrik Kernstock
0f025a6627 Language file update 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2020-01-09 23:21:11 +00:00
Patrik Kernstock
ea7834c1d1 Added small notice to lng for awstats LogFormat 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2020-01-08 22:08:15 +00:00
Patrik Kernstock
09aed61dbf Merge branch 'master' into logformat-awstats 2020-01-02 12:44:35 +01:00
Patrik Kernstock
28fd88e53e Merge branch 'master' into logformat 2020-01-02 12:31:51 +01:00
Patrik Kernstock
e143ba4577 Allow configuring awstats LogFormat 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 22:29:29 +01:00
Patrik Kernstock
6799a56ba1 Allow using more advanced LogFormat 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 20:18:52 +01:00
Patrik Kernstock
7ae59477af New update step, changed order of lang strings 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 16:14:26 +01:00
Patrik Kernstock
b39c8029cd Merge branch 'master' into phpfpm-custom-settings 2019-12-31 15:51:27 +01:00
Patrik Kernstock
69ff416361 Fixed SQL, minor comments/lng updates 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 15:34:46 +01:00
Michael Kaufmann
3eb1718fe0 add option to disable SSL sessiontickets globally for older systems, fixes #784 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-31 12:27:35 +01:00
Patrik Kernstock
c61b3b73bd Ability to add custom config to PHPFPM version 
Addresses #643

Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 05:48:36 +01:00
Michael Kaufmann
466c09137b add new 'ssl-enabled' flag for domains and subdomains so ssl can be deactivated (by a customer too) even if there are ssl-ip/ports assigned; introduce new honorcipherorder and sessiontickets flags for more control over ssl-related settings on a per domain base (admin only); fixes #767 and fixes #769 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-12-10 10:21:35 +01:00
Michael Kaufmann
d2852fbd5d add new setting to set default value of domain-edit-setting 'Apply specialsettings to all subdomains' and 'Apply php-config to all subdomains' 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-22 16:10:27 +01:00
Michael Kaufmann
4fbaacb159 fix domain listing for admin-domains 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-20 12:20:20 +01:00
Pascal
ffefe85fb4 Merge branch 'master' into #564 2019-10-28 12:18:55 +01: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
e5c1e8350d set default_theme value in settings-array to 'Sparkle' as it is in install/froxlor.sql; improve language strings for adding php-configurations and fpm-versions 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-17 18:40:53 +02:00
Michael Kaufmann
79056f20ee display API in the list of features the customer is allowed to use; display total diskspace used by customer (web, mail and mysql) on customers dashboard, fixes #733 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-16 12:44:23 +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
15fa035dc4 check for minimum required php version in autoupdater 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-12 14:04:43 +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
2c23431daf show on API keys page wether api access is allowed 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-09 11:52:55 +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
eb5ea51da1 add explicit tlsv1.3 ciphersuite setting (used for apache-only as of now) 2019-10-04 17:43:11 +02:00
Michael Kaufmann
c9d30654e0 update link to openssl-ciphers manual, thx to lod 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-02 09:12:06 +02:00
Erik Zettel
8a145eca92 lng/english.lng.php: fix typo 2019-09-24 12:44:33 +02:00
Michael Kaufmann
90e7f7af0c correct language-array and minor formatting in serversettings.caa_entry_custom 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-30 10:05:26 +02:00
Marc-André Kolly
bfb3fb0a92 Add Regex to check for invalid CAA entry 2019-07-29 11:36:34 +02:00
Marc-André Kolly
a377c1e6c5 Split l18n string into title and description 2019-07-29 07:39:21 +02:00
Marc-André Kolly
240178eba7 Implement global CAA settings 2019-07-28 19:49:32 +02:00
Marc-André Kolly
64fe300e42 Implement general CAA DNS records for all issuers 2019-07-28 16:28:29 +02:00
Marc-André Kolly
d4e5e32c14 Implement CAA DNS record for letsencrypt.org 2019-07-27 17:36:31 +02:00
Michael Kaufmann
c43915c09d show task 12 in admin dashboard overview if active 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-03 12:00:47 +02:00
Michael Kaufmann
72016a5735 fix integrity-check language-file entries 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-07 14:03:37 +02:00
Pascal
f297058461 #564 
fix wording
add validation for cidr syntax
add automatic transform of cidr to netmask for mysql
 2019-05-04 00:39:12 +02:00
Pascal
0f4d8d76ae #564 
fix wording
 2019-05-03 23:31:31 +02:00
Pascal
12884c91a6 #564 
fix #564 by allowing CIDR in mysql host validation. 
fix english and german field description accordingly
 2019-05-03 22:32:57 +02:00
Michael Kaufmann
ef331ccc81 Add setting to specify domain aliases for the froxlor-vhost (and add them to the SAN list of let's encrypt certificates if enabled) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-21 12:54:53 +01:00
Michael Kaufmann
459cbcc0dd keep re-use old-key setting for Let's Encrypt 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 19:25:23 +01:00
Michael Kaufmann
73a059b318 usinng acme.sh for issuing Let's Encrypt certificates now; please test thoroughly; fixes #651 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-17 16:17:35 +01:00
Michael Kaufmann
73c05fb231 add setting for customzing webserver error-log level, fixes #650 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-12 17:38:46 +01:00
Michael Kaufmann
d0fb77f3e9 Merge pull request #648 from princeofnaxos/Fix-english-typos 
Corrections to the English texts
 2019-02-11 16:18:50 +01:00
Edwin Boersma
32cf6dfaef Re-added missing line. 2019-02-11 16:17:17 +01:00
Michael Kaufmann
8ab86a05b2 disable settings in 'froxlor vhost settings' that wont have any effect if no IP/port has the 'create vHost container' option enabled; fixes #642 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-11 16:08:34 +01:00
Edwin Boersma
79b913131e Corrections to the English texts 2019-02-11 15:59:29 +01:00
Michael Kaufmann
83b760a43b add missing description for task 11 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-01 14:17:54 +01:00