maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,726 Commits 6 Branches 188 Tags
efdb3623e1bbc6f9ad3971bee61456a017d4f9bd
Commit Graph

438 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
efdb3623e1 fix return value usage in write-context 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-18 10:51:39 +01:00
Michael Kaufmann (d00p)
29494b71fa do not create vhost content for ssl-vhosts that do not have a ssl-certificate specified, fixes #1583 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-15 09:40:59 +01:00
Michael Kaufmann (d00p)
f2c3b3f165 ignore errors when deleting old statistics-index-page in case this is the first run and no index.html exists yet 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-11 09:14:09 +01:00
knox
56163f66d8 fixed ownership of cgi-bin symlink created by suexec-workaround 
see http://manpages.debian.org/cgi-bin/man.cgi?apropos=0&format=html&query=chown&sektion=1&locale=en
 2015-11-29 17:24:24 +01:00
Christian Becker
6996f6516c fix ssl setttings for rewrite vhosts on nginx, fixes #1568 
- previously the ssl settings were missing in rewrite vhosts
- this caused ssl errors for these hosts as the default certificate has been used instead of the vhost specific cert.
- this seem to only apply for nginx, not apache
 2015-11-14 14:10:23 +01:00
Michael Kaufmann (d00p)
0939d032a5 fix wrong vhost creation with nginx when customer is deactivated and no docroot for deactivated users was given, fixes #1565 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-12 08:42:32 +01:00
Michael Kaufmann (d00p)
d226af5314 do not select cron.d-file-regeneration task in cron_task as it is not being handled there 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-10-04 17:30:33 +02:00
Michael Kaufmann (d00p)
0b901af0f0 define array for mod_php users, fixes #1555 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-14 22:23:40 +02:00
Frank Gehann
edd60d3331 Fixed composeSslSettings which used variables not available in the function scope. 2015-08-18 11:03:06 +02:00
Michael Kaufmann
5136824844 Merge pull request #244 from greybyte/vhost_config_variables 
Variable substitution in vhost specialconfig
 2015-07-31 12:02:40 +02:00
Michael Kaufmann (d00p)
de4a953bb7 check for existence of ssl-related files for ip/port vhost in order to avoid the webserver to be unable to restart when the cronjob runs; fixes #1485 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-28 15:44:10 +02:00
Michael Kaufmann (d00p)
a1d38dc05f solve sub-sub-domain-problem by dynamically assigning vhost-number in vhost-filename (the deeper the lower the number thus being included earlier), fixes #1535 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-28 15:13:32 +02:00
Michael Kaufmann (d00p)
fce9de7372 remove superfluous call to 'getDomainRedirectCode' as its been called before; allow changing of redirect-code when domain has 'ssl-redirect' = 1 2015-07-28 13:21:02 +02:00
Michael Kaufmann (d00p)
cd1e03c033 fix openbasedir-path when using mod_php, fixes #1507 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-06-10 15:31:15 +02:00
Marcus van Dam
d9660e66a8 the awstats files live in the non static outputdir. 2015-06-10 14:43:50 +02:00
Marcus van Dam
83e904c9f7 Feature #545: Prevent ln from linking withing the current symlink. 2015-06-01 16:24:45 +02:00
Marcus van Dam
9bbdb1b3b9 Feature #545: Include the awstatsGenerateIndex in cronjob. 
Seperate the awstats updates output directory from the awstats static
output directory.
Switch to zero padded months.
Symlink current month to 'current' directory (force needed to update
the link if it already exists)
 2015-06-01 14:55:43 +02:00
Marcus van Dam
f6cdc0575b Feature #545: function to deploy the index and nav templates 
Should deploy the html files with its template variables replaced
into the awstats root.
 2015-06-01 14:45:20 +02:00
