maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,617 Commits 6 Branches 188 Tags
ab9b92112d37eedee85d5b04bb92c4d83aeb424e
Commit Graph

2617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
ab9b92112d instead of env-variable, show ditro editor which is defined in the xml 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-13 15:37:34 +02:00
Michael Kaufmann (d00p)
161e11a8dd fix subdir-value if homeDir == dirToCreate in mkDirWithCorrectOwnership(), fixes pr #246 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-03 17:50:16 +02:00
Michael Kaufmann (d00p)
e1b80b513d add umask form-field, fixes #1486 (0_9_34) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-31 13:22:23 +02:00
Michael Kaufmann (d00p)
6abe0bdaec allow customization of umask in php-fcgi-starter scripts, refs #1486 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-31 13:21:50 +02:00
Michael Kaufmann
5136824844 Merge pull request #244 from greybyte/vhost_config_variables 
Variable substitution in vhost specialconfig
 2015-07-31 12:02:40 +02:00
Michael Kaufmann (d00p)
8e8c97f7f9 avoid empty value for makeCorrectDir as the assert-check runs before evaluating to / in certain places 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-31 10:45:06 +02:00
Michael Kaufmann (d00p)
819db2583b add mpm-itk to the list of dependents of libnss-mysql; fix proftpd-sql config for jessie; update powerdns-config for jessie 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-31 09:19:47 +02:00
Michael Kaufmann (d00p)
3d01947f3d fix wrong tpl-variable-name 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-30 11:36:48 +02:00
Michael Kaufmann (d00p)
12723d4941 add update compatibility for bugfix-release 0.9.33.2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 18:11:14 +02:00
Michael Kaufmann (d00p)
532c5d1b9f revert the new formfield-layout for customer-mysql 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 16:03:55 +02:00
Michael Kaufmann (d00p)
565bb55b13 display description of integrity-check rather then just the function-name, makes things clearer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 15:58:53 +02:00
Michael Kaufmann (d00p)
5e60b96cd6 add tentative jessie config xml file, testers are welcome 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 14:57:56 +02:00
Michael Kaufmann (d00p)
8b6f708b7c remove unused (old) php-configfile-files 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 14:57:12 +02:00
Michael Kaufmann (d00p)
b0325983a1 log db errors to syslog and remove tmp-error-logs for reporting in cronrun 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 13:20:10 +02:00
Michael Kaufmann (d00p)
7cd6651895 replace passwords even before logging, not just for display 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 13:20:05 +02:00
Michael Kaufmann (d00p)
de4a953bb7 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:44:10 +02:00
Michael Kaufmann (d00p)
a1d38dc05f 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:13:32 +02:00
Michael Kaufmann (d00p)
fce9de7372 remove superfluous call to 'getDomainRedirectCode' as its been called before; allow changing of redirect-code when domain has 'ssl-redirect' = 1 2015-07-28 13:21:02 +02:00
Michael Kaufmann (d00p)
f4f1315715 fix undefined-indeces when search-result contained only subdomains in customer-domains 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-28 08:23:54 +02:00
Michael Kaufmann (d00p)
95475f7b52 change default ssl-cipher-list; minor changes in config-xmls, fixes #1541 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-08 16:08:31 +02:00
Michael Kaufmann (d00p)
a1337df44f do not show error-trace / sensitive data when db-server is down or login credentials are wrong 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-06-11 21:02:39 +02:00
Michael Kaufmann (d00p)
ee73eaee5c adjust fastcgi conf for php-fpm when using apache-2.4 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-06-11 21:01:41 +02:00
Roman Schmerold (BNoiZe)
38f36841e3 Merge branch '0_9_34' of github.com:Froxlor/Froxlor into 0_9_34 2015-06-10 16:26:49 +02:00
Roman Schmerold (BNoiZe)
340f3bcf8c Add missing LSB tags, thanks to Wuzaa, fixes #1492 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-06-10 15:41:51 +02:00
Michael Kaufmann (d00p)
cd1e03c033 fix openbasedir-path when using mod_php, fixes #1507 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-06-10 15:31:15 +02:00
Roman Schmerold (BNoiZe)
ba002a1683 Merge commit '97816748498982799832238d1a2ba441ae16b91b' into 0_9_34 
* commit '97816748498982799832238d1a2ba441ae16b91b':
  the awstats files live in the non static outputdir.

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-06-10 15:07:42 +02:00
Roman Schmerold (BNoiZe)
457e378d1e Reverting HTMLform2 changes 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-06-10 14:59:38 +02:00
Michael Kaufmann
9781674849 Merge pull request #241 from m4rcu5/master 
Correcting a minor type in Feature #545
 2015-06-10 14:59:26 +02:00
