maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,902 Commits 6 Branches 188 Tags
373cb912d85ca09eac8224760d94fe34af309ff9
Commit Graph

1134 Commits

Author SHA1 Message Date
Johannes Feichtner
373cb912d8 - Hide the option on whether to include default directives with webservers different than nginx 
- Typo fix
- Indentation fix
 2016-02-26 19:08:08 +01:00
Johannes Feichtner
48a1b9489a Copyright fixed 2016-02-23 21:04:43 +01:00
Johannes Feichtner
dc71a582fc Enable standard directives by default 2016-02-21 14:55:48 +01:00
Johannes Feichtner
abe253bc31 Feature: Vhost templates 
Reworked the initial implementation by hpmewes (https://github.com/Froxlor/Froxlor/pull/233) with
- bugfixes all over
- added support for apache and lighttpd also
- added an update sequence (instead of only modifying froxlor.sql)
- added english language variables
- added missing parts in admin_vhostsettings.php
- added parameter replacements as available since PR 244
 2016-02-21 14:53:24 +01:00
Johannes Feichtner
55df79a79c Fix for previous commit: Also delete occasionally existing entries for the newly defined standard IP entries before re-adding them. They could have been assigned separately 2016-02-21 14:00:53 +01:00
Johannes Feichtner
32c32a7e7a Enable multiple standard IPs 2016-02-21 14:00:26 +01:00
Michael Kaufmann
b8e7122452 Merge pull request #309 from Churro/froxlorMerge_a036bfb 
Fix fatal error in phpErrHandler with PHP7 and suit cronjob for various PHP versions
 2016-02-20 22:20:23 +01:00
Johannes Feichtner
46eeb65ff0 IPs and Ports: Only show attributes used by the current webserver 2016-02-20 21:13:47 +01:00
Johannes Feichtner
387be846f1 Fix fatal error in phpErrHandler with PHP7 and suit cronjob for various PHP versions 2016-02-20 20:21:09 +01:00
Michael Kaufmann
6e0f18b200 Merge pull request #301 from Churro/froxlorMerge 
Fix for case insensitivity bug in Apache 2.4.12 + PHP-FPM
 2016-02-20 17:17:41 +01:00
Stefan Weil
50e7311390 Fix some typos in code comments 
Most of them were found by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-20 17:10:24 +01:00
Johannes Feichtner
1c4b88d014 Fix for case insensitivity bug in Apache 2.4.12 + PHP-FPM 
With Apache 2.4.12, the FPM socket path is always considered as a
lowercase file path regardless of the used capitalization.
If Froxlor creates a socket file containing uppercase characters, Apache fails to find to the socket.
See https://bz.apache.org/bugzilla/show_bug.cgi?id=57968
 2016-02-20 16:58:59 +01:00
Michael Kaufmann
8a99bd1d51 Revert "Changes in the config templates" 2016-02-20 15:24:51 +01:00
Vengance
bc9bc84f23 Update gentoo.xml 2016-02-20 14:27:53 +01:00
Vengance
e5bb58cd91 Update wheezy.xml 2016-02-20 14:24:35 +01:00
Vengance
074b425ee0 Update precise.xml 2016-02-20 14:23:29 +01:00
Vengance
59e599a952 Update rhel_centos.xml 2016-02-20 14:21:26 +01:00
Vengance
3f523a8b58 Update trusty.xml 2016-02-20 14:20:03 +01:00
Vengance
2ce488c03c Update jessie.xml 2016-02-20 12:49:18 +01:00
Florian Aders
dabd4a4a4e Merge pull request #298 from nachtgeist/logging 
Logging
 2016-02-19 20:46:22 +01:00
Daniel Reichelt
3d2b672feb cron logging: really print messages of level >= LOG_WARNING 
also fix mixed indentation
 2016-02-19 20:32:02 +01:00
Florian Aders
e621e02f92 Allow selecting new keysize, fixes #1594 
Prepare database and cron for HSTS, refs #1593
Added option to re-use key and CSR for Let's Encrypt

Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-19 17:35:44 +01:00
Daniel Reichelt
b071b8c2d9 LE: remove challenge file on failure, take #2 ;) 2016-02-19 14:44:23 +01:00
Daniel Reichelt
185178a91e LE: whitespace fixes 
- fix mixed indentations
- remove trailing whitespace
 2016-02-19 14:44:22 +01:00
Florian Aders
9ca31c10ae Only store accountkeys in production 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-19 12:27:17 +01:00
Florian Aders
51b2dc7c23 Alias - configs for Let's Encrypt I forgot 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-18 21:54:59 +01:00
Florian Aders
9f54e60056 Answer all Let's Encrypt challenges via alias to a directory in Froxlor itself, enables us to answer challenges before the vhost is set, thx PrfDrDrStullenBr for the idea \(vhost - configs for most distributions untested\) 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-18 21:43:44 +01:00
Florian Aders
5151f50d49 Renamed "debugHandler" to "logger" to be more specific 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-18 20:47:47 +01:00
Florian Aders
9b08d67ea7 Remove challengefile if challenge fails, thx nachtgeist 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-18 20:40:41 +01:00
Daniel Reichelt
ac52802caa logging: replace hard-coded number by PHP loglevel constant 2016-02-18 09:18:42 +01:00
Michael Kaufmann (d00p)
8356860945 add syslog page for customer; pagination needs to be fixed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-17 08:43:00 +01:00
Michael Kaufmann (d00p)
7b29d43c66 Merge branch 'logging' of https://github.com/nachtgeist/Froxlor into nachtgeist-logging 2016-02-17 08:41:17 +01:00
Daniel Reichelt
a68effe4e7 logging: add loglevel to syslog output 2016-02-16 20:19:31 +01:00
Daniel Reichelt
2fb091939f remove unused setting system_send_cron_errors 2016-02-16 18:32:08 +01:00
Daniel Reichelt
71248f0adf cron logging: always print messages of level >= LOG_WARNING 2016-02-16 18:13:30 +01:00
Daniel Reichelt
ca80b6372b cron/logging: add choice to always log cronjobs 2016-02-16 17:33:42 +01:00
Florian Aders
ddaadf81d6 Temporarily deactivate ssl_redirect if a new Let's Encrypt certificate needs to be generated 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-16 14:31:07 +01:00
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