maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,005 Commits 6 Branches 188 Tags
528082b49fc6a4d6fe69715c33d39c3066a94b5d
Commit Graph

387 Commits

Author SHA1 Message Date
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)
18933ad118 Merge remote-tracking branch 'origin/0.9.31' 2013-12-12 11:38:32 +01:00
Michael Kaufmann (d00p)
0e6da344ba don't use -b for 'du' command as FreeBSD does not know it, fixes #1320 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-12 09:09:57 +01:00
Michael Kaufmann (d00p)
7bf0299d33 Merge remote-tracking branch 'origin/0.9.31' 2013-12-10 07:23:42 +01:00
Michael Kaufmann (d00p)
a5b1065195 generate spf-entry also for 'mail'-record when no mxservers are specified, fixes #1314 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 13:57:03 +01:00
Michael Kaufmann (d00p)
7bf4cc73b6 Merge remote-tracking branch 'origin/0.9.31' 2013-12-09 09:54:44 +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)
bf4c16b063 first work on permission-improvements by adding webserver-user to ftp-group of customer and therefore make it possible to chown the user-docroot to 750 keeping 'others' out, refs #532 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-08 11:13:43 +01:00
Michael Kaufmann (d00p)
0f80e66a01 Merge remote-tracking branch 'origin/0.9.31' 2013-12-08 10:22:21 +01:00
Michael Kaufmann (d00p)
dde6581f9c create SuexecUserGroup-statement on apache/fpm if customer has perl enabled so perl-scripts run under the same username, fixes #1317 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-08 10:18:18 +01:00
Michael Kaufmann (d00p)
3064477066 remove more aps/autoresponder/backup stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-05 12:17:47 +01:00
Michael Kaufmann (d00p)
2800ca05a1 began to 'clean up' for future releases (APS, Autoresponder and Backup) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-04 18:32:46 +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
35c3f3d71e Merge pull request #163 from BNoiZe/master 
More PDO migration. Merge multiple location-blocks of the same directory in ngnix, fixes #1309
 2013-11-26 09:25:22 -08:00
Michael Kaufmann (d00p)
81c0771f3b corrected Database::needSqlData() and Database::getSqlData(), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-26 09:08:27 +01:00
BNoiZe
fc5c4658d1 Added mergeVhostBlocks() for nginx cron, refs #1309 2013-11-25 19:32:01 +01:00
Michael Kaufmann (d00p)
7297ce88b5 fixed missed statement-fetch in cron-task when adding a new ftp-user 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-25 09:21:51 +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)
ee19c268cc migrated ApsInstaller and ApsUpdater, fixed typo in traffic-cron (thx to Sephi), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 15:02:49 +01:00
Michael Kaufmann (d00p)
7a45a534fc added functions to get sql-data to Database-class, migrated backup-cron to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 10:01:34 +01:00
Michael Kaufmann (d00p)
60ba3f9127 migrated cron_tasks to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 09:29:14 +01:00
Michael Kaufmann (d00p)
345ba3a202 migrated autoresponder-cron to new PDO database class, beautify sql-query in paging-class, fix typos in traffic-cron (thx to Dessa), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 08:15:30 +01:00
BNoiZe
f5940db7b1 Fixed a another typo 2013-11-19 15:17:34 +01:00
Michael Kaufmann (d00p)
48de5d7c22 require_once is also a statement and not a function 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-18 13:06:43 +01:00
Michael Kaufmann (d00p)
ca38e20345 migrated traffic-cron and cron-usage-report to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-18 11:59:16 +01:00
Michael Kaufmann (d00p)
e2ca3873a8 migrated traffic-cron-functions to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-18 09:23:09 +01:00
Michael Kaufmann (d00p)
ed1c87c521 as fcgid does not add a handler in a separate config such as fpm does, in the ip/port vhost-config of course, this has to be SetHandler instead of AddHandler, thx to quizzi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 19:29:35 +01:00
Michael Kaufmann (d00p)
4aa23f1e12 migrated mailboxsize-cron to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 12:35:16 +01:00
Michael Kaufmann (d00p)
101d972a14 fix 'su' on admin-traffic overview, thx Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-11 09:59:03 +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)
74bb3ccb7e migrate ticket-system to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 11:06:03 +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)
e3750a2988 remove unused upgrade procedures, migrated a few minor functions and files to PDO database, fixed FROXLOR_INSTALL_DIR define for master-cronjob, fixes #1294 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 09:03:29 +01:00
Michael Kaufmann (d00p)
e549ab2cbb finally removed super-old syscp-update-procedures, we now require the last available syscp for upgrading; migrate some functions to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-03 10:54:43 +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)
cb556093c1 fix undefined language indeces (add english as fallback as intented in case a string is not defined in the used language) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-19 18:48:08 +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)
72fcad5007 remove unnecessary removal of fcgid-configs (done in ConfigIO) and remove old logs from customer if file-deletion is wanted 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-11 18:27:26 +02:00
Michael Kaufmann (d00p)
6a76e8a53f remove build-in logrotate feature and provide logrotate-script 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-09 16:23:59 +02:00
Michael Kaufmann (d00p)
cbe7792929 clean-up for fpm (remove unecessary stuff), thx to tomreyn & Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-06 18:59:10 +02:00
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