maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,783 Commits 6 Branches 188 Tags
d2024e06ffd502804508fbafaa7370984e028c33
Commit Graph

678 Commits

Author SHA1 Message Date
Michael Kaufmann
13c624400e remove domain from pdns database if removed or updated so nameserver is disabled (remove) or update of db triggered when isemaildomain option is disabled, fixes #581 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-17 20:14:58 +01:00
Michael Kaufmann
18aa8eb5d2 added Traffic.listing ApiCommand; added first Unit-Tests for Traffic-Api; SQL IN-clause cannot be prepared, replaced all occurances accordingly; added --no-fork parameter to traffic-cron 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-11 21:51:39 +01:00
Michael Kaufmann
aa6f3d33eb clearify description and enhance validation for path-field in backup-job-planning 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-11 14:52:45 +02:00
Markus Petermann
9e289a2380 Fixed class.lescript_v2.php to work with ACMEv2 
Account(kid) needs to be saved for future requests.
Install/Update part is untested.
 2018-09-19 15:11:27 +02:00
Michael Kaufmann
d0c2888508 Merge pull request #494 from xelaz/master 
extend nginx letsencrypt (.well-known) redirect regex to https
 2018-08-15 08:03:45 +02:00
Michael Kaufmann
a28b2e8115 Revert "acme challenges can include hyphens (-)" 2018-08-12 18:11:36 +02:00
Oliver Rahner
512abda38d acme challenges can include hyphens (-) 
made a small adjustment so that acme challenges like "CrgFuFZU-U7mwXxjjHZi8if851XGVjdPRtWN91LTWmM" also don't get redirected
 2018-08-09 16:33:27 +02:00
