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

207 Commits

Author SHA1 Message Date
Michael Kaufmann
bf7df9a8d6 Merge branch 'write_no_log' of https://github.com/ServiusHack/Froxlor into ServiusHack-write_no_log 2018-12-17 12:21:49 +01:00
Michael Kaufmann
8b0966d332 do not generate ssl vhost with fallback ssl-certificate if file does not exist, fixes #614 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-16 20:21:53 +01:00
Michael Kaufmann
3d647a2c2e fix read in correct fpm-daemon config-id for nginx and lighttpd own-vhost, thx again to heavygale 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-09 11:05:36 +01:00
Michael Kaufmann
29c754e700 add new CUSTOMER_HOMEDIR replacer for php-configs, thx to rubberduck for the hint 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-29 09:37:18 +01:00
Michael Kaufmann
b032f5b2ba add dhparams for webserver/ssl, refs #519 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-18 20:35:27 +01:00
Severin Leonhardt
d76df274f4 Make writing AccessLog and ErrorLog optional 2018-10-11 19:07:09 +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)
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
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)
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
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)
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)
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)
552d58848c fix sql_mode=only_full_group_by in admin_admins.php; fix wrong webserver-user when using FCGID 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-05-09 13:17:50 +02:00
Daniel Reichelt
ec1bd6e19a add OCSP stapling support for apache2 and nginx 2017-04-11 17:09:34 +02:00
Michael Kaufmann (d00p)
95a18be5c5 do not use HTTP_HOST variable if mod_rewrite is not used 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-24 09:41:45 +01:00
Michael Kaufmann (d00p)
8030aae37a fix directory options for deactivated users, fixes #1704 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-23 23:53:01 +01:00
Michael Kaufmann (d00p)
e00cb8926d set mail-sender to customer mail address when using mod_php, fixes #1707 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-23 08:12:44 +01:00
Michael Kaufmann (d00p)
ab18d94053 fix PR #407 - only works for apache-2.4 and missed the entry for customer-vhosts 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-17 11:29:40 +01:00
Laurens Stötzel
5e0270e6a8 Disable SSLCompression (CRIME attack) 
https://raymii.org/s/tutorials/Strong_SSL_Security_On_Apache2.html#SSL_Compression_(CRIME_attack)
 2017-01-17 10:33:22 +01:00
Michael Kaufmann
3d4b56b233 Merge branch 'master' into master 2016-12-11 08:19:16 +01:00
Michael Kaufmann
d8994ca65b Merge pull request #399 from hypernics/alias_redirect 
Change redirect host from main domain name to requested domain name, refs #1670
 2016-12-11 08:05:57 +01:00
Michael Kaufmann (d00p)
18514f0180 fix undefined array when processing specialsettings, fixes #1684 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-10 21:43:28 +01:00
Janos Muzsi
2c00f982d8 Change redirect host from main domain name to requested domain name 2016-11-24 22:55:57 +01:00
Michael Kaufmann (d00p)
43ca4a28e4 add acme.conf alias also to froxlor vhost in case the acme-challenge path is not within the froxlor-docroot; fix empty redirect-code, fixes #1674 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-21 08:19:33 +01:00
Dominic Schallert
e5053bad15 Introduced phpenabled_customer and phpenabled_vhost, updated cron scripts, updated dbversion 2016-11-13 15:15:43 +01:00
Michael Kaufmann (d00p)
60c1babd93 fix wrong protocol name for apache 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-31 20:44:31 +01:00
Michael Kaufmann (d00p)
76c200a56c disable tlsv1.1 for ssl settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-31 11:17:56 +01:00
Michael Kaufmann (d00p)
884b2ed913 various fixes for idn converted domains + fix undefined index alias when editing a domain with alias 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-25 12:24:57 +02:00
Michael Kaufmann (d00p)
af77453bfe do not generate ssl-vhost-container without a certificate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-20 09:23:44 +02:00
Michael Kaufmann (d00p)
fc2ae594cb enable custom redirect codes also for nginx 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-13 09:51:57 +02:00
Michael Kaufmann (d00p)
4a3e02c1f0 add HSTS for domains (admin-side) and froxlor-vhost; fixes #1660 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-07 11:01:45 +02:00
Michael Kaufmann (d00p)
9799e05ce4 idna convert the whole URI for uri's in docroot as redirect, fixes #1654 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-22 07:46:50 +02:00