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

1097 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
f65af0067d add --debug parameter for froxlor_master_cronjob, thx to nachtgeist for the idea 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-16 10:07:02 +01:00
Michael Kaufmann (d00p)
29a2c78b3f correct typo in mkdir-statement 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-15 16:04:43 +01:00
Florian Aders
ea2fa3be15 Changed CSR - request generation to 4096 bit 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-14 17:31:28 +01:00
Michael Kaufmann
a76032f668 Merge pull request #284 from nachtgeist/functions 
add function getFormFieldDataText()
 2016-02-11 17:59:54 +01:00
Stefan Heid
3f606cd953 Bugfix: termination-date in domain-add dialog 2016-02-10 22:16:09 +01:00
Stefan Heid
ae581c2da7 Added termination-date to domains 2016-02-10 21:22:52 +01:00
Daniel Reichelt
f4ef5af63b add function getFormFieldDataText() 
Previously webserver configs would contain CRLFs from
system.default_vhostconf on admin_settings.php.

This patch adds a new function which automatically gets recognized by
getFormFieldData() and mangles textarea form elements through
str_replace("\r\n", "\n", ...).
 2016-02-09 14:45:08 +01:00
Daniel Reichelt
dd0689c13f language: add message/spelling 
- add missing message for let's encrypt integrity check
- small spellfixes
 2016-02-09 00:33:01 +01:00
Michael Kaufmann (d00p)
aac9ee3ba7 added auto-update from within the panel; re-organized menu-entries (meaningful) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-08 13:34:24 +01:00
Florian Aders
2472a52fed Make some Let's encrypt settings configurable 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 17:21:48 +01:00
Florian Aders
5691b3a8db Merge pull request #280 from EleRas/master 
Added basic let's encrypt - supprt, fixes #1470
 2016-02-03 11:53:05 +01:00
Florian Aders
1814407bfd Throw exception if no challenges are returned at all 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-02 11:17:04 +01:00
Florian Aders
efc5f37850 Well, we need a new key if we don't havre one, not if we already have one 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 20:58:49 +01:00
Florian Aders
ba1181e8ff Fixed inserting of certificate if it didn't exist yet and return textbased domainkey, not ressource 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 20:47:16 +01:00
Florian Aders
6023e65f7d Corrected version 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 12:55:08 +01:00
Florian Aders
eff978e5f6 Using different texts in admin and customer interface 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 11:36:20 +01:00
Michael Kaufmann (d00p)
5228e0f3d6 normalize path in appendOpenBasedirPath() after empty check as this results in an assert in makeCorrectDir() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-01 09:35:31 +01:00
Florian Aders
b62f4ef911 Copied ssl_redirect - integritsycheck for lets encrypt 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 11:49:33 +01:00
Florian Aders
c189ad759b Add Let's Encrypt to admin - GUI 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:34:26 +01:00
Florian Aders
f3a7a9c342 Fix formfield 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:22:32 +01:00
Florian Aders
44d08d6aa9 Add let's encrypt to customer domain - GUI 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 13:59:34 +01:00
Florian Aders
e0e1085c73 Fix your SQL, dude 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 13:14:51 +01:00
Florian Aders
67df9dbf6b Experiment with accountkeys per customer 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 13:06:42 +01:00
Florian Aders
2e7dd6f212 Changed comments to // to match the rest of Froxlor and made small improvements to the accountKey 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 10:56:08 +01:00
Florian Aders
ed2837f1db Added linebreak to logmessage of class 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-29 16:59:00 +01:00
Florian Aders
d45e9e63e6 Fixed a few obvious bugs 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-29 16:52:58 +01:00
Florian Aders
4f0c1894a3 Initial version of let's encrypt renewal cron 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-29 14:29:30 +01:00
Hanno Heinrichs
6eeaf66e2c prevent directory traversal in paths 2016-01-28 22:40:54 +01:00
Michael Kaufmann
7f82549e23 Merge pull request #277 from hph86/fix_path_blacklist 
fix blacklisting of characters in paths
 2016-01-28 22:00:56 +01:00
