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

345 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
ecdb9ddbdc fix missing file-extension for AddHandler directive 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 10:16:13 +02:00
Michael Kaufmann (d00p)
c109f9098c remove pretty old backwards-compatibility symlinks of cron-files, noone should need them anymore 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 09:40:01 +02:00
Tilman Klaeger
0ca34daf76 Changing SetHandler to AddHandler again, works for me on my system. 2013-09-30 18:36:45 +02:00
Michael Kaufmann (d00p)
5be9861bad respect default_vhostconf_domain setting of all ip/port combinations 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-30 09:59:47 +02:00
Michael Kaufmann (d00p)
de16c9c4a0 don't create a full vhost for every ip/port, just put all the ip's in the <virtualhost>-tag 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-30 08:50:18 +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
Tilman Klaeger
573ada496a Fix for SSL redirect if ssl port != 443 
Before it used to forward to https://site:80 as it only checked for
domain[port] to be !=443, wich the redirecting vhost usualy is.
Now we check for destination port !=443.
Customer still has to be carefull when setting ports and IPs,
different ports on different IPs on same domain will always cause
trouble.

tilman19, tilman@3c7.de
 2013-09-30 01:26:08 +02:00
Michael Kaufmann (d00p)
7b918ec982 fix php-fpm on apache2 (update 'AddHandler with SetHandler, etc.), thx to snoopotic from the forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 20:37:39 +02:00
Michael Kaufmann (d00p)
94478d7ebc set correct guid when using fcgid and own-vhost for froxlor, thx to snoopotic from the forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 14:49:35 +02:00
Michael Kaufmann (d00p)
5ff3b04679 add SSLVerifyDepth also to the ip/port section 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-28 18:48:56 +02:00
Tilman Klaeger
c90eecba49 Minor additions to ssl per vhost settings: 
add ssl CA cert and chainfail to ssl vhost

tilman19, tilman@3c7.de
 2013-09-28 18:37:10 +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)
a3eeb21ae2 create correct SetHandler/FCGID config for froxlor's own vhost when vhostcontainer=1 and fcgid is enabled, thx to snoopotic from our forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-26 21:19:22 +02:00
Michael Kaufmann (d00p)
7cdfdda45c allow non-standard ssl-port for ssl-redirects (actually, put the port in there if non-standard is defined in ip/port combination), fixes #201 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-25 17:08:06 +02:00
Michael Kaufmann (d00p)
2a396ffb31 enhance master-cronjob parameter usage, you can now use --force-[cronname] to force any cronjob you like; now show mailbox sizes of emial accounts in the customers email overview, fixes #1007 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 16:58:27 +02:00
Michael Kaufmann (d00p)
f9f4773616 properly escape custom-error strings in apache2, fixes #1009 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 14:48:02 +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)
075e18def3 add note to customer domain-add/edit to clearify trailing-slash in URLs, corrected apache-rewrite for url-redirects, fixes #1261 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-07 11:32:08 +02:00
Michael Kaufmann (d00p)
cce4bd36ef wrong solution by SCD in #1261. This works as intended for me. 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-07 09:53:02 +02:00
Michael Kaufmann (d00p)
d61fe9e0c0 fix mod-rewrite for redirect to URIs, fixes #1261 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-06 14:00:15 +02:00
Michael Kaufmann (d00p)
6bfec9dc40 adding cipher-order to ssl-vhosts when using apache, thx to Marcel 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-19 11:20:39 +02:00
Michael Kaufmann (d00p)
6d06187df4 make e-mail address and compare-address lowercase, thx to DasTho from the forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-10 13:45:52 +02:00
Michael Kaufmann (d00p)
b7a4b69ee0 enhance php-fpm configuration options to use custom-ini-settings, refs #587 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-05 10:54:52 +02:00
Florian Lahr
a3ee1430ac Changes related to missing awstats icon location block in Nginx vhosts and Awstats configuration on Gentoo 
fixes #1228
fixed #1229
 2013-06-06 14:49:21 +02:00
Michael Kaufmann (d00p)
cf515ef8be use correct user/group setting for froxlor-fpm-vhost-config, fixes #1225 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-30 17:03:52 +02:00
Michael Kaufmann (d00p)
ff218168b9 more work on wheezy configs, added fcgid- and phpfpm-commands for setup; fixed non-working call to mysqldump in backup-cronjob 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-24 10:31:26 +02:00
Michael Kaufmann (d00p)
a1ff131fd6 use correct sender for usage-email, fixes #1212 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-17 09:28:36 +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)
2d54fb8187 don't use name 'usage' as it is a mysql-reserved word, thx to anbrosius for noticing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-06 17:46:16 +02:00
Michael Kaufmann (d00p)
d234abc19c better calculation of mysql-diskspace usage (like we do in the customer_mysql-overview), thx to KulMaks from the forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-06 11:59:10 +02:00
Michael Kaufmann (d00p)
55312a6df4 fix zonefile nameserver-entries when there are no nameservers given (use A/AAAA entries then) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-03 10:45:27 +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)
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
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)
257444558f fix rewrite-rule for redirects to URIs, fixes #1043 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-30 11:52:57 +02:00
Tilman Klaeger (tilman19)
0d3daace49 Add multistack configuration to Bind nameserver, fixes #585 2013-04-29 08:56:43 +02:00
Tilman Klaeger (tilman19)
af899c290f Add multistack configuration for nginx, fixes #584 2013-04-29 08:54:36 +02:00
Tilman Klaeger (tilman19)
a5048007de Create multistack configuration for Apache, fixes #582 2013-04-29 08:31:32 +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
febb8e37bc Update cron_tasks.inc.http.10.apache.php 2013-04-27 09:50:05 +03:00
Axel Guckelsberger
84d87adb9b Update cron_tasks.inc.http.30.nginx.php 2013-04-27 09:32:28 +03: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)
7a69cf73ba don't require a port-declaration in validating an URL when an IP address is given, fixes #1179 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-23 15:58:03 +02:00
Michael Kaufmann (d00p)
f2d10046b6 fix axfr-server-stuff (and close allow-transfer block), let updater and settings validate ipv4/ipv6 via function validate_ip 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-22 16:39:35 +02:00
Michael Kaufmann (d00p)
7adc2dd35c Update version_compare function; fix syntax-error in bind-config generation, thx to monumentum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-19 13:55:38 +02:00
Michael Kaufmann (d00p)
1ae7876e44 provide a correct user-salutation for all templates, thanks to Shortie 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-19 11:56:53 +02:00
Michael Kaufmann (d00p)
e97a7c611c add possibility to specify AXFR servers for bind zone-configuration, fixes #100 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-18 16:38:22 +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