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

5342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
d854e8e991 Merge branch 'main' of github.com:Froxlor/Froxlor 2023-01-26 15:23:03 +01:00
Michael Kaufmann
0a363910d6 fix potential infinite loop on errors in cli-installation; fixes #1092 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-26 15:22:39 +01:00
Maurice Preuß (envoyr)
b23d5cd909 merge branch 'main' of github.com:Froxlor/Froxlor 2023-01-25 18:51:03 +01:00
Maurice Preuß (envoyr)
3b753aa69d change session/cookie domain value, this prevents using the _ server_name when using nginx 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-01-25 18:50:49 +01:00
Michael Kaufmann
492cd288bc enhanced themefile validation for non-default themes 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-25 13:09:06 +01:00
Marvin Stark
47938c5082 Update README.md (#1090) 
Fixed typo.
 2023-01-24 18:56:29 +01:00
Michael Kaufmann
d090e48544 validate result of Net_DNS2_Resolver::query (CNAME's are being resolved to their corresponding target A/AAAA addresses); fixes #1089 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-23 08:58:42 +01:00
Michael Kaufmann
314e4407a0 add lasst successful login to table-columns for customer overview 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-22 15:04:19 +01:00
Michael Kaufmann
dff7530cc5 include froxlor-vhost in validate-acme-webroot command; fixes #1088 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-22 13:01:20 +01:00
Maurice Preuß (envoyr)
19423c9644 normalize (compress) ip addresses 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-01-20 21:26:24 +01:00
Michael Kaufmann
42b3f1e59d set version to 2.0.9 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.9 		2023-01-20 18:01:28 +01:00
Michael Kaufmann
1b77632fa8 correctly display config-services command in updater if manual commands are needed 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-19 20:19:43 +01:00
Maurice Preuß (envoyr)
867b7b1390 fix domain variable for gethostbynamel6 function 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-01-18 14:47:25 +01:00
Maurice Preuß (envoyr)
4c6ebde58c adding new dns resolver setting for let's encrypt 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
Co-authored-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-18 13:57:47 +01:00
Michael Kaufmann
1e013d9e9a enhance information on updater regarding acme-challenge (if lets encrypt is enabled and applicable) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-18 11:47:55 +01:00
Michael Kaufmann
c56bc651b9 allow hiding documentation menu for customers via customers-hide-option; use --staging for acme.sh for every test-CA 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-18 08:59:59 +01:00
aPollO2k
6cbdf45a7c Typo fixed in update_2.x.inc.php (#1082) 
PHO_EOL => PHP_EOL
 2023-01-16 21:32:56 +01:00
Michael Kaufmann
715667e227 Merge branch 'main' of github.com:Froxlor/Froxlor 2023-01-15 23:49:09 +01:00
Michael Kaufmann
41de161555 show exact froxlor:config-services parameter for updater; better checks for changed acme-challenge paths; fix typo in PHP_EOL statement; remove crsf token from config-apply-parameter generation from within the ui 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-15 23:48:37 +01:00
Maurice Preuß (envoyr)
1f1ea370c0 add version to mix-manifest.json and add mix function 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-01-14 21:14:55 +01:00
Michael Kaufmann
090cfc26f2 set file-log (if enabled) to be in froxlor/logs/ folder; fix ssl param directive for dovecot in Ubuntu Bionic; set version to 2.0.8 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.8 		2023-01-14 13:09:42 +01:00
Michael Kaufmann
529890b5d2 fix typo in langauge-definition 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-12 22:27:45 +01:00
Michael Kaufmann
d4a6ab146d re-add total-disspace dashboard-display on customer dashboard 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-12 16:52:14 +01:00
Michael Kaufmann
e3f02879cf restore mandatory field on domain-formfields; add translated require message and correct error-placement of the message 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-12 15:16:42 +01:00
Michael Kaufmann
b52d6df777 [UI] change require of ipandport field in domains.add and domains.delete to one-of instead of all; fixes #1078 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-12 14:53:05 +01:00
Michael Kaufmann
9e671100ae acme-challenge path adjustments if docroot changed after update from 0.10.x (via apt) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-12 14:21:14 +01:00
Michael Kaufmann
7e801ea502 Merge branch 'main' of github.com:Froxlor/Froxlor 2023-01-12 12:20:23 +01:00
Daniel
b68522f7d5 Fix formfield image preview path (#1077) 2023-01-12 12:19:31 +01:00
Michael Kaufmann
86852942e0 add missing language-strings for traffic page 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-12 11:30:52 +01:00
Michael Kaufmann
ec05c84f4d check whether let's encrypt is enabled at all and correct acme-alias configuration file if necessary/selected 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-12 09:40:35 +01:00
Michael Kaufmann
9e13c077e9 show command to regenerate cron.d-file if previous deletion of old files could not be done automatically, fixes #1076 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-12 08:33:19 +01:00
Maurice Preuß (envoyr)
da8d315e77 remove hardcoded logo height 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-01-11 22:43:00 +01:00
Michael Kaufmann
cb67e3ae63 continue checking domains even if no config was found, thx knox 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-11 21:07:00 +01:00
Michael Kaufmann
82d15c4dc2 fixes for ValidateAcmeWebroot command 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-11 20:47:07 +01:00
Michael Kaufmann
6d048e2cee fix default mysql-dbserver for customers if not allowed to use the default (id=0) one; fixes #1075 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-11 19:41:24 +01:00
Michael Kaufmann
87bd80eea1 reenable access to ftp view for customers with ftps=0 because the main account is always being created 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-11 14:58:18 +01:00
Michael Kaufmann
80e442e396 set version to 2.0.7 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.7 		2023-01-10 22:15:57 +01:00
Michael Kaufmann
489ad375bd ensure latest userdata.inc.php layout for updaters/users of old format 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-10 16:54:20 +01:00
Michael Kaufmann
c420196e73 check explicitly for template existence and try to use default theme as fallback; fixes #1071 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-10 16:53:36 +01:00
Michael Kaufmann
cc6d8d5f8b fix login if non-standard ports are used for froxlor vhost 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-10 12:43:04 +01:00
Michael Kaufmann
24f47bc58b set version to 2.0.6 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.6 		2023-01-09 10:09:15 +01:00
Michael Kaufmann
c769c074e0 add Google CA to available acme.sh providers; fixes #1065 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-09 10:00:08 +01:00
dependabot[bot]
2ecb8eb034 Bump json5 from 1.0.1 to 1.0.2 (#1069) 
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-01-09 09:51:52 +01:00
Michael Kaufmann
6827c100c3 fix updating email account password-hashes in updater 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-09 09:50:51 +01:00
Michael Kaufmann
c402acd1bd disable correct mod_php in bionic-config-templates when fcgid/php-fpm is selected 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-09 09:25:29 +01:00
Michael Kaufmann
c4ec2509fa fix resetting of isemaildomain-flag of subdomains when nothing changed; fixes #1067 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-09 09:24:22 +01:00
Michael Kaufmann
0f382586ce set version to 2.0.5 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.5 		2023-01-08 23:24:43 +01:00
Michael Kaufmann
9c2f12ecb1 mysql-remote-server fixes 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-01-08 23:20:31 +01:00
Michael Kaufmann
12da117cab fix chmod() command in compatibility cronjob for updaters 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.4 		2023-01-08 20:20:44 +01:00
Michael Kaufmann
ef48f4b48e set version to 2.0.3 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.3 		2023-01-08 19:44:07 +01:00