Michael Kaufmann (d00p)
2bb8f707eb fix second argument for rand() function 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-28 21:19:48 +01:00
Hanno Heinrichs
37176aa022 fix blacklisting of characters in paths 2016-01-28 21:14:28 +01:00
Michael Kaufmann (d00p)
da4ec3e1b5 avoid rand() if possible as it is not generating cryptographically secure values, thx to Hanno for putting some effort into this 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-28 08:27:15 +01:00
xWuZaa
4d2f72a814 remove duplicate fastcgi_index from fastcgi_params in nginx config templates 2016-01-21 11:51:33 +01:00
Janos Muzsi
fb6393ad8f OPCache info page 2016-01-20 22:12:43 +01:00
Michael Kaufmann (d00p)
a6182e2def set new version for bugfix release :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-18 10:53:54 +01:00
Michael Kaufmann
eef6102088 Merge pull request #270 from hypernics/apcuinfo 
add PHP APCu Info page
 2016-01-18 10:21:05 +01:00
Michael Kaufmann (d00p)
9fe55cb729 set version to 0.9.34.1 for upcoming maintenaince release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-18 08:07:16 +01:00
Janos Muzsi
13870f3ae8 APCu Info page 2016-01-17 01:17:43 +01:00
Michael Kaufmann (d00p)
4e402b6378 unset js and css variables of theme after using footer-template so they can be used there instead of the header-template only, fixes #1580 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-11 07:14:57 +01:00
Michael Kaufmann (d00p)
eb6e66cbf2 do not double mailbox-paths in postfix config, fixes #1575 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-12-09 08:49:15 +01:00
knox
73a7e438ec added more php_value and php_flag for suhosin 
see https://suhosin.org/stories/howtos.html and https://suhosin.org/stories/configuration.html
 2015-11-29 16:08:22 +01:00
knox
7357029a28 added php_flag 'suhosin.session.encrypt' and 'mbstring.func_overload' 
these are required for custom php configuration for roundcube webmail
 2015-11-22 13:41:06 +01:00
Michael Kaufmann (d00p)
accfd6fa14 allow /dev/urandom to be used in open_basedir path, as some applications may require that (*cough* owncloud), thx to J-BBB 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-20 14:20:15 +01:00
Stefan Weil
fe5ab0d8da Fix typos found by codespell 
Fix also a grammar issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-11-13 07:56:12 +01:00
Michael Kaufmann (d00p)
0651dc28c8 fix filename in ubuntu trusty 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-12 08:18:46 +01:00
Michael Kaufmann (d00p)
eda055acca Allow always_populate_raw_post_data to be set in php.ini for php-fpm, fixes #1562 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-04 11:35:05 +01:00
Robert Förster (Dessa)
c7d8cb6d33 switch postfix default to postfix 3 on gentoo since this is what is stable for a while already (2.x got dropped back to ~arch and will be removed from the template once removed from the tree) 2015-10-20 02:59:44 +02:00
Rene Pasing
05f3e8f433 Fix problems in Dovecot quota configuration: 
1) Since Dovecot 2.x, quota rules are by default in bytes,
  and not in kilobytes (hence multiplicating with 1024 is
  not going to be megabytes). Fixed this by adding 'M' suffix.

2) Since Dovecot 2.x, the quota rule is always named `quota_rule`
  or (for userdb prefetch) `userdb_quota_rule` (there were some
  incorrect namings in the distribution configs).

Ref: http://wiki2.dovecot.org/Quota/Configuration#MySQL
 2015-10-20 02:26:28 +02:00
Michael Kaufmann (d00p)
b6949e12b1 correct gentoo.xml config-templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-10-19 09:04:14 +02:00
Robert Förster (Dessa)
9d45f4d534 Revert "ease file-permissions, they sometimes cause issues" 
This reverts commit 5ead5e9c90.

part of this commit is reverted as most files shouldn't be world readable
 2015-10-08 00:32:13 +02:00