Skip to content
GitLab
Verified Commit 68f122fd authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:sparkles: feat(fuse-fai) Add support for FAI 5 is argonaut-fuse 

issue #5845
parent 78498832
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5 fusiondirectory-1.4
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 15 deletions
+19 -15
argonaut/admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc
+ 11
− 14
View file @ 68f122fd
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2012-2016 FusionDirectory
Copyright (C) 2012-2018 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -28,7 +27,7 @@ class argonautFuseFAIConfig extends simplePlugin
{
return array(
'plShortName' => _('Argonaut Fuse FAI module settings'),
'plDescription' => _('Argonaut Fuse FAI module settings').' ('._('Services').')',
'plDescription' => _('Argonaut Fuse FAI module settings'),
'plCategory' => array('server'),
'plObjectClass' => array('argonautFuseFAIConfig'),
'plObjectType' => array('fusemodule'),
......@@ -36,27 +35,25 @@ class argonautFuseFAIConfig extends simplePlugin
);
}
/*!
* \brief The main function : information about attributes
*/
static function getAttributesInfo ()
{
return array (
'fai' => array (
'name' => _('FAI'),
'attrs' => array (
new IntAttribute (
_('FAI version'), _('Version of FAI installed on the server'),
'argonautFuseFaiVersion', TRUE,
4, 5, 5
),
new StringAttribute (
_('Fai flags'),
'',
'argonautFuseFaiFlags',
FALSE,
_('FAI flags'), _('Flags to pass to FAI'),
'argonautFuseFaiFlags', FALSE,
'verbose,sshd,syslogd,createvt,reboot'
),
new StringAttribute (
_('NFS root'),
'',
'argonautFuseNfsRoot',
TRUE,
_('NFS root'), '',
'argonautFuseNfsRoot', TRUE,
'/srv/fai/nfsroot'
),
)
......
argonaut/contrib/openldap/argonaut-fd.schema
+ 8
− 1
View file @ 68f122fd
......@@ -331,6 +331,13 @@ attributetype ( 1.3.6.1.4.1.38414.2.14.11 NAME 'argonautFuseLtspServer'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.14.12 NAME 'argonautFuseFaiVersion'
DESC 'Fusion Directory - Argonaut, fuse fai version.'
EQUALITY integerMatch
ORDERING integerOrderingMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.15.1 NAME 'argonautFAIMonitorPort'
DESC 'Fusion Directory - Argonaut FAI monitor, port.'
EQUALITY integerMatch
......@@ -419,7 +426,7 @@ objectclass ( 1.3.6.1.4.1.38414.2.2.7 NAME 'argonautFuseFAIConfig'
DESC 'An argonaut config for fuse FAI module'
SUP top AUXILIARY
MUST ( argonautFuseNfsRoot )
MAY ( argonautFuseFaiFlags ) )
MAY ( argonautFuseFaiVersion $ argonautFuseFaiFlags ) )
objectclass ( 1.3.6.1.4.1.38414.2.2.8 NAME 'argonautFuseLTSPConfig'
DESC 'An argonaut config for fuse LTSP module'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment