Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes: #867 the argonaut-fuse config service display an error vhen sa…

…ving to ldap
  • Loading branch information...
commit 13b3519e618384d15b4e5d4139e10daaaabdbc38 1 parent 77fdc17
bilbo-the-hobbit bilbo-the-hobbit authored
10 argonaut/admin/systems/services/argonaut/argonautFuseConfig.tpl
View
@@ -5,17 +5,17 @@
<tr>
<td><label for="{$key}">
{if $key=='argonautFuseDefaultMode'}
- {t}Default mode{/t}
+ {t}Default mode{/t}{$must}
{elseif $key=='argonautFuseLogDir'}
- {t}Log directory{/t}
+ {t}Log directory{/t}{$must}
{elseif $key=='argonautFusePxelinuxCfg'}
- {t}Pxelinux cfg path{/t}
+ {t}Pxelinux cfg path{/t}{$must}
{elseif $key=='argonautFusePxelinuxCfgStatic'}
- {t}Pxelinux cfg static path{/t}
+ {t}Pxelinux cfg static path{/t}{$must}
{elseif $key=='argonautFuseFaiFlags'}
{t}Fai flags{/t}
{elseif $key=='argonautFuseNfsRoot'}
- {t}NFS root{/t}
+ {t}NFS root{/t}{$must}
{elseif $key=='argonautFuseOpsiAdmin'}
{t}Opsi admin{/t}
{elseif $key=='argonautFuseOpsiPassword'}
6 argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc
View
@@ -99,9 +99,11 @@ class argonautFuseConfig extends goService {
{
plugin::save();
+
/* Check if this is a new entry ... add/modify */
$ldap = $this->config->get_ldap_link();
$ldap->cat($this->dn,array("objectClass"));
+ $this->cleanup();
if($ldap->count()) {
$ldap->cd($this->dn);
$ldap->modify($this->attrs);
@@ -130,7 +132,9 @@ class argonautFuseConfig extends goService {
function check()
{
$message = plugin::check();
- return($message);
+ // FIXME : Should check for MUST attributes
+ // FIXME : Should check that if one of the Opsi attributes is there, the others are too
+ return $message;
}
function save_object()
18 argonaut/contrib/argonaut.ldif
View
@@ -31,7 +31,19 @@ olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.133NAME 'argonautLdap2zoneAllowUpdate
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.134NAME 'argonautLdap2zoneAllowTransfer' DESC 'Fusion Directory - Argonaut, allow transfer.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.135NAME 'argonautLdap2zoneTTL' DESC 'Fusion Directory - Argonaut, allow transfer.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.136NAME 'argonautLdap2zoneRndc' DESC 'Fusion Directory - Argonaut, rndc path (usually /usr/sbin/rndc).' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.137NAME 'argonautFuseDefaultMode' DESC 'Fusion Directory - Argonaut, fuse default mode.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.138NAME 'argonautFuseLogDir' DESC 'Fusion Directory - Argonaut, fuse log directory.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.139NAME 'argonautFusePxelinuxCfg' DESC 'Fusion Directory - Argonaut, fuse pxelinux_cfg.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.140NAME 'argonautFusePxelinuxCfgStatic' DESC 'Fusion Directory - Argonaut, fuse pxelinux_cfg_static.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.141NAME 'argonautFuseFaiFlags' DESC 'Fusion Directory - Argonaut, fuse fai flags.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.142NAME 'argonautFuseNfsRoot' DESC 'Fusion Directory - Argonaut, fuse NFS root.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.143NAME 'argonautFuseOpsiAdmin' DESC 'Fusion Directory - Argonaut, fuse Opsi admin.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.144NAME 'argonautFuseOpsiPassword' DESC 'Fusion Directory - Argonaut, fuse Opsi password.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.145NAME 'argonautFuseOpsiServer' DESC 'Fusion Directory - Argonaut, fuse Opsi server.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.146NAME 'argonautFuseOpsiLang' DESC 'Fusion Directory - Argonaut, fuse Opsi lang.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.3.147NAME 'argonautFuseLtspServer' DESC 'Fusion Directory - Argonaut, fuse LTSP server.' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
# Object Class
-olcObjectClasses: ( 1.3.6.1.4.1.38414.2.4.57NAME 'argonautServer' DESC 'An argonaut server' SUP top AUXILIARY MUST ( argonautPort $ argonautLogDir $ argonautDeleteFinished $ argonautWakeOnLanInterface $ argonautIpTool ) MAY ( argonautServerStatus ) )
-olcObjectClasses: ( 1.3.6.1.4.1.38414.2.4.58NAME 'argonautClient' DESC 'An argonaut client' SUP top AUXILIARY MUST ( argonautClientPort $ argonautTaskIdFile $ argonautClientWakeOnLanInterface $ argonautClientLogDir ) )
-olcObjectClasses: ( 1.3.6.1.4.1.38414.2.4.59NAME 'argonautConfig' DESC 'An argonaut config for debconf-crawler and ldap2repositry' SUP top AUXILIARY MUST ( argonautMirrorDir $ argonautMirrorArch $ argonautCrawlerPackagesFolder $ argonautLdap2repCleanup $ argonautLdap2repErrors $ argonautLdap2repSource $ argonautLdap2repGPGCheck $ argonautLdap2repContents $ argonautLdap2repVerbose $ argonautLdap2zoneBindDir $ argonautLdap2zoneAllowNotify $ argonautLdap2zoneTTL $ argonautLdap2zoneRndc ) MAY ( argonautLdap2repProxy $ argonautLdap2zoneAllowUpdate $ argonautLdap2zoneAllowTransfer ) )
+olcObjectClasses: ( 1.3.6.1.4.1.38414.2.4.50NAME 'argonautServer' DESC 'An argonaut server' SUP top AUXILIARY MUST ( argonautPort $ argonautLogDir $ argonautDeleteFinished $ argonautWakeOnLanInterface $ argonautIpTool ) MAY ( argonautServerStatus ) )
+olcObjectClasses: ( 1.3.6.1.4.1.38414.2.4.51NAME 'argonautClient' DESC 'An argonaut client' SUP top AUXILIARY MUST ( argonautClientPort $ argonautTaskIdFile $ argonautClientWakeOnLanInterface $ argonautClientLogDir ) )
+olcObjectClasses: ( 1.3.6.1.4.1.38414.2.4.52NAME 'argonautConfig' DESC 'An argonaut config for debconf-crawler and ldap2repositry' SUP top AUXILIARY MUST ( argonautMirrorDir $ argonautMirrorArch $ argonautCrawlerPackagesFolder $ argonautLdap2repCleanup $ argonautLdap2repErrors $ argonautLdap2repSource $ argonautLdap2repGPGCheck $ argonautLdap2repContents $ argonautLdap2repVerbose $ argonautLdap2zoneBindDir $ argonautLdap2zoneAllowNotify $ argonautLdap2zoneTTL $ argonautLdap2zoneRndc ) MAY ( argonautLdap2repProxy $ argonautLdap2zoneAllowUpdate $ argonautLdap2zoneAllowTransfer ) )
+olcObjectClasses: ( 1.3.6.1.4.1.38414.2.4.53NAME 'argonautFuseConfig' DESC 'An argonaut config for fuse' SUP top AUXILIARY MUST ( argonautFuseDefaultMode $ argonautFuseLogDir $ argonautFusePxelinuxCfg $ argonautFusePxelinuxCfgStatic $ argonautFuseNfsRoot ) MAY ( argonautFuseFaiFlags $ argonautFuseOpsiAdmin $ argonautFuseOpsiPassword $ argonautFuseOpsiServer $ argonautFuseOpsiLang $ argonautFuseLtspServer ) )
16 argonaut/contrib/argonaut.schema
View
@@ -227,18 +227,18 @@ attributetype ( 1.3.6.1.4.1.38414.2.3.147 NAME 'argonautFuseLtspServer'
SINGLE-VALUE )
# Object Class
-objectclass ( 1.3.6.1.4.1.38414.2.4.57 NAME 'argonautServer'
+objectclass ( 1.3.6.1.4.1.38414.2.4.50 NAME 'argonautServer'
DESC 'An argonaut server'
SUP top AUXILIARY
MUST ( argonautPort $ argonautLogDir $ argonautDeleteFinished $ argonautWakeOnLanInterface $ argonautIpTool )
MAY ( argonautServerStatus ) )
-objectclass ( 1.3.6.1.4.1.38414.2.4.58 NAME 'argonautClient'
+objectclass ( 1.3.6.1.4.1.38414.2.4.51 NAME 'argonautClient'
DESC 'An argonaut client'
SUP top AUXILIARY
MUST ( argonautClientPort $ argonautTaskIdFile $ argonautClientWakeOnLanInterface $ argonautClientLogDir ) )
-objectclass ( 1.3.6.1.4.1.38414.2.4.59 NAME 'argonautConfig'
+objectclass ( 1.3.6.1.4.1.38414.2.4.52 NAME 'argonautConfig'
DESC 'An argonaut config for debconf-crawler and ldap2repositry'
SUP top AUXILIARY
MUST ( argonautMirrorDir $ argonautMirrorArch $ argonautCrawlerPackagesFolder $
@@ -247,10 +247,12 @@ objectclass ( 1.3.6.1.4.1.38414.2.4.59 NAME 'argonautConfig'
argonautLdap2zoneAllowNotify $ argonautLdap2zoneTTL $ argonautLdap2zoneRndc )
MAY ( argonautLdap2repProxy $ argonautLdap2zoneAllowUpdate $ argonautLdap2zoneAllowTransfer ) )
-objectclass ( 1.3.6.1.4.1.38414.2.4.58 NAME 'argonautFuseConfig'
+objectclass ( 1.3.6.1.4.1.38414.2.4.53 NAME 'argonautFuseConfig'
DESC 'An argonaut config for fuse'
SUP top AUXILIARY
MUST ( argonautFuseDefaultMode $ argonautFuseLogDir $ argonautFusePxelinuxCfg $
- argonautFusePxelinuxCfgStatic $ argonautFuseFaiFlags $ argonautFuseNfsRoot $
- argonautFuseOpsiAdmin $ argonautFuseOpsiPassword $ argonautFuseOpsiServer $
- argonautFuseOpsiLang $ argonautFuseLtspServer ) )
+ argonautFusePxelinuxCfgStatic $ argonautFuseNfsRoot )
+ MAY ( argonautFuseFaiFlags $
+ argonautFuseOpsiAdmin $ argonautFuseOpsiPassword $ argonautFuseOpsiServer $
+ argonautFuseOpsiLang $
+ argonautFuseLtspServer ) )
Please sign in to comment.
Something went wrong with that request. Please try again.