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

1205 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
b03eab897a show a2enmod commands only when using apache, thx to d4n13L 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-16 18:41:01 +02:00
Daniel Reichelt
6e2b1773a3 LE: support alias domains 
LE CSRs are triggered for the aliasdomain target domain on

* domain deletion

* domain creation

* domain editing when
  * the aliasdomain target changes (CSR triggered both for old and new
    target)
  * wwwalias is disabled or enabled
  * letsencrypt is disabled or enabled (domain-local)

fixes #1597
 2016-05-16 17:35:51 +02:00
Daniel Reichelt
f3e05742b5 LE: change semantics of setting.letsencryptreuseold 
Previously setting.letsencryptreuseold determined wheter both a domain's
private key and a CSR should be re-generated.

Preparing support of alias domains in LE certificates, this is changed to
only determine the re-generation of the private key. CSRs now are always
re-generated.
 2016-05-16 17:35:51 +02:00
Daniel Reichelt
001f10f74e LE: catch error due to rate-limited account registration 
and fix bad english in log message
 2016-05-16 17:35:51 +02:00
Daniel Reichelt
0ae0178b4c LE: PSR-2 formatting 2016-05-16 17:35:51 +02:00
Michael Kaufmann (d00p)
1d4211a5ce remove wrong a2* commands for rhel/centos 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-16 17:20:49 +02:00
Michael Kaufmann (d00p)
da785500cc remove invalid self-closing <file /> tag as it produces php-notices and was just added for design reasons 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-14 18:39:18 +02:00
Michael Kaufmann (d00p)
2210d3de12 fix mail-account backup; fix missing job description for admin-dashboard (outstanding tasks); avoid double backup-task insertion when customer presses refresh after scheduling the backup-job 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-05 08:23:46 +02:00
Michael Kaufmann (d00p)
b2cd992f92 add important information that the customer should protect the backup directory using htaccess 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
b1446d366e add possibility to enable/disable backup function 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
9bfd5eb17e --exclude is relativ to path given via -C parameter 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
fb555027fd fix -C parameter and --exclude parameter for good now 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
05974de4d5 fix tar -C parameter again... 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
9c9bbb81de fix tar -C parameter and create_backup_tar_data list 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:18 +02:00
Michael Kaufmann (d00p)
ef7da53806 change directory before creating tarball to avoid having complete paths in it 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:18 +02:00
Michael Kaufmann (d00p)
a26ebb375b set db version for changes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:18 +02:00
Michael Kaufmann (d00p)
c8bbefb2bb add simple backup-function for customers (testing state) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:18 +02:00
Michael Kaufmann (d00p)
a485d9f4f9 TLSECCertificateFile and TLSECCertificateKeyFile for proftpds mod_tls require 1.3.5rc4 and later but Ubuntu 14.04 only provides 1.3.5rc3 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-19 13:31:09 +02:00
Michael Kaufmann (d00p)
84f1d94ad6 check for php-curl installed when cron_letsencrypt runs; format source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-11 08:02:18 +02:00
Daniel Reichelt
2a05b89cc8 add explicit warning about sub-zones on usage of zonefiles 2016-04-10 02:59:23 +02:00
Michael Kaufmann (d00p)
5331127204 set version to 0.9.35.1; fix updater :x 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-08 13:52:06 +02:00
Michael Kaufmann (d00p)
57f9c439f2 set version to 0.9.35 final for upcoming release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-08 12:54:17 +02:00
Daniel Schmitz
3405c7e313 Let's Encrypt: Always regenerate a new account-key, if staging 2016-03-24 01:26:57 +08:00
Michael Kaufmann (d00p)
30bd81064c make newly added settings available immediately 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-23 00:11:00 +01:00
Michael Kaufmann (d00p)
228d07ca66 output error in case of a server-error from LE, fixes #1609 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-15 17:45:43 +01:00
Michael Kaufmann (d00p)
104383d31e add a few opcache relevant php-ini directives to be used with php-fpm; add opcache.restrict_api to the default php-config for each domain with the customer's docroot as default value 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-15 17:05:09 +01:00
Michael Kaufmann (d00p)
1dd9bcbbe0 remove superfluous value-tag in visibility-tag (jessie-XML) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-13 19:50:56 +01:00
Daniel Reichelt
630ecfb148 jessie configs: override start order of webserver and nscd 
fixes #1605
 2016-03-13 19:02:11 +01:00
