maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
4,526 Commits 6 Branches 188 Tags
ecd707424f29cbd62b51010b2760dc572069cf11
Commit Graph

2081 Commits

Author SHA1 Message Date
Michael Kaufmann
fe0fb8dd5f fix non-static method called statically in \Froxlor\FileDir 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-31 16:38:53 +02:00
Michael Kaufmann
0b63b4e110 Merge pull request #853 from daxara/centos7 
[centos7] proftp requires epel, awstats needs install and awstats cron moved
 2020-05-31 15:02:57 +02:00
Ante de Baas
443ae1df68 proftp requires epel, awstats needs install and awstats cron moved 2020-05-31 14:57:07 +02:00
Ante de Baas
b59aa6f140 undo dnf -y 2020-05-31 14:28:37 +02:00
Ante de Baas
4e9df61fef awstats cron is moved to cron.hourly 2020-05-31 13:15:55 +02:00
Ante de Baas
b350815aa0 install awstats and requirements 2020-05-31 13:11:58 +02:00
Ante de Baas
b672c722b9 no user interaction on package installation 2020-05-31 13:05:52 +02:00
Ante de Baas
db60606cfa proftpd requires epel 2020-05-31 12:52:31 +02:00
Ante de Baas
2524491883 centos8 uses 'dandified yum' 2020-05-31 12:47:28 +02:00
Ante de Baas
de061e7e36 add missing apacheconf_htpasswddir dir 2020-05-31 12:46:33 +02:00
Ante de Baas
a7934bcb7b rename rhel7 to centos7 for consistancy 2020-05-31 11:17:43 +02:00
Michael Kaufmann
9dc2c09da7 Merge pull request #850 from daxara/rhel8 
Add CentOS 8 configuration-templates
 2020-05-31 09:30:51 +02:00
Michael Kaufmann
b23e4a4d85 Merge pull request #849 from daxara/detect_distr 
Detect distribution upon installation and set setting-defaults (if any) for that distribution
 2020-05-31 09:29:42 +02:00
