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

2937 Commits

Author SHA1 Message Date
Michael Kaufmann
4e23b9652c fix regression bug in 'incorrect top-5 customers' sorting in traffic-overview which leads to incorrect customer-links due to wrong indexing in the array; fixes #1236 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-02-04 19:54:19 +01:00
Michael Kaufmann
ece4b34f25 fix password crypt hash being always evaluated to argon2i as the case always returns true if PASSWORD_ARGON2I is defined but the froxlor setting might be set to another hash leading to a useless password 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-02-03 10:12:36 +01:00
Michael Kaufmann
9c70976018 fix check for allowed_phpconfigs if using mod_php when adding/editing a customer 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-30 19:31:21 +01:00
Michael Kaufmann
594d7d84bb Merge branch 'main' of github.com:Froxlor/Froxlor 2024-01-29 20:27:12 +01:00
sro0
9d4bc94aef Rename dovecot config file generated be renew hook to ensure it gets included (#1233) 
after default froxlor config file
 2024-01-29 20:26:38 +01:00
Michael Kaufmann
f03b49d0db api documentation additions for Customers.add()/update() and Admins.add()/update() 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-28 10:03:56 +01:00
Michael Kaufmann
bcf0818faf set correct channel for update-check if switching from apt-installed stable/testing to nightly 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-26 13:56:01 +01:00
Michael Kaufmann
dd765089c9 fix wrong setting-name for dkim-keylength when generating dkim-keys 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-26 13:55:14 +01:00
Michael Kaufmann
a7ee5e0ae3 create empty dns-server config if no (dns-enabled) domain is determined; fixes #1230 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-24 08:38:32 +01:00
Michael Kaufmann
2629718b22 add new 'http2 on' directive for nginx >=1.25.1 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-23 00:01:12 +01:00
Michael Kaufmann
9b20f4ac39 fix wrong order of ecc/non-ecc in proftpd config adjustment for let's encrypt renew-hook 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-19 16:09:24 +01:00
Michael Kaufmann
616dcb1fda use correct syntax for postconf in Let's Encrypt renew-hook service-configuration replacement; add missing language strings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-19 16:01:31 +01:00
Michael Kaufmann
bc1892d4ec fix incorrect top-5 customers in traffic overview for admins; show manual update command if webupdate is disabled 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-19 09:21:38 +01:00
sro0
83047019b0 Check for argon2 support before using constant PASSWORD_ARGON2X (#1228) 2024-01-16 21:34:17 +01:00
Michael Kaufmann
f420551888 added configuration adjustment for prodtpd if renew-hook for lets encrypt is used; updater-compatibility if gui_access field is not present yet (froxlor <2.2); removed depercated gentoo config templates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-14 09:40:33 +01:00
sro0
854c930696 Ensure XPath for ConfigDaemon matches exactly one element (#1224) 2024-01-13 12:31:15 +01:00
Michael Kaufmann
8740947323 initial integration of let's encrypt renew-hook for froxlor-vhost; refs #1186 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-13 11:12:48 +01:00
Michael Kaufmann
e684de687f implement dmarc to dns-zones; fixes #662 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-07 11:00:07 +01:00
Michael Kaufmann
284def5832 add gui_access flag to admins and customers to allow/disallow login to the webui; fixes #1219 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-07 10:23:02 +01:00
Michael Kaufmann
9c23013777 disable pam auth in dovecot for debian bookworm (like the other distros do it) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-07 09:05:38 +01:00
Michael Kaufmann
734d6888c8 backup rspamd configs in config-templates; add 'antispam' to valid_keys for config-json file; test existence of file in config-backup-function 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-05 16:52:40 +01:00
Michael Kaufmann
b15f99b1e1 implementation start of rspam/antispam feature 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-05 15:37:04 +01:00
Michael Kaufmann
49d67d7c27 set version to 2.1.4 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-05 14:33:45 +01:00
Michael Kaufmann
7cc4c9fedb possibility to specify sender address for froxlor as the admin-email address, custom or empty for system-default; fixes #1217 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-04 08:29:19 +01:00
Michael Kaufmann
7cdf6c8d64 don't output ipv6 in brackets for system.ipaddress setting as the brackets will be added to the value resulting in an invalid mysql-access-host; fixes #1215 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-01 17:04:02 +01:00
Michael Kaufmann
60621da243 dont use deprecated 'mysql_native_password' for mysql8; fixes #1214 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-01 12:24:45 +01:00
Michael Kaufmann
96ccdda304 use different language string for password-placeholder when adding a new customer; fixes #1216 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-31 18:01:39 +01:00
Michael Kaufmann
4073984fd7 traffic-cron: check for standardsubdomain to be in the domainlist array to avoid undefined index if e.g. an alias was set to the standardsubdomain 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-31 16:16:01 +01:00
Michael Kaufmann
ea31c8a64d fix font-color in apcu info; clear updatecheck-cache for nightly users 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-30 23:30:52 +01:00
Michael Kaufmann
832ee07e0e Don't show stats-icon for domains with redirect; hide goaccess output in traffic cron and keepalive database connection for long-running log-analysis; use same certificate-file if child-domain inherits the parentdomains certificate data (avoid possible http 421 Misdirected Request) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-29 10:15:45 +01:00
Michael Kaufmann
b542b140c6 set version to 2.1.3 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-22 14:33:11 +01:00
Michael Kaufmann
ac89fc7120 adjust order of css files 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-22 14:30:23 +01:00
Michael Kaufmann
150858485d include custom.css from config.json if preset correctly 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-21 10:59:15 +01:00
Michael Kaufmann
e7810e2066 correctly merge fielddetails with prefetched-formfielddata in form-processing 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-20 09:39:01 +01:00
Michael Kaufmann
4879446567 domains in php-configs are not sortable 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-19 17:17:51 +01:00
Michael Kaufmann
43eff78088 use panel.password_min_length setting for Froxlor.generatePassword() default length parameter; allow '::1' as valid mysql localhost value; wrapper to clean output for cli installation 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-16 20:20:58 +01:00
Gamerboy59
55a2ae3801 Add manual_config install var to cli (#1208) 
Make the manual_config var, which is available to the web installer, usuable for the cli installer too. If manual_config is set to true skip else (not set or false) proceed with auto config.
 2023-12-16 20:13:58 +01:00
Michael Kaufmann
a3b0332d13 set version to 2.1.2 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-15 09:41:16 +01:00
Michael Kaufmann
4b1846883d Merge pull request from GHSA-625g-fm5w-w7w4 
* fix possibility to have empty name/surname and empty company

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

* let js validation for customer add/edit form also trim() entered data to avoid empty values pass the client-side validation

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

---------

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-15 09:36:06 +01:00
Michael Kaufmann
00456a35e5 fix 2fa login when using email validation, thx to wysiwtf; adjusting row-format of larger tables 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-13 16:20:28 +01:00
Michael Kaufmann
5958f0516b do not css-check/clean passwords of the installation process; fixes #1203 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-12 09:33:28 +01:00
Michael Kaufmann
166ffedf04 correctly merge themeoptions array to use correct image on login when using darkmode 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-12 08:59:56 +01:00
Michael Kaufmann
ec0026ecfd fix wrong type when dns zone for system-hostname is active 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-11 14:20:08 +01:00
Michael Kaufmann
a721bb3f21 remove old 0.10.x and 2.0.x distribution-config-xml's for updaters 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-10 20:47:31 +01:00
Michael Kaufmann
5615decd96 set version to 2.1.1 for bugfix release (dns and install) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-10 08:20:12 +01:00
Michael Kaufmann
0348b1ec7e fix wrong result in Domain::getMainSubdomainIds(); fixes #1202 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-09 14:25:58 +01:00
Michael Kaufmann
1467dab58f set version to 2.1.0 for upcoming stable release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-08 11:48:32 +01:00
Michael Kaufmann
82dc76fdc6 fix wrong escaping of backslash in class-names when updating cronjobs_run table; add missing validateFormField-method for type 'image' (needs to be present but image-validation is handled elsewhere 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-05 11:16:41 +01:00
Michael Kaufmann
02ae52e3df remove old files in updater; avoid including old cli files in froxlor-cli; fix css for card list-groups 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-05 10:22:12 +01:00
Michael Kaufmann
5c06683e27 set version to 2.1.0-rc3 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-01 21:41:21 +01:00