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

sort distribution-names in admin_configfiles, it's confusing otherwise; display the default/recommended daemon of every service; fix small c'n'p error (courier is not our recommended default)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-02-09 14:49:53 +01:00
parent b8e548d1df
commit 855226d01a
5 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/classes/config/class.ConfigDaemon.php
View File

@@ -66,6 +66,12 @@ class ConfigDaemon {
* @var string
*/
public $title;
/**
* Whether this is the default daemon of the service-category
* @var boolean
*/
public $default;
public function __construct($xml, $xpath) {
$this->fullxml = $xml;
@@ -75,6 +81,9 @@ class ConfigDaemon {
if ($attributes['title'] != '') {
$this->title = $this->_parseContent((string)$attributes['title']);
}
if (isset($attributes['default'])) {
$this->default = ($attributes['default'] == true);
}
}
/**

2
lib/configfiles/precise.xml
View File

@@ -954,7 +954,7 @@ iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3
<command><![CDATA[/etc/init.d/dovecot restart]]></command>
</daemon>
<!-- Courier -->
<daemon name="courier" title="Courier" default="true">
<daemon name="courier" title="Courier">
<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
backup="true">

2
lib/configfiles/trusty.xml
View File

@@ -932,7 +932,7 @@ iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3
<command><![CDATA[service dovecot restart]]></command>
</daemon>
<!-- Courier -->
<daemon name="courier" title="Courier" default="true">
<daemon name="courier" title="Courier">
<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
backup="true">

2
lib/configfiles/wheezy.xml
View File

@@ -3745,7 +3745,7 @@ plugin {
<command><![CDATA[/etc/init.d/dovecot restart]]></command>
</daemon>
<!-- Courier -->
<daemon name="courier" title="Courier" default="true">
<daemon name="courier" title="Courier">
<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
backup="true">