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

1535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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)
42b201c54d prepare ssl-per-domain (customer setable), no cronjob-functionality yet (intended), refs #365 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-14 17:26:30 +02:00
Michael Kaufmann (d00p)
14e9b81995 preparation for wheezy config-templates (just copied for now); fixed missing courier-templates for precise 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-13 18:40:30 +02:00
Michael Kaufmann (d00p)
b5fc0ad532 fix error when security question is being asked when adding a domain as admin, thx to Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-08 16:34:04 +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
Robert Förster (Dessa)
db8f2a767d fix rpmlints incorrect-fsf-address 2013-05-04 10:32:16 +02:00
Robert Förster (Dessa)
90ea8cfc1b phase out hardy and dovecot1 configs for gentoo 2013-05-04 10:03:44 +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
Michael Kaufmann (d00p)
8aa74a9b90 fixes for dualstack by tilman19 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-29 10:02:44 +02:00
Tilman Klaeger (tilman19)
80f19c7dfb Add multistack options to userpanel, fixes #586 2013-04-29 09:06:40 +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
Tilman Klaeger (tilman19)
0ba04fbe42 Change database structure to support multistack, #581 2013-04-29 08:22:25 +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
Michael Kaufmann
e8096b1cb6 Merge pull request #93 from Guite/master 
Minor coding-style related changes
 2013-04-27 01:05:30 -07:00
Axel Guckelsberger
54fc4758d9 Update admin_message.php 2013-04-27 10:56:34 +03:00
Axel Guckelsberger
2d6d3349cf Update admin_logger.php 2013-04-27 10:48:42 +03:00
Axel Guckelsberger
ee45bd9f14 Update customer_mysql.php 2013-04-27 10:46:49 +03:00
Axel Guckelsberger
9665fe8c1f Update customer_index.php 2013-04-27 10:26:48 +03:00
Axel Guckelsberger
10d1b8063d Update admin_cronjobs.php 2013-04-27 10:22:23 +03:00
Axel Guckelsberger
1f0a2ca358 Update admin_updates.php 2013-04-27 10:18:35 +03:00
Axel Guckelsberger
a7687659cc Update customer_ftp.php 2013-04-27 10:15:36 +03:00
Axel Guckelsberger
016ae12884 Update customer_traffic.php 2013-04-27 10:10:48 +03:00
Axel Guckelsberger
f6a729df87 Update index.php 2013-04-27 10:06:19 +03:00
Axel Guckelsberger
413461364d Update customer_autoresponder.php 2013-04-27 09:59:22 +03:00
Axel Guckelsberger
c14b18ab39 Update customer_aps.php 2013-04-27 09:54:23 +03: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)
fb4c809ba4 forgot the extra panel on admin-index 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-25 20:00:49 +02:00
Michael Kaufmann (d00p)
fe1ad85d29 auto-height parent-container if info-panels on customer-index are too big, fixes #1198 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-25 19:58:01 +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)
ce9c8a766f set year to 2013 thanks to LeonP 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-20 17:20:28 +02:00
Michael Kaufmann (d00p)
82973267f3 respect deactivation of 'nameserver' yes|no in domain-edit (thx to monumentum); beautify preconfig 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-19 15:32:10 +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
Michael Kaufmann (d00p)
d51977af65 move the merging-code for location-/ sections to the end of all possible location-blocks; fixes #1193 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-16 07:57:58 +02:00
Michael Kaufmann (d00p)
e29068f0d8 ups, wrong brakets :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-15 13:19:04 +02:00
Michael Kaufmann (d00p)
8f127e4769 revert last nginx-fix (nonsense) and now respect 'vhost-statement=no' setting for froxlor-vhost (no server-block), fixes #1076 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-15 13:13:36 +02:00
Michael Kaufmann (d00p)
802d59670c add possibility to allow/disallow changing of themes; fixes #1175 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-15 09:54:35 +02:00