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

2629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Piotr Rzeczkowski
c52df5b286 Allow max_input_vars in PHP-FPM configuration 2015-08-24 12:18:56 +02:00
Michael Kaufmann (d00p)
30a25c0e8c comment out unexisting group 'Debian-exim' when exim is not installed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-20 20:50:35 +02:00
Michael Kaufmann
c9e4819f3f Merge pull request #247 from Tak0r/master 
Fixed unknown variables in composeSslSettings
 2015-08-16 20:08:14 +02:00
Frank Gehann
7cf321b24a Fixed composeSslSettings which used variables not available in the function scope. 2015-08-16 15:45:48 +02:00
Michael Kaufmann (d00p)
3b96efc04d forgot to use the new distro-editor variable 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-13 15:46:21 +02:00
Michael Kaufmann (d00p)
4da3a87772 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:42:57 +02:00
Michael Kaufmann (d00p)
967bd45a63 fix subdir-value if homeDir == dirToCreate in mkDirWithCorrectOwnership(), fixes pr #246 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-03 17:46:29 +02:00
Michael Kaufmann (d00p)
7b5069f1b9 add umask form-field, fixes #1486 (master) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-31 13:21:23 +02:00
Michael Kaufmann (d00p)
4429c5e8b2 allow customization of umask in php-fcgi-starter scripts, refs #1486 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-31 13:20:31 +02:00
Michael Kaufmann
918e9ed408 Merge pull request #244 from greybyte/vhost_config_variables 
Variable substitution in vhost specialconfig
 2015-07-31 11:45:30 +02:00
Michael Kaufmann (d00p)
d86fb7ed23 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:44:33 +02:00
Michael Kaufmann (d00p)
089fb25da7 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:18:57 +02:00
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)
8d26f583e9 fix wrong tpl-variable-name 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-30 11:35:24 +02:00
Michael Kaufmann (d00p)
0455cb96ca add update compatibility for bugfix-release 0.9.33.2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 18:09:42 +02:00
Michael Kaufmann (d00p)
744d85ec4c 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:27 +02:00
Michael Kaufmann (d00p)
5096e2d68d add tentative jessie config xml file, testers are welcome 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 14:56:06 +02:00
Michael Kaufmann (d00p)
4ec376b296 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:19:32 +02:00
Michael Kaufmann (d00p)
8558533a91 replace passwords even before logging, not just for display 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 13:11:38 +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
Michael Kaufmann (d00p)
8332b77fcc 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:20:11 +02:00
Michael Kaufmann (d00p)
5d423c9e63 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:10 +02:00
Michael Kaufmann (d00p)
895be02237 remove unused (old) php-configfile-files 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-28 08:22:00 +02:00
Michael Kaufmann (d00p)
c3da264cfe 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:04:18 +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
9dbc04678c correct path for nginx 2015-07-06 17:16:49 +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
c2d75c7030 add description and normalize {IS_SSL} value 2015-07-06 15:09:13 +02:00
Chris Vigelius
de84419035 add nginx and lighttpd support, refactor into common base class 2015-07-06 14:15:01 +02:00
Chris Vigelius
d9e0854bb7 add docroot 2015-07-06 13:45:10 +02:00
Chris Vigelius
558b779944 allow variables in special config 2015-07-06 13:28:09 +02:00
Michael Kaufmann
628b45efeb Merge pull request #243 from greybyte/defuse_dangerous_delete 
fix potentially dangerous programming
 2015-06-25 14:21:50 +02:00
Chris Vigelius
92cf4c16e3 missing semicolon 2015-06-25 14:08:19 +02:00
Chris Vigelius
3cad16d2b7 fix dangerous code 2015-06-25 13:49:55 +02:00
Michael Kaufmann
e7503c3c7a Merge pull request #242 from andre-luiz-dos-santos/patch-1 
Update english.lng.php
 2015-06-23 21:33:16 +02:00
André Luiz dos Santos
db8e643c62 Update english.lng.php 2015-06-23 16:22:34 -03:00
Michael Kaufmann (d00p)
94f3b99ad0 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:00:45 +02:00
Michael Kaufmann (d00p)
d0c4d5616a adjust fastcgi conf for php-fpm when using apache-2.4 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-06-11 20:59:41 +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