maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,751 Commits 6 Branches 188 Tags
51d554ab1483e504d66db8b003adc429a271143d
Commit Graph

99 Commits

Author SHA1 Message Date
Chris Vigelius
19d94471d9 Merge branch 'master' into vhost_config_variables, and replace IS_SSL with SCHEME 
Conflicts (resolved):
	lng/english.lng.php
	lng/german.lng.php
 2015-07-30 11:35:26 +02:00
Michael Kaufmann (d00p)
26a41a0672 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:41:31 +02:00
Michael Kaufmann (d00p)
222841f09b 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:11:55 +02:00
Chris Vigelius
89c4b969d1 make sure we fill all context parameters in any case 2015-07-06 21:21:07 +02:00
Chris Vigelius
ed9e524e03 use absolute path and require_once, instead of relative include 2015-07-06 17:09:49 +02:00
Chris Vigelius
de84419035 add nginx and lighttpd support, refactor into common base class 2015-07-06 14:15:01 +02: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)
559fb4d4a4 done a few fixes for newer php-versions 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-09-22 10:17:42 +02:00
Roman Schmerold (BNoiZe)
121669ee69 migrating more files to new Settings-class makes me dance, refs #1325 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-15 15:51:25 +01:00
Michael Kaufmann (d00p)
558108008a more implementing of new Settings class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 12:40:24 +01:00
Michael Kaufmann (d00p)
dc666e96b3 outsource monster-query to new WebserverBase class and adjust query which most likely fixes #1295 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 09:23:21 +01:00
Michael Kaufmann (d00p)
4426ab52d3 migrate ALL the crons to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-28 12:35:20 +01:00
Michael Kaufmann (d00p)
7a3d696c6a migrated DomainSSL-class to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-25 09:18:11 +01:00
Michael Kaufmann (d00p)
fa5f1900f0 add trace to database error-log-message (it just helps a lot finding the error); fixed queries in fpm und fcgid class; minor cosmetic changes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-08 08:54:44 +01:00
Michael Kaufmann (d00p)
2e42ef2043 fix creation of vhosts-config if email_only==1 (means, don't create a config) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 09:41:01 +01:00
Michael Kaufmann (d00p)
849da2a423 migrate phpinterface-classes to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 09:11:26 +01:00
Michael Kaufmann (d00p)
9d5851e9be deny possible direct call of cronjobs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-27 06:18:09 +01:00
Michael Kaufmann (d00p)
6ac4b87a84 make ssl-cipher-list an option, fixes #1274 ; improve ssl-related language-strings; setting version to 0.9.30 for release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-24 19:45:13 +02:00
Michael Kaufmann (d00p)
ff19d7209d fix lighttpd cronjob for multi-stack; add ssl-cipher for nginx; set version to 0.9.30-dev1; fixes #583 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 16:08:14 +02:00
Michael Kaufmann (d00p)
f9459e92e7 fix redirect to non-standard-ssl port and also implement it for lighttpd 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-30 08:20:03 +02:00
Michael Kaufmann (d00p)
5b419cb7df add missing copyright notes to cron_mailboxsize; implement untested version of multi-stack for lighttpd-webserver 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-27 10:19:58 +02:00
Michael Kaufmann (d00p)
0475751cee fix minor issues; re-added cronjob for lighttpd-webserver (i swear i don't know what happened :P) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-19 22:13:12 +02:00
Michael Kaufmann (d00p)
9e405dafce merge tilman19-master branch (multistack support) - note: this is a very early stage, don't expect everything to work 100%, use at your own risk. Testers are very very welcome (only apache2 and nginx (even more testing) so far) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-19 19:36:06 +02:00
Michael Kaufmann (d00p)
fb9ed8b7da implement per-domain-ssl-certificates in the cronjobs, refs #365 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-15 11:55:26 +02:00
Michael Kaufmann (d00p)
e0db240a3f tiny fixes in nginx-cronjob; clean up unused code from lighttpd cronjob 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-03 09:50:07 +02:00
Michael Kaufmann (d00p)
9691a39102 fix setting of default IP/Port (which still used panel_domain's ipandport-field), don't show ssl-enabled IP/Ports for default-ip (wrong default parameter of function getIpPortCombinations()), smaller fixes in bind- and lighttpdcronjob 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-02 10:38:44 +02:00
Michael Kaufmann (d00p)
fe638b5f52 fix missing bracket in lighttpd cronjob; update the ssl-listening on nginx, thx to byteworkshosting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-27 10:28:40 +02:00
Axel Guckelsberger
ed151d5fd8 Update cron_tasks.inc.http.20.lighttpd.php 2013-04-27 09:16:53 +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)
1a9c5f162f respect ip/port-default-vhost-config-for-every-domain and system-defaultvhost-conf setting in nginx and lighttpd, fixes #916 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-13 08:18:15 +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)
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)
f5bc81faca check if path could be opened before iterating through it, fixes #1104 2012-06-28 08:53:23 +02: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)
cbe8653f5d Fixed alias.url for awstats in lighttpd, fixes #982 @5m 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-12-17 11:37:09 +01:00
Florian Aders (EleRas)
f04bf559a0 Revert "Added missing concatenation, fixes #982" 
This reverts commit 3fbe96dc1b.

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-11-25 11:30:12 +01:00
Andreas Burchert (scarya)
3fbe96dc1b Added missing concatenation, fixes #982 
Thanks to Dessa.

Signed-off-by: Andreas Burchert (scarya) <scarya@froxlor.org>
 2011-11-25 11:16:44 +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
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)
c28f70d885 fixed endless redirection with lighty when accessing webalizer, thx to vmp32k 2011-02-08 07:58:14 +01:00
Michael Kaufmann (d00p)
cc4637095d respect ssl_redirect setting for domains, fixes #542 2011-01-09 16:25:32 +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