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

2849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Reichelt
6ac274a706 cron/apache: use correct constant for loglevel 2016-02-19 20:32:03 +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
Michael Kaufmann (d00p)
e3a594f3e7 do not post configuration form when nothing is selected, fixes #1595 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-19 16:09:50 +01:00
Florian Aders
5982f86db4 Merge pull request #297 from nachtgeist/le 
Le
 2016-02-19 14:53:37 +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
8784efd063 Adding .well-known to .gitignore 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-19 09:41:47 +01:00
Florian Aders
c828e3b0d9 Fixed comment :P 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-18 22:40:31 +01:00
Florian Aders
45c081990a We don't need to check for the documentroot anymore 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-18 22:26:44 +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
Florian Aders
b002d687c0 Fixed typo 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-18 14:56:18 +01:00
Michael Kaufmann
1d2b697742 Merge pull request #296 from nachtgeist/logging 
logging: replace hard-coded number by PHP loglevel constant
 2016-02-18 10:08:55 +01:00
Daniel Reichelt
ac52802caa logging: replace hard-coded number by PHP loglevel constant 2016-02-18 09:18:42 +01:00
Florian Aders
ef3ab72082 Explain more stuff in the logmessages 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-17 15:50:09 +01:00
Florian Aders
aede590af0 Merge pull request #294 from megaspatz/bugfix-letsencrypt-logging 
Edited warning for letsencrypt to show domain instead of ssl_redirect
 2016-02-17 15:23:41 +01:00
Stefan Heid
c229c11bdf Edited warning for letsencrypt to show domain instead of ssl_redirect 2016-02-17 12:07:19 +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)
dd5fa3bfff Merge branch 'nachtgeist-logging' 2016-02-17 08:41:44 +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
Michael Kaufmann
8d56478187 Merge pull request #293 from stweil/update 
Fix update process from Froxlor version 0.9.28-svn1
 2016-02-16 21:55:18 +01:00
Stefan Weil
60740973d7 Fix update process from Froxlor version 0.9.28-svn1 
A typo in the name of a local variable prevented database updates.
Fix also an unrelated whitespace issue in an empty code line.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-16 21:17:54 +01:00
Florian Aders
453f11dcc4 Merge pull request #292 from stweil/translation 
Fix more typos and other issues in German translation
 2016-02-16 20:59:01 +01:00
Stefan Weil
a090e44403 Fix more typos and other issues in German translation 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-16 20:54:41 +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
Daniel Reichelt
e306425428 remove now superfluous $debugHandler fields 2016-02-16 16:24:07 +01:00
Daniel Reichelt
f86a115c6a cron scripts: replace fwrite'ing to lockfile by logging 2016-02-16 16:24:06 +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)
5109443346 output error message when letsencrypt is checked and wildcard-serveralias in enabled - not just silently disable letsencrypt, people don't read the description and are confused 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-16 08:51:36 +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
Michael Kaufmann (d00p)
9ee661d44c correct current dev-version for new installs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-15 16:04:26 +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
d7ec7a42ba Merge pull request #289 from stweil/master 
Fix some issues in the German translation
 2016-02-14 09:22:03 +01:00
Stefan Weil
722aed5148 Fix some issues in the German translation 
This patch fixes some typos, grammar and wrong words in the first half
of the German translation.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-14 08:06:44 +01:00
Florian Aders
17100ad56a Fixed README regarding Let's Encrypt environment 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-12 20:10:00 +01:00
Michael Kaufmann
a76032f668 Merge pull request #284 from nachtgeist/functions 
add function getFormFieldDataText()
 2016-02-11 17:59:54 +01:00
Michael Kaufmann
d8d244541a Merge pull request #282 from nachtgeist/cron_tasks_bind 
cron tasks: bind: refactor zone creation
 2016-02-11 12:33:18 +01:00
Michael Kaufmann
ba5d4f2f5d Merge pull request #287 from megaspatz/0.9.35-dev3-termination-date 
Added termination-date to domains
 2016-02-11 12:32:20 +01:00
Michael Kaufmann
dce80c4611 Merge pull request #286 from guruevi/master 
Fixes nginx error due to duplicate fastcgi parameters
 2016-02-11 11:36:54 +01:00
Stefan Heid
eae9c4d78a Typo correction 2016-02-10 22:23:46 +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
root
0fbbd8dae7 Fixes nginx error due to duplicate fastcgi parameters 2016-02-10 13:28:25 -05:00