Marcus van Dam
d9660e66a8 the awstats files live in the non static outputdir. 2015-06-10 14:43:50 +02:00
Michael Kaufmann
25f4f3900e Merge pull request #240 from m4rcu5/master 
access to stats from previous months with awstats, fixes #545
 2015-06-01 19:32:14 +02:00
Marcus van Dam
83e904c9f7 Feature #545: Prevent ln from linking withing the current symlink. 2015-06-01 16:24:45 +02:00
Marcus van Dam
9bbdb1b3b9 Feature #545: Include the awstatsGenerateIndex in cronjob. 
Seperate the awstats updates output directory from the awstats static
output directory.
Switch to zero padded months.
Symlink current month to 'current' directory (force needed to update
the link if it already exists)
 2015-06-01 14:55:43 +02:00
Marcus van Dam
f6cdc0575b Feature #545: function to deploy the index and nav templates 
Should deploy the html files with its template variables replaced
into the awstats root.
 2015-06-01 14:45:20 +02:00
Marcus van Dam
2017bc9cf6 Feature #545: New index.html and nav.html templates 
These templates should later provide the navigation and index for the
per month based awstats.
 2015-06-01 14:06:05 +02:00
Marcus van Dam
7e8e28fc90 Move to a generic awstats template directory 
We need this generic directory for future changes in Feature #545.
Some line-ending cleanup included.
 2015-06-01 13:09:43 +02:00
Michael Kaufmann
30c883c85d Merge pull request #239 from RipClaw2971/apache24_fix 
Set require all directive when using mod_proxy_fcgi, fixes #1533
 2015-05-12 08:24:01 +02:00
Andreas Grundler
16568c11f1 Fix für Apache 2.4 + mod_proxy_fcgi 2015-05-11 22:23:49 +02:00
Michael Kaufmann
f90982347a Merge pull request #238 from xWuZaa/master 
Add custom port to userdata.inc.php
 2015-05-07 20:17:11 +02:00
xWuZaa
bd5647351e Add custom port to userdata.inc.php 2015-05-07 19:58:48 +02:00
Michael Kaufmann (d00p)
ec77e47cd6 Merge branch 'master' of github.com:Froxlor/Froxlor 2015-05-06 15:37:46 +02:00
Michael Kaufmann (d00p)
565866c529 adjust default memory_limit to php's default (128M) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-05-06 15:37:38 +02:00
Michael Kaufmann
e4a262eb7b Merge pull request #235 from rzeka/master 
Better customers sorting based on name and company
 2015-04-28 14:25:40 +02:00
rzeka
a3f2fa1b16 Better customers sorting based on name and company 2015-04-28 14:14:12 +02:00
Michael Kaufmann (d00p)
e0ef3e9984 fix mpm-itk stuff, thx to Ithariel; minor fixes in updater 2015-04-22 15:58:04 +02:00
Michael Kaufmann (d00p)
bf30c1a3d7 fix escaping of shell commands in new xml-config-template-files 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-11 16:51:56 +01:00
Michael Kaufmann (d00p)
c2c573902f separate dovecot for postfix and exim4 as exim4 needs 'special treatment'... 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-11 16:42:22 +01:00
Michael Kaufmann (d00p)
d874ebf1b0 use correct username of bind-daemon in debian wheezy config templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-11 14:30:22 +01:00
Michael Kaufmann (d00p)
8ef6032570 also re-generate bind configs (if enabled) when using --force with the cronjob 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-11 11:21:17 +01:00
Michael Kaufmann (d00p)
b32a6951da add Debian-exim group to dovecots Exim4-unix_listener, fixes #1513 2015-03-11 09:44:43 +01:00
Robert Förster (Dessa)
b7bc347323 fix language string 2015-03-10 20:35:33 +01:00