maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
1,424 Commits 6 Branches 188 Tags
4825c77e2e88e969b89a051de585f9bdf27741a1
Commit Graph

85 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
4825c77e2e don't create one giant vhost for all IP's but separate ones for each ip 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-02 13:02:40 +02:00
Tilman Klaeger (tilman19)
a5048007de Create multistack configuration for Apache, fixes #582 2013-04-29 08:31:32 +02:00
Axel Guckelsberger
febb8e37bc Update cron_tasks.inc.http.10.apache.php 2013-04-27 09:50:05 +03:00
Michael Kaufmann (d00p)
b93bb806f6 don't use makeCorrectFile() on custom error-pages when it is a URL; also fix include-order for lighttpd vhosts, fixes #833 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-26 18:53:20 +02:00
Michael Kaufmann (d00p)
0001c30a5d added new configio-class to reduce the duplicate code of removing config-files for the webservers (it's all pretty much the same), CAUTION: very untested 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-16 21:39:46 +02:00
Michael Kaufmann (d00p)
551c1616f5 don't include specialsettings or default-vhost-content to ssl-redirects, fixes #1136 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-04 10:29:28 +02:00
Michael Kaufmann (d00p)
74c5d0718c remove php's safe_mode as it is deprecated since php-5.3 and removed since php-5.4 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 09:34:41 +01:00
Michael Kaufmann (d00p)
cbc745ff72 remove mod_log_sql as planned 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 08:38:29 +01:00
Michael Kaufmann (d00p)
69e785b5fe php-fpm + apache fixes when using ssl, refs #1048 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 15:35:08 +01:00
Michael Kaufmann (d00p)
cb6db7385a escape directories/files correctly - TODO: store the user-inputs in the database correctly (source of the data), checking in the cronjob is only just-in-case, refs #717 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-06 17:56:42 +01:00
Michael Kaufmann (d00p)
debdbf5d41 update FCGIWrapper directive to FcgidWrapper (since mod_fcgid-2.3.2), refs #1138 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-06 15:46:15 +01:00
Michael Kaufmann (d00p)
0c471639b1 don't remove php-fpm-configs after they have been 
created, the cron_tasks.php cleans up the directory already *update -> also in apache2 and lighttpd cron*

Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-25 14:16:37 +01:00
Michael Kaufmann (d00p)
d7eef7a8b2 add support for the new apache-2.4 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-25 09:59:26 +01:00
Florian Aders
08bd5f7041 Merge pull request #33 from anbrosius/ssl-with-redirect 
Fix bug: with a SSL-enabled domain and redirection Apache won't start, fixes #893 and #1023
 2012-09-25 01:21:25 -07:00
Florian Aders
ec537625a5 Merge pull request #51 from SirUli/master 
Fix for cron_tasks.inc.http.10.apache.php on 1315
 2012-09-25 00:27:17 -07:00
Uli
bd890e8ebe Fix for cron_tasks.inc.http.10.apache.php on 1315 
Error should have been fixed in #24 but the following error still
occured if $this->settings['phpfpm']['configdir'] is not available:

```
PHP Warning:  readdir() expects parameter 1 to be resource, boolean
given in /var/www/froxlor/scripts/jobs/cron_tasks.inc.http.10.apache.php
on line 1315
```

Structure of the fix is the same as in
f5bc81faca but copied to the other
section.
 2012-09-24 09:10:57 +02:00
Andreas Grundler
e2700ce91d Fix for Bug #1118 2012-08-23 11:32:25 +02:00
anbrosius
38b7d46596 Fix bug: with a SSL-enabled domain and redirect Apache won't start 2012-07-25 17:09:44 +02:00
Michael Kaufmann (d00p)
f5bc81faca check if path could be opened before iterating through it, fixes #1104 2012-06-28 08:53:23 +02:00
blackice2999
1e68766b54 fixes own error... we need later a cleanup 2012-05-08 16:56:03 +02:00
blackice2999
7ca68a3490 wrong php interface calling 2012-05-08 16:34:32 +02:00
blackice2999
6d79b81a89 fixes fpm and redirect loop fpm alias cannot be in docroot 2012-05-08 16:27:32 +02:00
Florian Aders
fcfb4af3a0 Merge pull request #11 from bechtoldt/ticket1048 
Use different filenames for FastCgiExternalServer and Alias (apache2, fcgid/fpm). Thanks to andreas.grundler, fixes #1048
 2012-04-04 06:44:46 -07:00
Florian Aders
4abd0bbee0 Merge pull request #10 from bechtoldt/ticket1029 
Fix Froxlor-own-vhost. Check if fcgid is still enabled. Thanks to sardyna12, fixes #1029
 2012-04-04 06:43:27 -07:00
Charles Williams (Slydder)
604b1dc912 fixed php-fpm config regeneration when is missing values 2012-03-17 14:27:03 +01:00
Arnold Bechtoldt
8ce0da0681 Expanding last commit. The original patch was a bit confusing, refs #1048 2012-03-09 14:09:02 +01:00
Arnold Bechtoldt
e6248cd5a9 Fix Froxlor own vhost. Check if fcgid is still enabled. Thanks to sardyna12, fixes #1019 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-03-09 13:34:44 +01:00
Robert Förster (Dessa)
3352ccffc1 fix 7d6d683e52 
we use mod_fcgid and not mod_fastcgi, refs #1017

Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
 2012-02-28 00:54:20 +01:00
Florian Aders (EleRas)
0038552955 Remove php-fpm-specific configuration (files) correctly, patch by Slydder, fixes #1022, fixes #914 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2012-02-27 19:43:56 +01:00
Florian Aders (EleRas)
7d6d683e52 Added Fast CGI Idle Timeout, patch by Slydder, fixes #1017 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2012-02-27 19:27:13 +01:00
lowb1rd
11f3ddf54a Apache: ServerAlias length limit not obeyed, fixes #1012 
Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
 2012-01-08 20:37:27 +01:00
Florian Aders (EleRas)
f83625655c Fixed aliasdomains in awstats, thx dahuafschmied, fixes #999 @5m 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-12-17 11:30:53 +01:00
Florian Aders (EleRas)
0deb4404d2 Fixing php-notice in cron while setting awstats - permissions, fixes #960, fixes #970, thx d4f 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-11-12 09:19:50 +01:00
Andreas Burchert (scarya)
9b12025c9f Prevents froxlor from creating a vhost (apache only) for relay mail domains, fixes #848 
Thanks to sinuxwave
 2011-09-19 11:00:50 +02:00
Andreas Burchert (scarya)
51a83d8b09 Removed @version in file header. This isn't used by git. 2011-05-04 11:59:20 +02:00
Robert Förster (Dessa)
fc72d7ec32 fix the fix 2011-04-01 11:27:28 +02:00
Robert Förster (Dessa)
b0f3d09cb9 fix typo, refs #660 2011-04-01 07:44:32 +02:00
Christoph Burchert (Chb)
954e507160 Pass redirect code to mod_rewrite directives, fixes #669 
Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>
 2011-03-18 12:48:19 +01:00
Michael Kaufmann (d00p)
d9dbd1917f add +FollowSysLinks options for perl-workaround, fixes #660 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-03-14 12:40:38 +01:00
Michael Kaufmann (d00p)
eaee62db4d remove trailing slash on hostnames for redirect as apache's mod_rewrite appends a second, fixes #658 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-03-14 08:02:58 +01:00
Michael Kaufmann (d00p)
d2fe9be860 do not generate any unnecessary webserver configuration-lines for deactivated users, fixes #599 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-16 14:01:37 +01:00
Michael Kaufmann (d00p)
98b82ed0c6 improve behavior of ssl-redirect, fixes #541 2011-01-08 11:58:14 +00:00
Michael Kaufmann (d00p)
b9d68a17fa fix deletion of htpasswd/diroption files if no more htpasswds/diroptions are in the database 2010-12-21 10:55:08 +00:00
Michael Kaufmann (d00p)
ced64138e8 fix order of variables in configuration-path, fixes #521 2010-12-17 22:28:28 +00:00
Michael Kaufmann (d00p)
4fdaed5cc4 fix 'new' fcgid path for froxlor's own vhost php-fcgi-starter 2010-12-14 21:19:52 +00:00
Michael Kaufmann (d00p)
7fb0e88313 - implement php-fpm for Froxlor-vhost, fixes #505 2010-12-06 07:38:55 +00:00
Michael Kaufmann (d00p)
01b313a3ce merged php-fpm branch 2010-12-02 12:15:58 +00:00
Michael Kaufmann (d00p)
cd79670438 fix for awstats aliases if the customerdocroot is equal to the domaindocroot 2010-11-29 07:44:24 +00:00
Michael Kaufmann (d00p)
08e17f7d16 - put customer standard-subdomains to the 20_* vhost configs (subdomains) so they are parsed before the main-domain, fixes #465 2010-11-08 07:41:51 +00:00
Michael Kaufmann (d00p)
2e59e2bfdf - correct variable name to avoid undefined variable error, fixes #454 2010-11-01 10:36:15 +00:00