Andreas Grundler
16568c11f1 Fix für Apache 2.4 + mod_proxy_fcgi 2015-05-11 22:23:49 +02:00
Michael Kaufmann (d00p)
e0ef3e9984 fix mpm-itk stuff, thx to Ithariel; minor fixes in updater 2015-04-22 15:58:04 +02:00
Michael Kaufmann (d00p)
5dce0db661 dont create 'require all granted' if the directory is protected by a customer (htaccess), fixes #1455 (again); thx to Laryllian 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-02 20:25:41 +01:00
Michael Kaufmann (d00p)
03e48927a3 add optional support for apache-itk-mpm (mod_php only) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-18 16:01:38 +01:00
Roman Schmerold (BNoiZe)
643f124e8b Fixing a bug with linebreaks, fixes #1498 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-15 19:07:01 +01:00
Stefan Weil
0fc73b2bbb Fix typos found by codespell 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-02-08 17:52:45 +01:00
Michael Kaufmann (d00p)
a4973c9c38 don't add rewritecond for https off if this is a ssl-vhost 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-21 16:51:36 +01:00
Roman Schmerold (BNoiZe)
67f3263a2e Don't remove custom comments, add newline after blocks 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-14 00:20:04 +01:00
Roman Schmerold (BNoiZe)
f61567be81 Changed the way php-fpm is included, fixes #1427 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-13 20:37:57 +01:00
Michael Kaufmann (d00p)
3ee8f6ac25 use generatePassword() for generating passwords as it respects the settings; fix user-modification under freebsd as there is no 'usermod' 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-12 20:24:55 +01:00
Michael Kaufmann (d00p)
aff531a274 set from and reply to from settings in usage-report-mails 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-10 07:33:40 +01:00
Michael Kaufmann (d00p)
64959c75fe clear out whether pcntl extension is not installed or just pcntl_fork is unavailable, fixes #1469 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-07 15:36:35 +01:00
Michael Kaufmann (d00p)
55c7b2aedf use separate escapeshellarg()-calls as it leads to 'group user' as being recognized as the group only 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-05 18:16:51 +01:00
Michael Kaufmann (d00p)
366e0f6061 various permission fixes when using fcgid / fpm and customerdocroots having 0770 and sockets are 0660 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-22 09:51:55 +01:00
Marco Vogt (vogti)
6bfa95f8a8 Import default subject/body for e-mails templates; fixes #496 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-12 19:26:06 +01:00
Marco Vogt (vogti)
bc4cb480be improved traffic report 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-08 14:43:15 +01:00
Churro
4fe33a0b7a Fix for duplicate htpasswd entries (Nginx) 2014-12-02 22:29:54 +01:00
Churro
8842c02136 Fixed indentation of location-block in Nginx Vhosts 2014-12-01 22:50:07 +01:00
Churro
adbc4bc402 Basic auth realms now work for Nginx Vhosts too 2014-12-01 22:48:54 +01:00
Michael Kaufmann (d00p)
3be43c4848 outsource a few directory-functions in a class; make apache-2.4 not create 'require all granted' if there is an active directory-protection or option set for the customerroot-dir, possibly fixes #1455 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-01 08:07:28 +01:00
Michael Kaufmann (d00p)
242b42ba95 respect special characters in redirects 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-28 12:46:28 +01:00
Michael Kaufmann (d00p)
e4ceb962e9 remove trailing slash from mod_proxy stuff, regardless of what the apache-docs say, it works this way! 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-24 18:44:26 +01:00
Michael Kaufmann (d00p)
c6ed0b63c9 fix vhost-block-merging for nginx, fixes #1450 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-19 16:29:05 +01:00
Michael Kaufmann (d00p)
5499388777 add possibility to use php-fpm over mod_proxy_fcgi with apache >=2.4.9 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-10 11:47:27 +01:00
Frank Gehann
29d755433f set explicit sslprotocol to react to poodle attack stuff (nginx) 2014-10-30 14:57:04 +01:00
Michael Kaufmann (d00p)
97ec269838 set explicit sslprotocol to react to poodle attack stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-10-27 11:46:28 +01:00
Roman Schmerold (BNoiZe)
1b00a816e3 Rewrite of merging special vhost settings, fixes #1430 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-10-12 15:34:40 +02:00
Roman Schmerold (BNoiZe)
a7450dfe37 Fixed duplicate creation of directory protection, fixes #1450 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-10-11 09:08:27 +02:00
Roman Schmerold (BNoiZe)
fe5eff890f Removed another evil if I overlooked 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-10-11 08:18:43 +02:00
Roman Schmerold
539ec529c2 Removing evil if from nginx vhosts 
Signed-off-by: Roman Schmerold <bnoize@froxlor.org>
 2014-10-11 07:58:01 +02:00
Michael Kaufmann (d00p)
480e3a8bfd fix incorrect security check on mail-directories where various special-characters are allowed, fixes #1458 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-10-01 07:29:25 +02:00
Michael Kaufmann (d00p)
cbab67a2fd Merge branch 'master' of github.com:Froxlor/Froxlor 2014-09-22 10:17:46 +02:00