maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,881 Commits 6 Branches 188 Tags
9d314aaa3fac12db15b0c3d79a350c2b81209a26
Commit Graph

660 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
4663f8c6ec converted IpsAndPorts to API 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 07:48:03 +01:00
Michael Kaufmann (d00p)
dd371c72a2 start api implementation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 07:47:35 +01:00
Michael Kaufmann (d00p)
05f1bf0a1f meh, forgot to uncomment the settings storage for settings-import 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-12 07:46:38 +01:00
Michael Kaufmann (d00p)
ca4c93ac92 set default dns server in config-templates; separate CmdLineHandler from switch-server-ip script for further usage 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-11 13:57:07 +01:00
Michael Kaufmann (d00p)
4d3fa6eca5 get rid of the need for allow_url_fopen 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 10:50:14 +01:00
Michael Kaufmann (d00p)
ec21e28000 use md5() instead of base64_encode for dummy-fpm-socket name to avoid possible equal-sign in string which leads to an invalid socket, fixes #513 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-07 15:10:59 +01:00
Michael Kaufmann (d00p)
840b5ea229 add new feature: import/export of settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-28 14:33:00 +01:00
Michael Kaufmann (d00p)
f896fe11a0 do not split dkim-entry content in generateDkimEntries(); re-add braces to enclose TXT record content 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-27 10:09:43 +01:00
Michael Kaufmann (d00p)
2603a9c869 add new setting to specify values for the PATH env-variable for php-fpm 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-26 17:30:20 +01:00
Michael Kaufmann (d00p)
fcd0dddfd5 Update phpMailer to 5.2.26 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-26 17:18:12 +01:00
Michael Kaufmann (d00p)
3fb92259a8 readd starting and ending quotes which got removed with the braces in #503 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-26 17:17:22 +01:00
Michael Kaufmann (d00p)
f3733ca249 set apache-2.4 as default ON also in froxlor.sql; fix wrong DbManagerMySQL::disableUser, fixes #505 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-18 19:50:28 +01:00
lonesomewalker
52c7839b9b Update class.DnsEntry.php 
Klammerfehler bei Bind, PowerDNS braucht ja keinen Linesplit.
 2018-01-16 14:57:42 +01:00
