maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

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

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-05-24 11:54:37 +02:00
parent 65b2e4efa7
commit 6ca7920147
4 changed files with 7 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Froxlor/Cli/Action/ConfigServicesAction.php
View File

@@ -26,11 +26,16 @@ class ConfigServicesAction extends \Froxlor\Cli\Action
*/ */
private function validate() private function validate()
{ {
global $lng;
$this->checkConfigParam(true); $this->checkConfigParam(true);
$this->parseConfig(); $this->parseConfig();
require FROXLOR_INSTALL_DIR . '/lib/tables.inc.php'; require FROXLOR_INSTALL_DIR . '/lib/tables.inc.php';
include_once FROXLOR_INSTALL_DIR . '/lng/english.lng.php';
include_once FROXLOR_INSTALL_DIR . '/lng/lng_references.php';
if (array_key_exists("import-settings", $this->_args)) { if (array_key_exists("import-settings", $this->_args)) {
$this->importSettings(); $this->importSettings();
} }

2
lib/configfiles/buster.xml
View File

@@ -4860,7 +4860,7 @@ aliases: files
</visibility> </visibility>
<visibility mode="true">{{settings.phpfpm.enabled_ownvhost}} <visibility mode="true">{{settings.phpfpm.enabled_ownvhost}}
</visibility> </visibility>
<command><![CDATA[a2dismod php7.0]]></command> <command><![CDATA[a2dismod php7.3]]></command>
</commands> </commands>
<commands index="5"> <commands index="5">
<visibility mode="equals" value="apache2">{{settings.system.webserver}} <visibility mode="equals" value="apache2">{{settings.system.webserver}}

1784
lib/configfiles/trusty.xml
View File

File diff suppressed because it is too large Load Diff

2
lib/configfiles/xenial.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<froxlor> <froxlor>
<distribution name="Ubuntu" codename="Xenial" <distribution name="Ubuntu" codename="Xenial"
version="16.04" defaulteditor="/bin/nano"> version="16.04" defaulteditor="/bin/nano" deprecated="true">
<services> <services>
<!-- HTTP --> <!-- HTTP -->
<service type="http" title="{{lng.admin.configfiles.http}}"> <service type="http" title="{{lng.admin.configfiles.http}}">