Michael Kaufmann
c1e62e6be7 get rid of serialization completely to avoid possible code execution, fixes #555 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-29 15:47:41 +02:00
Michael Kaufmann
f8236dff7b fix not quite correctly webserver-log-piping 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 14:44:59 +02:00
Michael Kaufmann
bad680cfdb enhancements for webserver-log settings 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 13:23:37 +02:00
Michael Kaufmann
5a070d6d91 add settings to customize webserver logs 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 11:36:13 +02:00
Michael Kaufmann
67b95a301b check only for existing .conf files when trying to find out whether a fpm pool config directory is empty; fixes #543 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-06 14:38:18 +02:00
Michael Kaufmann
b3d018c506 corrected usage of default redirect code from settings; fixes #546 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-04-25 12:27:40 +02:00
Michael Kaufmann (d00p)
724e88b94f rename handler php5-fastcgi to php-fastcgi, just cosmetics; fixes #536 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 11:37:45 +01:00
Michael Kaufmann (d00p)
20eaa7bc08 fix missing sql-prepared-statement parameter, fixes #528 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-02 19:36:56 +01:00
Michael Kaufmann (d00p)
2b366c8f23 add field for fullchain to be stored in ssl-certificates-table; create fullchain file if given (it's not used by froxlor); do not generate/renew certificates for disabled customers domains 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 18:22:15 +01:00
Michael Kaufmann (d00p)
d5b9ad3452 darn, stay php-5.3 compatible, thx greppy 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-20 21:37:06 +01:00
Michael Kaufmann (d00p)
372ab5d9c8 add domain flag to avoid generation of nginx try_files directive in webroot which is not suitable for some applications; fixes #461 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 08:12:58 +01:00
Michael Kaufmann (d00p)
f034695290 remove '/etc/postfix/master.cf: line x: using backwards-compatible default setting chroot=y' warning; set correct permission for dkim-public key as it should not be group or other writable 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-27 11:14:22 +01:00
Andreas Grundler
7442bf7347 http2 Konfiguration nur einfügen wenn http2 in den Einstellungen aktiviert ist 2018-01-18 18:30:38 +01:00
Andreas Grundler
6ac3cb2014 Revert "http2 Konfiguration nur einfügen wenn http2 in den Einstellungen aktiviert ist" 
This reverts commit c3fb6f6a1c.
 2018-01-18 18:23:08 +01:00
Andreas Grundler
c3fb6f6a1c http2 Konfiguration nur einfügen wenn http2 in den Einstellungen aktiviert ist 2018-01-18 18:16:53 +01:00
Michael Kaufmann (d00p)
8c61773280 fix usage of extensions from limit_extensions list in apache-cron 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 17:01:17 +01:00
Michael Kaufmann (d00p)
29433ce963 escape possible dots in extension (e.g. to allow .php.xml or similar) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 15:49:07 +01:00
Michael Kaufmann (d00p)
bba872618a fix ssl-procotols in apache-cron; fix files-match regex in apache-cron 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 15:28:48 +01:00
Michael Kaufmann (d00p)
941dd14c72 read limit_extensions value from wrong array 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 15:22:22 +01:00
Michael Kaufmann (d00p)
f2a79d4d96 add new security.limit_extensions setting to fpm-daemon settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 15:20:19 +01:00
Michael Kaufmann (d00p)
4bcdfc0786 Added option to set the TLS protocol versions to be used in webservers 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 10:12:26 +01:00
Michael Kaufmann (d00p)
9312e4967e fix access to idle-timeout setting which moved from global settings to per-fpm-daemon setting, thx to gunnyst for pointing this out 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 08:45:20 +01:00
Michael Kaufmann (d00p)
ba58991d11 allow per php-config setting of adding '-pass-header Authorization' / 'CGIPassAuth On' to the domains vhosts 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 17:14:57 +01:00
Michael Kaufmann (d00p)
84abb33e54 exclude wildcard-domains agains also vor ACMEv2 of LE2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 17:12:55 +01:00
Michael Kaufmann (d00p)
d40d1f30b6 make it a setting to switch between ACME v1 and v2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 14:50:52 +01:00
Michael Kaufmann (d00p)
9aaadb1f8b implement lets-encrypt api-v02 (testing only currently; not activated in froxlor, test with 'php froxlor_master_cronjob.php --letsencrypt_v2 --debug' but set api endpoint to staging); no chain is returned currently, seems to be a known bug 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 14:40:36 +01:00
Michael Kaufmann (d00p)
d8abe30c44 create dummy pool-config whenever a fpm-daemons configdir is empty so it still restarts 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 09:25:56 +01:00
Michael Kaufmann (d00p)
07caf55f79 fixes to multi-fpm in cron 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-08 09:16:00 +01:00
Michael Kaufmann (d00p)
af55fe5b82 add possibility to add multiple php-fpm instances 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-07 14:55:25 +01:00
Andreas Grundler
64653a2bb1 nscd -i passwd in froxlor_master_cronjob.php eingefügt 2018-01-01 13:54:32 +01:00
Andreas Grundler
732c6e3a78 Added nscd -i passwd to clear user 2017-12-31 22:40:19 +01:00
Michael Kaufmann (d00p)
57277eb1e3 also add locked users to the passwd file for quota not to rage :P thx J-BBB 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-12-27 10:36:10 +01:00
Michael Kaufmann (d00p)
cf4f15a83c explicitly deactivate TLS (and auto-tls) when setting use-tls is OFF; fixes #496 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-12-19 08:00:39 +01:00
azerr
297f3f638c change sign direction 2017-12-08 17:47:09 +01:00
azerr
d2a9fa8632 extend nginx redirect regex to https 2017-12-08 15:39:05 +01:00
Michael Kaufmann (d00p)
e725b48c4c add default/global directory options in apache regardless of whether fcgid/fpm is being used or not; fixes #485 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-11-27 07:48:36 +01:00
Michael Kaufmann (d00p)
45c0915b59 fix ssl integration in lighttpd, thx to black-night for the info 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-11-17 15:15:09 +01:00
Michael Kaufmann (d00p)
1e03946df7 set sql_mode to disable STRICT_MODE usage for froxlor, thx to albech for the hint 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-11-08 07:49:40 +01:00
Michael Kaufmann (d00p)
bab982a0e6 add http2 support for froxlor-vhost and per-domain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-08-24 13:21:21 +02:00
Michael Kaufmann (d00p)
56e8e32965 set correct permissions for extrausers files/folder, fixes #465 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-07-26 07:30:14 +02:00
Oliver Rahner
aa8a7ee0a9 nginx: add index directive to path options for secured directories 
`index` directives are now created for secured directory locations.
 2017-06-10 10:59:41 +02:00
Michael Kaufmann (d00p)
a3201481f6 beatufication in generated vhost configs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-06-04 09:30:32 +02:00
Michael Kaufmann (d00p)
434f202832 minor fixes in traffic cron 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-05-12 12:22:04 +02:00