Michael Kaufmann (d00p)
6e651200ca Make php.ini flag/value possibilities dynamic (settings) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-11 13:04:38 +01:00
Michael Kaufmann (d00p)
f2a79d4d96 add new security.limit_extensions setting to fpm-daemon settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 15:20:19 +01:00
Michael Kaufmann (d00p)
9312e4967e fix access to idle-timeout setting which moved from global settings to per-fpm-daemon setting, thx to gunnyst for pointing this out 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 08:45:20 +01:00
Michael Kaufmann (d00p)
9aaadb1f8b implement lets-encrypt api-v02 (testing only currently; not activated in froxlor, test with 'php froxlor_master_cronjob.php --letsencrypt_v2 --debug' but set api endpoint to staging); no chain is returned currently, seems to be a known bug 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 14:40:36 +01:00
Michael Kaufmann (d00p)
d8abe30c44 create dummy pool-config whenever a fpm-daemons configdir is empty so it still restarts 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 09:25:56 +01:00
Michael Kaufmann (d00p)
07caf55f79 fixes to multi-fpm in cron 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-08 09:16:00 +01:00
Michael Kaufmann (d00p)
73868b7947 soften the file cleaning to reduce risk 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-07 23:31:39 +01:00
Michael Kaufmann (d00p)
af55fe5b82 add possibility to add multiple php-fpm instances 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-07 14:55:25 +01:00
Michael Kaufmann (d00p)
66a4309fe5 add setting to disable LE self-check; set version to 0.9.38.8 for maintenance/bugfix release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-12-31 11:18:59 +01:00
Michael Kaufmann (d00p)
5540b02e35 do not remove Let's Encrypt token when self-check fails but rather give out the information as warning. The self-check fails for many users due to different local configurations and might not always be correct; fixes #480 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-11-27 07:54:41 +01:00
Michael Kaufmann (d00p)
1e03946df7 set sql_mode to disable STRICT_MODE usage for froxlor, thx to albech for the hint 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-11-08 07:49:40 +01:00
Michael Kaufmann (d00p)
15b62aae04 add inserttask for config regeneration and fix aliasdomain NULL value if empty, fixes #478 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-10-06 09:29:49 +02:00
Michael Kaufmann (d00p)
b263b211a5 generate multiline txt-record if content is too long, fixes #472 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-08-28 15:35:07 +02:00
Michael Kaufmann (d00p)
64ebb0ca38 also add http2 flag to domain-import 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-08-24 15:27:47 +02:00
Pascal Querner
82c719d786 dont send uri to challenge, if no valid token could be fetched 2017-07-07 22:50:39 +02:00
Michael Kaufmann (d00p)
9db7434876 add letsencrypt, HSTS settings, oscp-stapling and phpenabled-flag to Domain-import; fixes #416 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-04-18 16:55:55 +02:00
Max Khon
95b7b57fc6 Skip views when altering table charsets. 2017-04-15 16:12:29 +07:00
Daniel Reichelt
ec1bd6e19a add OCSP stapling support for apache2 and nginx 2017-04-11 17:09:34 +02:00
Michael Kaufmann (d00p)
c0fddbce81 use correct pagination in admin-log/customer-log, fixes #1726 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-03-08 14:04:40 +01:00
Michael Kaufmann (d00p)
338cf161d2 fix undefined index if let's encrypt is used for the froxlor-vhost 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-14 18:06:04 +01:00
Michael Kaufmann (d00p)
437446c49d update phpMailer to 5.2.21 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-29 10:54:25 +01:00
Michael Kaufmann (d00p)
4502f7ddf5 fix Settings::Flush(), thx to Ithariel 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-16 10:17:48 +01:00
Michael Kaufmann
602c38dbeb Merge branch 'master' into feature/letsencrypt-verbesserungen 2016-12-11 08:23:46 +01:00
Michael Kaufmann
3d4b56b233 Merge branch 'master' into master 2016-12-11 08:19:16 +01:00
Michael Kaufmann (d00p)
001786dd97 fix incorrect User-Agent header in let's encrypt class, fixes #1683 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-09 13:33:57 +01:00
micw
7b6bbcec48 Fixed default LE license URL 
(removed testing stuff)
 2016-11-27 12:45:06 +01:00
Michael Wyraz
18b45c749d Better handling for letsencrypt errors after failed registration or changed license 2016-11-25 09:54:47 +01:00
Dominic Schallert
e5053bad15 Introduced phpenabled_customer and phpenabled_vhost, updated cron scripts, updated dbversion 2016-11-13 15:15:43 +01:00
Michael Kaufmann (d00p)
7e4164da26 do not double validate openbasedir-values, as appendOpenbasedirPath() already takes care of that; also fix /dev/urandom as openbasedir-path-value to be treated as file correctly, fixes #1669 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-10 10:07:00 +01:00
Michael Kaufmann (d00p)
4a3e02c1f0 add HSTS for domains (admin-side) and froxlor-vhost; fixes #1660 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-07 11:01:45 +02:00
Michael Kaufmann (d00p)
9799e05ce4 idna convert the whole URI for uri's in docroot as redirect, fixes #1654 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-22 07:46:50 +02:00
Michael Kaufmann (d00p)
6a85c37b48 do not replace multiple quotes with just one, as it leads to possible syntax-errors in php.ini, thx to hp7007 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-19 12:17:56 +02:00
Michael Kaufmann (d00p)
b8c2047379 try to implement ssl-redirect for froxlor-vhost; combine various settings that are froxlor-vhost related into its own category, fixes #1480 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-11 17:48:08 +02:00
Jens A. Koch
c51840e760 bugfix for error, when trying to call function logAction() on undefined var $cronlog 2016-09-11 12:00:26 +02:00
Michael Kaufmann (d00p)
e4887362ec added let's encrypt for froxlor vhost - untested for now, testers are welcome 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-05 17:01:10 +02:00
Oliver Rahner
9260319ac1 Letsencrypt: only update registration when necessary 
if no Terms of Service are presented by the ACME server when registering, don't update registration
 2016-09-04 21:27:23 +02:00
Oliver Rahner
34767a14d5 Remove dependency on hard coded agreement URL for Let's Encrypt 
Change the process to first create a new registration, which delivers the current TOS url in the response's header, then modify the newly created registration to accept the agreement.
 2016-08-31 16:35:59 +02:00