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

fix generated json for config-services script after install

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-08-26 16:59:43 +02:00
parent 05634adc66
commit 5c7f5be5b9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Install/Install/Core.php
View File

@@ -672,7 +672,7 @@ class Core
'dns' => 'x', 'dns' => 'x',
'http' => $this->validatedData['webserver'], 'http' => $this->validatedData['webserver'],
'smtp' => 'postfix_dovecot', 'smtp' => 'postfix_dovecot',
'mail' => 'dovecot_postfix', 'mail' => 'dovecot_postfix2',
'ftp' => 'proftpd', 'ftp' => 'proftpd',
'system' => $system_params 'system' => $system_params
]; ];

6
lib/configfiles/gentoo.xml
View File

@@ -1551,7 +1551,7 @@ root: root@<SERVERNAME>
</commands> </commands>
</general> </general>
<!-- postfix with dovecot --> <!-- postfix with dovecot -->
<daemon name="postfix_dovecot" version="2.x" <daemon name="postfix_dovecot" version="2"
title="Postfix 2 with dovecot"> title="Postfix 2 with dovecot">
<include>//service[@type='smtp']/general/commands[@index=1] <include>//service[@type='smtp']/general/commands[@index=1]
</include> </include>
@@ -1699,7 +1699,7 @@ dovecot unix - n n - - pipe
</include> </include>
</daemon> </daemon>
<!-- postfix with dovecot --> <!-- postfix with dovecot -->
<daemon name="postfix_dovecot" version="3.x" <daemon name="postfix_dovecot"
title="Postfix 3 with dovecot" default="true"> title="Postfix 3 with dovecot" default="true">
<include>//service[@type='smtp']/general/commands[@index=1] <include>//service[@type='smtp']/general/commands[@index=1]
</include> </include>
@@ -1852,7 +1852,7 @@ dovecot unix - n n - - pipe
</include> </include>
</daemon> </daemon>
<!-- postfix with courier --> <!-- postfix with courier -->
<daemon name="postfix_courier" version="2.x" <daemon name="postfix_courier" version="2"
title="Postfix 2 with courier"> title="Postfix 2 with courier">
<include>//service[@type='smtp']/general/commands[@index=1] <include>//service[@type='smtp']/general/commands[@index=1]
</include> </include>