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

180 Commits

Author SHA1 Message Date
Dennis Dudek
d90676a793 Optimised phpdoc and array value use in foreach (#1026) 
* use array values by already destructed values in foreach
corrected php docs to use string|array

* use values by already desctructered array values in foreach
 2022-04-13 10:37:25 +02:00
Dennis Dudek
7a13e4a421 remove nested dirname and use level parameter for better readability (#1025) 2022-04-13 10:14:03 +02:00
Michael Kaufmann
0f4325f68d migrate shell/helper scripts to symfony/console components 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2022-04-10 10:05:21 +02:00
Michael Kaufmann
07049909ef remove accidentally added character 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2022-04-03 14:44:13 +02:00
Michael Kaufmann
d18fa771f4 respect domain.writeerrorlog and domain.writeaccesslog when using log-to-pipe 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2022-04-03 14:35:09 +02:00
Michael Kaufmann
0312548e88 don't rely on executable flag for php-sessionclean script 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2022-04-01 14:48:55 +02:00
Michael Kaufmann
04a08f9095 add empty index.html file to all folders to avoid accidental folder-content disclosure if 'Options Indexes' is set for a (parent)folder containing froxlor in webserver-config 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2022-03-24 14:35:30 +01:00
Michael Kaufmann
84f5de42a9 move php-sessionclean script to scripts-dir instead of install/scripts/; add cronjob calling php-sessionclean if php-fpm is enabled; remove testing-note for let's encrypt in german language file 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2022-02-24 08:49:36 +01:00
Michael Kaufmann
9babcde3e5 additional mkdir/chmod parameter fixes and cron-lock file adjustments 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2022-02-04 10:52:12 +01:00
Manuel
5ab49e3f50 Call PHP-FPM only when file exists (#1006) 
Added `<If "-f %{SCRIPT_FILENAME}">` to load only PHP files that exists. This is to prevent `File not found` error from PHP-FPM and let Apache handle the error output. It removes also unnecessary PHP-FPM calls and `AH01071: Got error ‘Primary script unknown` in PHP error log.

Usually you can find the error whenever someone goes fishing for paths like wp-login.php.

The `<If>` directive is only available in Apache 2.4+ and not 2.2 or earlier.
 2022-01-21 12:25:14 +01:00
Oskar Eisemuth
4a912e3902 Feature/crontaskid (#1005) 
* Add \Froxlor\Cron\TaskId for fixed task id naming

* Replace Cronjob::inserttask numbers with \Froxlor\Cron\TaskId constants

* Use TaskId in Froxlor\Cron\System\TasksCron

* Use TaskId in Froxlor\System\Cronjob,
simplify getOutstandingTasks.
Rename lng['tasks'] cronjob task description.
WARNING: DELETE_DOMAIN_PDNS, DELETE_DOMAIN_SSL now use %domain%

* Remove Froxlor\System\Cronjob type 3 check
 2022-01-21 10:03:45 +01:00
Michael Kaufmann
d1d42f2055 allow setting path to acme.sh installation; fixes #1002 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-12-31 10:38:49 +01:00
Michael Kaufmann
bcde7e93df check whether the domain to clean from pdns actually still exists there; fixes #992 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-10-21 12:00:36 +02:00
Michael Kaufmann
a552ea878e avoid undefined index of 'wwwserveralias' field if issueing/renewing lets encrypt certificate for froxlor-hostname 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-10-17 11:48:40 +02:00
Nicolas
67351ec3c2 Adding support for PowerDNS-Replication (#974) 
Adding support for powerdns-replication
 2021-08-19 12:00:09 +02:00
Michael Kaufmann
0a1a3e023f check dns for lets encrypt when adding/editing domains and via cron; fixes #971 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-08-04 13:44:13 +02:00
Stefan Weil
09038ac7aa Fix some typos (found by codespell) (#969) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2021-07-31 09:51:54 +02:00
Michael Kaufmann
4c507232c7 add setting for a custom system group for all customer-users (required libnss-extrausers); fixes #953 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-30 12:16:37 +02:00
Michael Kaufmann
86939a64da add buypass testing/staging ACME endpoint; create CAA entries accordingly if activated; refs #968 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-29 21:24:43 +02:00
Jens Meißner
926ce427fc Add Buypass to the list of ACME providers. (#968) 2021-07-29 21:15:49 +02:00
Michael Kaufmann
5608f0407f correct heredoc indentation in AcmeSh for php-7.1; fixes #957 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-20 08:11:32 +02:00
Michael Kaufmann
b88f9c1f18 allow defining php_value/php_admin_value for session.save_path when using php-fpm; fixes #954 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-09 08:23:46 +02:00
Michael Kaufmann
73991e855c Support ZeroSSL via acme.sh (v3); refs #946 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-06-27 09:00:44 +02:00
Michael Kaufmann
769525bb56 do not touch/chown error/access log if log is disabled, fixes #934 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-04-12 09:42:25 +02:00
Michael Kaufmann
9195fb3c98 additionally sort by length of username for libnss-extrausers passwd file to have the main user as first in result in any case; fixes #933 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-04-12 09:37:36 +02:00
Michael Kaufmann
db1a39b6d9 match composePhpOptions() definition everywhere 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-24 13:49:58 +01:00
Michael Kaufmann
7fbbc2ea0b add vhost replacer {FPMSOCKET} for custom vhost configs; fixes #931 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-24 13:46:24 +01:00
RipClaw2971
3b3527348f Update AcmeSh.php 
Renewed certificates are not recognized if the domain is in upper/lower case.
 2021-02-24 13:00:31 +01:00
Michael Kaufmann
3a17d03796 add option to specify (optional) fileextension/suffix for generated dkim-private keys; fixes #907 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-01-20 12:12:41 +01:00
Daniel
17a64c58c2 Put in a trailing "/" for /awstats/ location 2020-12-31 16:01:42 +08:00
Michael Kaufmann
a671223823 corrected too few arguments to function Froxlor\Cron\Traffic\TrafficCron::callAwstatsGetTraffic(); fixes #901 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-12-28 19:43:40 +01:00
Michael Kaufmann
ee5de56a94 also validate existence of ssl-key file in vhost generation 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-12-10 09:47:58 +01:00
Michael Kaufmann
aba97df9b2 added date-range parameters for Traffic.listing(), fixes #878 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-12-10 09:44:43 +01:00
Jens Meißner
aa1d2ab01d Set certificate files explicitly world readable. 2020-11-24 17:38:49 +01:00
Jens Meißner
2a770a93b1 Protect only private keys and leave certificates world readable. 2020-11-23 20:32:24 +01:00
Michael Kaufmann
b3f82f0981 remove duplicate AXFR records as nameserver get added automatically in case they have also been added to the axfr list 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-11-01 21:00:27 +01:00
Michael Kaufmann
15a13a7783 append file-extension for dkim-private-keys as external tools may require it (rspamd e.g.); thx to rseffner for finding this 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-10-20 15:28:51 +02:00
Michael Kaufmann
3a47b2050e fix awstats/webalizer directory protection when using nginx; fixes #888 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-10-13 20:18:44 +02:00
heavygale
2f0251bb19 Fix for "Trying to access array offset on value of type bool" 
Proper check for success of query before accessing the result array. This notices occures if there's no custom mail-template for trafficmaxpercent_subject or trafficmaxpercent_mailbody for the required language.
 2020-10-03 12:55:14 +02:00
Michael Kaufmann
d9331cca61 check for fallback of ssl-certificate in ips/ports correctly of lets encrypt is used 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-09-18 11:49:26 +02:00
Michael Kaufmann
f169129e27 remove obsolete/unused table 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-09-07 21:53:18 +02:00
Michael Kaufmann
4ad8b62576 for ssl-fallback-check not only check for empty value but also for existence of certificate, thx to df8oe 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-09-06 14:12:25 +02:00
Michael Kaufmann
1eed3d1166 remove underscore from dkim-selector when creating the certificates too, refs #619 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-08-13 09:04:58 +02:00
Michael Kaufmann
6a32720c9a remove underscore from dkim-selector in the output certificate files too as (old) dkim-filter read the selector from this filename; refs #619 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-08-09 10:54:22 +02:00
Michael Kaufmann
970ecb469e use overridden limit_extensions and idle_timeout in vhost config when using fpm and not mod_proxy 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-08-07 17:16:56 +02:00
Michael Kaufmann
aa45a0302e fix permanent rebuilding of vhost configs, refs 0af655f106 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-07-29 08:23:49 +02:00
Michael Kaufmann
10b52486b5 ups, forgot to save the file so it's missing a critical return :P 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-07-25 17:28:46 +02:00
Michael Kaufmann
0af655f106 fix permanent rebuilding of vhost configs due to always-true renew check of let's encrypt certificates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-07-25 17:21:52 +02:00
Michael Kaufmann
03bc94e69c insert task to sync certificates for all cases (issue and renew) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-07-07 12:10:40 +02:00
Michael Kaufmann
a141c83ad4 do not call strtotime on the validTo_time_t key of cert_data as it already is an UNIX-timestamp, refs #865 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-06-23 20:35:50 +02:00