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

3514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
0c43c5d2b5 backport config-services --import-settings parameter from 0.10.0 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 10:52:57 +01:00
Michael Kaufmann
aff6d82321 Merge pull request #531 from Crease29/patch-1 
Link domains to HTTPS in certificate list
 2018-03-04 12:11:12 +01:00
Kai Neuwerth
91cecf8c1e Link domains to HTTPS in certificate list 
As an admin I want to check if the certificate of a website is working.
Therefore I click on the domain in the SSL certificate list and have to prepend "https" to the URL later.
In this case I'd link the domain to HTTPS initially.
 2018-03-04 11:43:50 +01:00
Michael Kaufmann
26c3c8e6f0 Merge pull request #527 from JB1985/patch-2 
Update german.lng.php
 2018-03-03 14:58:38 +01:00
Michael Kaufmann
08814f8c9a Merge pull request #530 from michaelzangl/fix-hostname-error-message 
Fix hostname error message
 2018-03-03 14:57:22 +01:00
Michael Kaufmann
632eb98df9 Merge pull request #529 from michaelzangl/fix-installer-path 
Froxlor installer: Use same file path for chmod.
 2018-03-03 13:05:59 +01:00
Michael Zangl
909c983aec Fix invalidhostname error message (de). 2018-03-03 11:49:58 +01:00
Michael Zangl
8642254175 Fix invalidhostname error message. 2018-03-03 11:48:26 +01:00
Michael Zangl
7e81b0bb5a Froxlor installer: Use same file path for chmod. 2018-03-03 11:18:28 +01:00
Michael Kaufmann (d00p)
20eaa7bc08 fix missing sql-prepared-statement parameter, fixes #528 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-02 19:36:56 +01:00
JB1985
abb94c9189 Update german.lng.php 
Übersetzung Änderung von Lets Encrypt
 2018-03-02 17:28:30 +01:00
Michael Kaufmann (d00p)
2b366c8f23 add field for fullchain to be stored in ssl-certificates-table; create fullchain file if given (it's not used by froxlor); do not generate/renew certificates for disabled customers domains 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 18:22:15 +01:00
Michael Kaufmann (d00p)
d5b9ad3452 darn, stay php-5.3 compatible, thx greppy 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-20 21:37:06 +01:00
Michael Kaufmann (d00p)
5437fcdc89 insert tasks to rebuild configs etc. after import of settings, thx to v3ng for noticing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-20 19:15:55 +01:00
Michael Kaufmann (d00p)
131efc544d fix syntax error in lang file, fixes #522 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-19 12:27:00 +01:00
Michael Kaufmann
160474f2b6 Merge pull request #521 from JB1985/master 
Update german.lng.php
 2018-02-19 09:03:32 +01:00
JB1985
168738b23a Update german.lng.php 
Statt Benutze Lets Encrypt => SSL Zertifikat erstellen (Let\'s Encrypt)
 2018-02-19 09:02:34 +01:00
Michael Kaufmann (d00p)
9619abdad7 when importing settings with enabled ssl flag, validate that the target system has ssl enabled ip's to avoid unexpected behaviour, tthx v3ng for testing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-17 16:00:50 +01:00
Michael Kaufmann (d00p)
fd287e7be4 add apache restart command after enabling modules in config-templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-17 14:51:04 +01:00
Michael Kaufmann (d00p)
350e3d733a do not check for options if field is disabled, unset enabled-ownvhost flags for fcgid/fpm if the corresponding other one is activated; fixes #518 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 09:22:34 +01:00
Michael Kaufmann (d00p)
6f91bece17 fix postfix config for postfix/courier on precise and trusty, fixes #516 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 07:44:54 +01:00
Michael Kaufmann (d00p)
5c30961d3c set version to 0.9.39.5 for bugfix release (imap/pop3 ticks not enabled if active in hosting plan when editing hosting plan) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.39.5 		2018-02-14 13:31:39 +01:00
Michael Kaufmann (d00p)
edd5ef0ca0 fix correct display of selected checkbox imap/pop3 when editing hosting plan 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-14 07:40:39 +01:00
Michael Kaufmann (d00p)
6befe85656 fix add/edit domain due to wrong access to settings; setting version to 0.9.39.4 for bugfix release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.39.4 		2018-02-13 12:23:05 +01:00
Michael Kaufmann (d00p)
27f8c8b438 show domains of disabled customers also as disabled 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 11:49:15 +01:00
Michael Kaufmann (d00p)
fc0c796b68 avoid undefined variables/indexes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 10:58:06 +01:00
Michael Kaufmann (d00p)
482e8c9a11 set version to 0.9.39.3 for maintenance release and upcoming debian package so the new hosting-plan feature is included 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.39.3 		2018-02-13 09:06:49 +01:00
Michael Kaufmann (d00p)
7a664a9990 clean up panel_diskspace/panel_diskspace_admins when removing customer/admin 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 08:21:45 +01:00
Michael Kaufmann (d00p)
372ab5d9c8 add domain flag to avoid generation of nginx try_files directive in webroot which is not suitable for some applications; fixes #461 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 08:12:58 +01:00
Michael Kaufmann (d00p)
de70dbb888 fix checked-property when applying hosting-plan for allowed-phpconfigs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-12 14:58:17 +01:00
Michael Kaufmann (d00p)
4d7ceb9efe add missing question-string 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-12 13:33:29 +01:00
Michael Kaufmann (d00p)
bb792f228f add new hosting-plans feature 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-12 13:28:13 +01:00
Michael Kaufmann (d00p)
017396197e set version to 0.9.39.2 for bugfix release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.39.2 		2018-02-12 07:49:07 +01:00
Michael Kaufmann (d00p)
216f013c96 add script to automatically configure services from shell without the need of copy/paste from the interface 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-12 07:47:51 +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)
295fbae6f5 create bash script to generate proftpd-certificates in case system does not use /bin/bash as shell 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-11 16:10:10 +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)
13b1503bf2 set version to 0.9.39.1 for maintenance release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.39.1 		2018-02-10 16:06:57 +01:00
Michael Kaufmann (d00p)
2980397545 fix include path in lib/ajax.php 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-10 10:13:55 +01:00
Michael Kaufmann (d00p)
5612720342 only let admin select php-configs that the customer is allowed to use to avoid unwanted php-config changes when customer edits domain, refs #514 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 13:57:23 +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)
05b4c58aa8 fix updating wrong column when deleting a fpm configuration 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 09:20:46 +01:00
Michael Kaufmann (d00p)
f290497b64 fix selected phpfpm daemon when editing php-configuration, fixes #514 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 07:33:28 +01:00
Michael Kaufmann (d00p)
b4dd35eed2 correct description of nsswitch.conf file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-08 07:35:06 +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)
0aa707ebc9 set version to 0.9.39 for upcoming release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.39 		2018-02-06 12:19:21 +01:00
Michael Kaufmann (d00p)
f38a0fd8b6 remove unnecessary and out-of-date info from README, fixed variable typo in lib/init.php 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-05 08:36:25 +01:00
Michael Kaufmann (d00p)
a6b2daa77d fix typo 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-30 14:41:56 +01:00
Michael Kaufmann (d00p)
7ae31496ac add requirement check for php-json as settings import/export uses json_decode/json_encode 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-30 07:58:24 +01:00
Michael Kaufmann (d00p)
c62dd2ecf4 fix mysql-strict-mode issue (hopefully for good), enhance error-reporting when importing froxlor.sql on installation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-29 20:04:54 +01:00