Michael Kaufmann
394ec4cd4a fix ecc certificate paths 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-31 09:13:22 +02:00
Ante de Baas
1454d8d40f get defaults from configparser 2020-05-30 10:08:05 +02:00
Ante de Baas
60578a5d31 rename to CentOS because its most likely to be used 2020-05-29 17:46:38 +02:00
Ante de Baas
7fcacb4637 rename to centos because its most likey to be used 2020-05-29 17:45:37 +02:00
Ante de Baas
f4d4490d08 change property tagnames 2020-05-29 15:45:04 +02:00
Ante de Baas
a572ac3914 add rhel8 config file 2020-05-29 15:10:06 +02:00
Ante de Baas
498ff15e98 add redhat defaults 2020-05-29 14:59:48 +02:00
Michael Kaufmann
d73d8da2fd read certificate data folder from acme.sh.env file, fixes #846 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-28 20:08:49 +02:00
Ante de Baas
8898c7c165 add named dns config 2020-05-25 21:38:58 +02:00
Michael Kaufmann
0524c70d2b add config-templates for ubuntu focal (partly tested only for now) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-24 12:16:17 +02:00
Michael Kaufmann
6ca7920147 fix missing language files in config-services cli script; set ubuntu xenial deprecated, remove Ubuntu trusty; fix a2dismod command in buster config-template as php7.3 is default 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-24 11:55:20 +02:00
Grigory Morozov
c2e57dfd60 TLSv1 is deprecated 2020-05-18 05:18:42 +07:00
Michael Kaufmann
50f2047da3 set version to 0.10.17 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-15 20:35:25 +02:00
Michael Kaufmann
ecb9470b65 fix including of language-strings in reports-cron, fixes #836 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-15 15:16:24 +02:00
Michael Kaufmann
eb3590dc34 add unique-key domainid to domain_ssl_settings table 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-15 09:49:53 +02:00
Michael Kaufmann
bddf9b496c enable internal api-call to bypass customer_hide_options check in certain situations where it is needed, fixes #803 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-15 09:35:20 +02:00
Michael Kaufmann
edc702dafa check for required min version of php every time (frontend and cron), fixes #833 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-08 10:03:01 +02:00
Andreas Grundler
c0dd432916 Certificate file cannot be read to database if the domain contains capital letters. 2020-05-04 12:08:20 +02:00
Michael Kaufmann
b3db4dd887 set version to 0.10.16 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-01 16:27:23 +02:00
Michael Kaufmann
43070e4808 remove possible trailing slash of apache DocumentRoot diretives as sugggested by the httpd-docs, thx to jonbert 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-30 19:49:20 +02:00
Michael Kaufmann
98c636c282 let send-to-alternative-email be optional if no address is given instead of displaying error that the email address is invalid; fixes #829 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-30 13:03:19 +02:00
Michael Kaufmann
8dace6eca5 remove special characters from name when generating extrausers file 
add froxlor hostname to 2fa-qrcode; refs #814

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-28 07:59:37 +02:00
Michael Kaufmann
78fc4f84b2 add optional dns validation for let's encrypt activated domains; fixes #817 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-14 10:28:33 +02:00
Michael Kaufmann
9018404faa Double check whether installation of acme.sh worked when not installed yet and do not continue if not; fixes #823 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-14 08:10:36 +02:00
Michael Kaufmann
8bdd843bd9 fix renew of froxlors own letsencrypt certificate; fix only variables should be passed by reference in BackupCron; fix possible notice or double inclusion of language file in ReportsCron 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-08 09:07:48 +02:00
Michael Kaufmann
0d35f5cb29 restructure acmesh implementation and let acme.sh take care of renewing the certificates itself; fixes #792, fixes #816 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-04-04 18:04:39 +02:00
Christian Schneider
048e6c13ae Fix renewal of ECC/ECDSA certificates. 
The ACME v2 implementation uses separate directoies for ECC and on-ECC
certificates. The renew command for a domain checks if an ECC directory
exists (having a "_ecc" suffix) and refuses the command unless the
"--ecc" flag was specified.

Confusingly, this flag is only required to *renew* an ECC certificate,
but not to issue it.

This fixes https://github.com/Froxlor/Froxlor/issues/820.
 2020-03-29 22:36:26 +02:00
HBerni
4745581720 fixed parsing due to changes in dovecots default mail_log_prefix 
regex supports old and new default format now
(see https://wiki2.dovecot.org/Upgrading/2.3)
 2020-03-21 16:39:01 +01:00
Michael Kaufmann
489ccbe07a fix removing ip address if ip is set as system-ipaddress but there are other entries of that ip with a different port 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-12 07:01:26 +01:00
Michael Kaufmann
a4431e25d3 remove ssl-certificates connected to domains that are being deleted when deleting a customer; fixes #818 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-10 07:36:22 +01:00
Michael Kaufmann
1fe9f1e9d6 fix language strings for cron cmdline setting and fallback to php binary if no setting is found 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-08 10:30:33 +01:00
Michael Kaufmann
13767df562 set version to 0.10.15 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-08 07:39:39 +01:00
Michael Kaufmann
d7550ae58a fix deactivated check in api 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-06 22:10:01 +01:00
Michael Kaufmann
cf2c7fa31c deny api access to deactivated users with valid api-key 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-06 22:03:41 +01:00
Michael Kaufmann
32b6285589 set version to 0.10.14 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-06 20:47:20 +01:00
Michael Kaufmann
8807ae7dad allow private ip ranges in ips-and-ports as some configurations require that; fixes #802 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-02 09:51:44 +01:00
Michael Kaufmann
5f3f208534 remove superfluous comma in sql query which causes invalid sql 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-01 09:16:47 +01:00