Daniel Reichelt
d545734072 ConfigDaemon: add notisfile/notisdir visibility conditions 2016-03-13 19:00:50 +01:00
Michael Kaufmann (d00p)
c903b759bb fix path for acme.conf in debian wheezy apache-2.2, fixes #1604 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-12 09:52:24 +01:00
Michael Kaufmann (d00p)
8bc19e3893 fix intendation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-10 12:12:19 +01:00
Michael Kaufmann (d00p)
f9740ff545 check whether an email account is to be deleted when re-adding an email account with the same name, fixes #1519 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-10 10:54:32 +01:00
Michael Kaufmann (d00p)
7bba4112b9 allow setting the serveralias option also for subdomains (because, why not? Might come in handy for LE users); add a few strings for autoupdate in german language file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-09 20:03:49 +01:00
Michael Kaufmann (d00p)
1f3c208f95 show acme.conf only if LE is enabled 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-08 12:44:31 +01:00
Michael Kaufmann (d00p)
4330b08c04 fix acme.conf for apache in wheezy and trusty, fixes #1603 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-08 12:31:57 +01:00
Daniel Reichelt
291fae1744 cron/LE: more verbose error message on token error 
be more specific about what exactly went wrong when trying to assert the
challenge/response payload (like e.g. http response code, error in DNS
resolution etc.)
 2016-03-08 08:21:10 +01:00
Michael Kaufmann (d00p)
604f37bd17 intriduce DB version (again) so we can keep release-version numbers while updating the database; added enable/disable switch for Let's Encrypt 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-07 13:47:22 +01:00
Michael Kaufmann (d00p)
77502efce7 enhance description of newsfeed-settings; ask whether to activate the newsfeed on install in case admin does not want any external requests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-05 13:56:34 +01:00
Michael Kaufmann (d00p)
86252a22a0 fix wrong timestamp function for last_run value for lets-encrypt cron when updating; put mail/file templates to misc-category in the admin-menu; fix wrong html-tag (typo); enhance info-string for redirect-codes, fixes #1564 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-04 13:23:12 +01:00
Michael Kaufmann
964a1716d7 Merge pull request #329 from HolySephi/master 
Set myhostname to $mydomain in postfix correctly
 2016-03-04 12:54:02 +01:00
Florian Wicke
06862240f0 Update wheezy.xml 2016-03-04 10:31:13 +01:00
Florian Wicke
3119510ef4 Update trusty.xml 2016-03-04 10:29:54 +01:00
Florian Wicke
b4a8ed8828 Update rhel_centos.xml 2016-03-04 10:29:04 +01:00
Florian Wicke
c182664167 Update precise.xml 2016-03-04 10:28:36 +01:00
Florian Wicke
4bba24801c Update jessie.xml 2016-03-04 10:28:03 +01:00
Florian Wicke
274e556989 Update gentoo.xml 2016-03-04 10:27:16 +01:00
Michael Kaufmann (d00p)
74758818e7 remove vhost-template menu entry 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-04 08:47:15 +01:00
Michael Kaufmann (d00p)
f9d949f90c Revert "Merge pull request #318 from Churro/froxlorMerge_33ab67a" 
This reverts commit 4f2ee129fd, reversing
changes made to f284d67843.
 2016-03-03 23:38:02 +01:00
Michael Kaufmann (d00p)
f6e519d779 Revert "Merge pull request #326 from Churro/froxlorMerge_vhostTemplates" 
This reverts commit 319668d384, reversing
changes made to aa592c7369.

Conflicts:
	install/froxlor.sql
	install/updates/froxlor/0.9/update_0.9.inc.php
	lib/version.inc.php
 2016-03-03 23:31:19 +01:00
Michael Kaufmann
e6df2d5d40 Revert "Zeige die neue vHost-Konfiguration auch wenn nur mod_php installiert ist." 2016-03-03 23:24:14 +01:00