Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

2021-03-28 15:49:59 +02:00 · 2021-03-27 15:42:06 +01:00 · 2021-03-27 11:08:19 +01:00 · 2020-11-21 08:11:39 +01:00 · 2020-11-20 18:02:55 +01:00 · 2020-11-18 22:18:54 +01:00
3171 changed files with 16792 additions and 38242 deletions
--- a/debian/agpl-3
+++ b/debian/agpl-3
@ -0,0 +1,662 @@
                    GNU AFFERO GENERAL PUBLIC LICENSE
                       Version 3, 19 November 2007
 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU Affero General Public License is a free, copyleft license for
 software and other kinds of works, specifically designed to ensure
 cooperation with the community in the case of network server software.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  Developers that use our General Public Licenses protect your rights
 with two steps: (1) assert copyright on the software, and (2) offer
 you this License which gives you legal permission to copy, distribute
 and/or modify the software.
  A secondary benefit of defending all users' freedom is that
 improvements made in alternate versions of the program, if they
 receive widespread use, become available for other developers to
 incorporate.  Many developers of free software are heartened and
 encouraged by the resulting cooperation.  However, in the case of
 software used on network servers, this result may fail to come about.
 The GNU General Public License permits making a modified version and
 letting the public access it on a server without ever releasing its
 source code to the public.
  The GNU Affero General Public License is designed specifically to
 ensure that, in such cases, the modified source code becomes available
 to the community.  It requires the operator of a network server to
 provide the source code of the modified version running there to the
 users of that server.  Therefore, public use of a modified version, on
 a publicly accessible server, gives the public access to the source
 code of the modified version.
  An older license, called the Affero General Public License and
 published by Affero, was designed to accomplish similar goals.  This is
 a different license, not a version of the Affero GPL, but Affero has
 released a new version of the Affero GPL which permits relicensing under
 this license.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU Affero General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Remote Network Interaction; Use with the GNU General Public License.
  Notwithstanding any other provision of this License, if you modify the
 Program, your modified version must prominently offer all users
 interacting with it remotely through a computer network (if your version
 supports such interaction) an opportunity to receive the Corresponding
 Source of your version by providing access to the Corresponding Source
 from a network server at no charge, through some standard or customary
 means of facilitating copying of software.  This Corresponding Source
 shall include the Corresponding Source for any work covered by version 3
 of the GNU General Public License that is incorporated pursuant to the
 following paragraph.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the work with which it is combined will remain governed by version
 3 of the GNU General Public License.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU Affero General Public License from time to time.  Such new versions
 will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU Affero General Public License for more details.
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If your software can interact with users remotely through a computer
 network, you should also make sure that it provides a way for users to
 get its source.  For example, if your program is a web application, its
 interface could display a "Source" link that leads users to an archive
 of the code.  There are many ways you could offer source, and different
 solutions will be better for different programs; see section 13 for the
 specific requirements.
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
 11
--- a/debian/control
+++ b/debian/control
@ -0,0 +1,14 @@
 Source: rougail
 Section: admin
 Priority: extra
 Maintainer: Cadoles <contact@cadoles.com>
 Build-depends: debhelper (>=11), python3-all, python3-setuptools, dh-python
 Standards-Version: 3.9.4
 Homepage: https://forge.cadoles.com/Infra/rougail
 Package: python3-rougail
 Architecture: any
 Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
 Depends: ${python:Depends}, ${misc:Depends}, python3-cheetah, python3-tiramisu3
 Description: configuration manager
--- a/debian/copyright
+++ b/debian/copyright
@ -0,0 +1,22 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: risotto
 Upstream-Contact: Cadoles <contact@cadoles.com>
 Source: https://forge.cadoles.com/Infra/rougail
 Files: *
 Copyright: 2019-2020 Cadoles <contact@cadoles.com>
 License: AGPL-3+
 License: AGPL-3+
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 .
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Affero General Public License for more details.
 .
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
--- a/debian/rougail.dirs
+++ b/debian/rougail.dirs
@ -0,0 +1,3 @@
 /var/rougail/patches
 /var/rougail/templates
 /var/rougail/manifests
--- a/debian/rules
+++ b/debian/rules
@ -0,0 +1,10 @@
 #!/usr/bin/make -f
 # See debhelper(7) (uncomment to enable)
 # output every command that modifies files on the build system.
 #DH_VERBOSE = 1
 export PYBUILD_NAME = rougail
 export PYBUILD_DISABLE_python3 = test
 %:
 	dh $@ --with python3 --buildsystem=pybuild
--- a/debian/source/format
+++ b/debian/source/format
@ -0,0 +1 @@
 3.0 (quilt)
--- a/doc/README.md
+++ b/doc/README.md
@ -11,7 +11,6 @@ Rougail est un bibliothèque python3 qui permet de charger des dictionnaires (fi
  - [Les dictionnaires](dictionary/rougail.md)
  - [Les dictionnaires extra](dictionary/extra.md)
  - [Convention d'écriture d'un dictionnaire](dictionary/convention.md)
 ### Les variables
@ -29,6 +28,7 @@ Rougail est un bibliothèque python3 qui permet de charger des dictionnaires (fi
  - [Les calcules automatiques](fill/README.md)
  - [Les vérifications des valeurs](check/README.md)
  - [Les conditions](condition/README.md)
  - [Les variables meneuses ou suiveuses](variable/leadership.md)
 ## Les templates
--- a/doc/check/README.md
+++ b/doc/check/README.md
@ -1,4 +1,5 @@
 # Les vérifications des valeurs
  - [Fonction de vérification](function.md)
  - [Les variables à choix](valid_enum.md)
  - [Réfinition](redefine.md)
--- a/doc/check/valid_enum.md
+++ b/doc/check/valid_enum.md
@ -0,0 +1,46 @@
 # Les variables à choix
 Une variable à choix est d'abord une variable avec une [fonction check](function.md).
 ## Les variables à choix simple
 Il est possible d'imposer une liste de valeur pour une variable particulière :
 ```
 <check name="valid_enum">
    <param>yes</param>
    <param>no</param>
    <param>maybe</param>
    <target>my_variable</target>
 </check>
 ```
 Dans ce cas, seule les valeurs proposés sont possible pour cette variable.
 Par défaut, cette variable est obligatoire. Cela signifie qu'il n'est pas possible de spécifier "None" à cette variable.
 ## Les variables à choix avec valeur None
 Il y a deux possibilités pour avoir une valeur "None" dans les choix :
 - rendre la variable non obligatoire, cela va ajouter un choix "None" dans la liste :
 ```
 <variable name="my_variable" mandatory="False">
 ```
 Ou en ajoutant le paramètre "None" :
 ```
 <check name="valid_enum">
    <param>yes</param>
    <param>no</param>
    <param type='nil'/>
    <param>maybe</param>
    <target>my_variable</target>
 </check>
 ```
 ## La valeur par défaut
 Si aucune valeur n'est spécifié pour la variable, automatiquement le premier choix va est placé comme valeur par défaut.
--- a/doc/condition/condition.md
+++ b/doc/condition/condition.md
@ -2,7 +2,7 @@
 ## Un condition
-Les conditions permettent d'ajouter ou de supprimer des propriétés à une [variable](../variable/README.md), une [famille](../family/README.md), un [service](../service/README.md), un [fichier](../service/file.md) ou une [ip](../service/ip.md) suivant le contexte.
+Les conditions permettent d'ajouter ou de supprimer des propriétés à une [variable](../variable/README.md), une [famille](../family/README.md), un [service](../service/service.md), un [fichier](../service/file.md) ou une [ip](../service/ip.md) suivant le contexte.
 Nous allons nous concentrer ici sur la condition hidden_if_in, mais [il existe d'autre conditions](conditions.md).
--- a/doc/condition/conditions.md
+++ b/doc/condition/conditions.md
@ -16,7 +16,7 @@ Il est possible de désactiver une [variable](../variable/README.md) ou une [fam
 ## Caché
-Il est possible de cacher une [variable](../variable/README.md), une [famille](../family/README.md), un [service](../service/README.md), un [fichier](../service/file.md) ou une [ip](../service/ip.md) avec les conditions :
+Il est possible de cacher une [variable](../variable/README.md), une [famille](../family/README.md), un [service](../service/service.md), un [fichier](../service/file.md) ou une [ip](../service/ip.md) avec les conditions :
 - hidden_if_in
 - hidden_if_not_in
--- a/doc/dev/config.md
+++ b/doc/dev/config.md
@ -14,15 +14,7 @@ Pour modifier il suffit de faire :
 RougailConfig[key] = value
 ```
-## Ajout d'une fonction de conversion
+## Les répertoires des dictionnaires
 Les fonctions de conversion fait parti du moteur de rougail. Il converti les informations des dictionnaires pour créer des variables Tiramisu.
 La clef "extra_annotators" permet d'ajouter des fonctions complémentaires.
 ## Configuration de chargement des dictionnaires
 ### Les répertoires des dictionnaires
 Il existe deux types de répertoires de dictionnaires :
@ -44,7 +36,7 @@ RougailConfig['extra_dictionaries']['example'] = ['/dir1', '/dir2']
 Les dictionnaires sont chargés dans le même ordre que les dictionnaires principaux.
-### La DTD
+## La DTD
 Rougail a besoin du fichier de DTD pour lire les fichiers dictionnaire.
@ -52,81 +44,51 @@ Par défaut le fichier de la DTD est dans le sous répertoire "data" du réperto
 Pour pouvez changer le répertoire de destination de la DTD et le nom du fichier avec la clef "dtdfilename".
-### Le fichier de fonction
+## Le fichier de fonction
-Le fichier qui contient les fonctions personnalisés est géré dans la clef "functions_file" et a comme valeur par défaut "/srv/rougail/functions.py". Cette clef peut contenir une liste s'il y a plusieurs fichiers.
+Le fichier qui contient les fonctions personnalisés est géré dans la clef "functions_file" et a comme valeur par défaut "/srv/rougail/functions.py".
-Les fonctions doivent retourner une valeur, même si la variable que l'on calcul est une variable multiple.
+## Le répertoire des templates
 Si la fonction peut retourner une valeur multiple (une liste), il faut mettre le nom de la fonction dans la clef "multi_functions".
-### La variable auto_freeze
+Le répertoire des templates est géré dans la clef "templates_dir" et a comme valeur par défaut : "/srv/rougail/templates".
 ## Le moteur de templates par défaut
 Le moteur de template est géré dans la clef "default_engine" et a comme valeur par défaut : "creole". Les valeurs possible sont "none", "creole" ou "jinja2".
 ## Le répertoire des patchs
 Le répertoire des patches est géré dans la clef "patches_dir" et a comme valeur par défaut : "/srv/rougail/patches".
 ## Le répertoire temporaire
 Le répertoire temporaire est utile lors de la génération de template. Il contient une copie des templates avec, éventuellement, les patches appliqués sur les templates.
 Le répertoire de temporaire est géré dans la clef "tmp_dir" et a comme valeur par défaut : "/srv/rougail/tmp".
 ## Le répertoire de destination des fichiers générés
 Le répertoire de destination des fichiers générés est géré dans la clef "destinations_dir" et a comme valeur par défaut : "/srv/rougail/destinations".
 ## La variable auto_freeze
 La propriété auto_freeze n'est appliqué que une variable spécifique passe à True. Par défaut le nom de la variable est "instancied_module", mais il est possible de changer le nom de cette variable via la clef "auto_freeze_variable".
-### Les modes
+## Les modes
 Les modes sont personnalisables dans Rougail. Par défaut les modes sont "basic", "normal" et "expert".
 Il est possible de changer cette liste via la clef "modes_level".
 Si vous changer ces valeurs, penser à changer les modes par défaut des familles et des variables.
-### Le mode par défaut pour une famille
+## Le mode par défaut pour une famille
 Le mode par défaut d'une famille est "basic". Il est possible de changer le mode par défaut d'une famille via la clef "default_family_mode".
-### Le mode par défaut pour une variable
+## Le mode par défaut pour une variable
 Le mode par défaut d'une variable est "normal". Il est possible de changer le mode par défaut d'une variable via la clef "default_variable_mode".
-### Le nom des fonctions internes
+## Le nom des fonctions internes
 Il est possible d'ajouter des fonctions interne via la clef "internal_functions".
 ## Configuration de la templatisation
 ### Le répertoire des templates
 Le répertoire des templates est géré dans la clef "templates_dir" et a comme valeur par défaut : "/srv/rougail/templates". Cette clef peut contenir une liste s'il y a plusieurs répertoires.
 ### Le répertoire des patchs
 Le répertoire des patches est géré dans la clef "patches_dir" et a comme valeur par défaut : "/srv/rougail/patches".
 ### Le répertoire temporaire
 Le répertoire temporaire est utile lors de la génération de template. Il contient une copie des templates avec, éventuellement, les patches appliqués sur les templates.
 Le répertoire de temporaire est géré dans la clef "tmp_dir" et a comme valeur par défaut : "/srv/rougail/tmp".
 ### Le répertoire de destination des fichiers générés
 Le répertoire de destination des fichiers générés est géré dans la clef "destinations_dir" et a comme valeur par défaut : "/srv/rougail/destinations".
 ### Le nom du répertoire où se trouve les fichiers pour tmpfile.d
 Le répertoire où se trouve les fichiers tmpfile.d sont par défaut dans "/usr/local/lib", il est possible de changer ce répertoire avec la clef "tmpfile_dest_dir".
 ## La configuration par défaut des fichiers
 ### Le moteur de templates par défaut
 Le moteur de template est géré dans la clef "default_files_engine" et a comme valeur par défaut : "creole". Les valeurs possible sont "none", "creole" ou "jinja2".
 ### Les droits par défaut des fichiers
 Les droits des fichiers générés est géré dans la clef "default_files_mode" et a comme valeur par défaut : "0644".
 ### Le propriétaire par défaut des fichiers
 Le propriétaire des fichiers générés est géré dans la clef "default_files_owner" et a comme valeur par défaut : "root".
 Le groupe propriétaire des fichiers générés est géré dans la clef "default_files_group" et a comme valeur par défaut : "root".
 ### La méthode d'inclusion par défaut des fichiers
 La méthode d'inclusion des fichiers générés est géré dans la clef "default_files_included" et a comme valeur par défaut : "no". Les valeurs possible sont "no", "name" et "content".
                 'default_files_included': 'no',
 ## La configuration du moteur de templates
 Le moteur de template est géré dans la clef "default_overrides_engine" et a comme valeur par défaut : "creole". Les valeurs possible sont "none", "creole" ou "jinja2".
--- a/doc/dictionary/convention.md
+++ b/doc/dictionary/convention.md
@ -1,13 +0,0 @@
 # Convention de rédaction d'un dictionnaire
 ## Ordonnancement du dictionnaire
 L'ordre des informations mise dans le dictionnaire est idéalement :
 - services
 - variables
 - constraintes
 ## Le nom d'espace
 Le nom d'espace dans un dictionnaire est de deux espaces.
--- a/doc/family/README.md
+++ b/doc/family/README.md
@ -2,5 +2,4 @@
  - [Une famille](simple.md)
  - [Famille crée dynamiquement](auto.md)
  - [Les variables meneuses ou suiveuses](leadership.md)
--- a/doc/family/leadership.md
+++ b/doc/family/leadership.md
@ -1,56 +0,0 @@
 # Variable meneuse ou suiveuse
 ## Variable meneuse
 Une variable meneuse est une variable qui va guider la longueur d'autre variables (appelé variables suiveuse).
 Une variable meneuse est une [variable](../variable/README.md) qui est obligatoirement de type multiple.
 Une variable meneuse peut être obligatoire.
 Le [mode](../mode.md) par défaut correspond au plus petit mode définit par l'utilisateur des variables suiveuses.
 ## Variable suiveuse
 Une variable suiveuse est une variable donc la longueur n'est pas déterminé par elle-même, mais est identique à celle de la variable meneuse dont elle dépend.
 Une variable suiveuse est une variable placer juste derrière une variable meneuse ou une autre variable suiveuse.
 L'ordre de définition des variables suiveuses est important.
 Cette variable peut être de type multiple. Dans ce cas, pour un index determiné, il est possible de mettre plusieurs valeurs à une même variable.
 Une variable suiveuse peut être obligatoire. Cela signifie que lorsqu'une variable meneuse est renseigné, il faut obligatoirement que la variable suiveuse est également une valeur à l'index considéré.
 Si aucune valeur n'est définit pour la variable meneuse, aucune valeur n'est a spécifié pour la variable suiveuse.
 Le [mode](../mode.md) par défaut d'une variable suiveuse correspond au [mode](../mode.md) de la variable meneuse.
 Si une variable meneuse est caché ou désactivé, les variables suiveuses le seront également.
 ## Définition des variables meneuse et suiveuse
 Les variables meneuses et suiveuses doivent dans une famille de type "leadership".
 Voici un exemple de définition d'une variable meneuse et de deux variables meneuses :
 ```
 <variables>
  <family name="family" leadership='True'>
    <variable name="leader" multi='True'/>
    <variable name="follower1"/>
    <variable name="follower2" multi='True'/>
  </family>
 </variables>
 ```
 ## Ajout d'une nouvelle variable suiveuse
 Pour ajouter, dans un nouveau dictionnaire, une variable suiveuse à notre groupe, rien de plus simple, il suffit définir une ou des nouvelles variables dans la famille :
 ```
 <variables>
  <family name="family">
    <variable name="follower3"/>
  </family>
 </variables>
 ```
--- a/doc/fill/README.md
+++ b/doc/fill/README.md
@ -4,4 +4,3 @@ Une variable calculée est une variable donc sa valeur est le résultat d'une fo
  - [Valeur calculée de la variable](value.md)
  - [Réfinition](redefine.md)
  - [Exemples de calcule](examples.md)
--- a/doc/fill/examples.md
+++ b/doc/fill/examples.md
@ -1,48 +0,0 @@
 # Exemples de calcule
 ## Calculer les noms de modèle à généré à partir d'une variable
 Créeons deux variables multiples, une pour accueillir la liste des éléments du nom variable (ici `zones_list`), la seconde étant le nom du fichier calculé (ici `netwokd_configurations`) :
 ```
 <variables>
  <variable name="zones_list" type="string" multi="True">
    <value>zone1</value>
    <value>zone2</value>
    <value>zone3</value>
  </variable>
  <variable name="netwokd_configurations" type="filename" multi="True" hidden="True"/>
 </variables>
 ```
 Calculons la valeur de la seconde variable à partir de la première :
 ```
 <constraints>
  <fill name="calc_value">
    <param>/systemd/network/10-</param>
    <param type="variable">zones_list</param>
    <param>-risotto.network</param>
    <param name="join"></param>
    <param name="multi" type="boolean">True</param>
    <target>netwokd_configurations</target>
  </fill>
 </constraints>
 ```
 Le contenu de la variable `netwokd_configurations` sera alors :
 - /systemd/netword/10-zone1/risotto.network
 - /systemd/netword/10-zone2/risotto.network
 - /systemd/netword/10-zone3/risotto.network
 Enfin déclarer une balise file en utilisant ces deux variables :
 ```
 <services>
  <service name="systemd-networkd">
    <file file_type="variable" source="network" variable="zones_list">netwokd_configurations</file>
  </service>
 </services>
 ```
--- a/doc/fill/value.md
+++ b/doc/fill/value.md
@ -49,8 +49,8 @@ Si une condition "hidden_if_in" est spécifié à la variable, la valeur sera mo
 ## Variable meneuse ou suiveuse avec valeur calculé
-Une [variable suiveuse](../family/leadership.md) ne peut pas être calculé automatiquement.
+Une [variable suiveuse](../variable/leadership.md) ne peut pas être calculé automatiquement.
-Une [variable meneuse](../family/leadership.md) peut être calculé automatiquement.
+Une [variable meneuse](../variable/leadership.md) peut être calculé automatiquement.
 Si la variable n'est pas multiple, il ne faut pas que le calcule retourne une liste.
 ## Variable dynamique avec une valeur calculée
--- a/doc/param/simple.md
+++ b/doc/param/simple.md
@ -42,11 +42,3 @@ Le paramètre peut être une valeur null (None en python) :
 ```
 <param type="nil"/>
 ```
 # Paramètre de type "space"
 Les paramètres sont chargés en supprimer les espaces en début ou fin de chaîne. Ce qui rend impossible d'avoir un paramètre " ". Avec le type "space", le paramètre sera donc un simple espace :
 ```
 <param type="space"/>
 ```
--- a/doc/param/variable.md
+++ b/doc/param/variable.md
@ -6,7 +6,7 @@ Imaginons que la variable "my_variable" pré-existe. La valeur de la variable se
 <param type="variable">my_variable</param>
 ```
-[Les variables meneuses ou suiveuses](../family/leadership.md) peuvent être utilisé sans soucis comme paramètre.
+[Les variables meneuses ou suiveuses](../variable/leadership.md) peuvent être utilisé sans soucis comme paramètre.
 ## Paramètre avec variable potentiellement non existante
--- a/doc/service/README.md
+++ b/doc/service/README.md
@ -1,107 +1,4 @@
-# La gestion d'un service
+# Les services
 ## La base service
 Un service est inclut dans un conteneur [services](../services.md).
 Cette balise permet de définir tous les éléments ([fichier](file.md), [IP](ip.md) et [réécriture](override.md)) liés à un service ou à démon.
 Il faut, à la création du service, préciser son nom :
 ```
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
  <services>
    <service name="squid"/>
  </services>
 </rougail>
 ```
 ## Les types de service
 Les services peuvent être de plusieurs type :
 - service (valeur par défaut) : cela signifie que c'est un service systemd qui est activer au démarrage de la machine
 - mount : fichier utilisé par systemd-mount
 - swap : fichier utilisé par systemd-swap
 - timer : tâche planifié pour systemd
 ```
 <service name="dev-disk-by\x2dpartlabel-swap" type="swap"/>
 ```
 ## Les targets de service
 Active le service systemd pour une target systemd déterminé. Par défaut, l'activation du service n'est pas gérer par rougail.
 ```
 <service name="squid" target="multi-user"/>
 ```
 ## La génération du fichier service
 Le fichier de description du service peut être fourni directement par la distribution GNU/Linux utilisé, mais il peut également être fournit par l'administrateur.
 Dans ce cas, il est possible de créé un template, dont le nom est obligatoirement la valeur de la balise "name" + "." + la valeur de la base "type".
 Deux types de template sont aujourd'hui disponible :
 - creole
 - jinja2
 ```
 <service name="dev-disk-by\x2dpartlabel-swap" type="swap" engine="creole"/>
 ```
 Dans ce cas, rougail utilisera le template "dev-disk-by\x2dpartlabel-swap.swap" pour générer le fichier systemd de gestion de ce service.
 ## Le service factice
 Un service peut être factice, donc non géré par le système de service du système :
 ```
 <service name="ldap_client" manage="False"/>
 ```
 Un service factice est généralement une service qui n'existe pas réellement (par exemple si on configure un client). Il n'est là que pour contenir des fichiers.
 ## Désactiver le service
 Il est possible de désactiver un service. Pour cela il faut rajouter l'attribut "disabled" à True :
 ```
 <services>
  <service name="test" disabled="True"/>
 </services>
 ```
 Dans ce cas, le service et les éléments qu'il compose ([fichier](file.md), [IP](ip.md) et [réécriture](override.md) seront désactivés.
 Il est possible de définir une [condition](../condition/README.md) de type "disabled_if_in" ou "disabled_if_not_in" sur une balise service :
 ```
 <services>
  <service name="test" servicelist="test">
  </service>
 </services>
 <variables>
  <variable name="condition" type="boolean"/>
 </variables>
 <constraints>
  <condition name="disabled_if_in" source="condition">
    <param>False</param>
    <target type="servicelist">test</target>
  </condition>
 </constraints>
 ```
 Dans ce cas, tous les services et les éléments qu'il compose avec un attribut servicelist à "test" seront désactivés si la variable "condition" est False.
 ## Ne pas désactiver le service dans systemd
 La désactivation du service va créé un lien symbolique vers /dev/null.
 Si vous ne voulez juste pas créé le fichier de service et ne pas faire de lien symbolique, il faut utiliser l'attribut undisable :
 ```
 <service name="test" disabled="True" undisable="True"/>
 ```
--- a/doc/service/file.md
+++ b/doc/service/file.md
@ -2,7 +2,7 @@
 ## La balise file
-La gestion des fichiers se fait dans un conteneur de [service](README.md).
+La gestion des fichiers se fait dans un conteneur de [service](service.md).
 La déclaration du fichier permet de générer un fichier à partir d'un template pour le déposer à l'endroit prévu dans la déclaration de cette élément.
@ -89,7 +89,7 @@ En effet, il est possible de passer le contenu d'une variable au template :
 </variables>
 ```
-Dans ce cas, lors de la génération du fichier /etc/squid1/squid.conf on retrouvera la variable "rougail_variable" avec la valeur "squid1" et la variable "rougail_index" avec la valeur "0". Lors de la génération du fichier /etc/squid2/squid.conf on retrouvera la variable "rougail_variable" avec la valeur "squid2" et la variable "rougail_index" avec la valeur "1".
+Dans ce cas, lors de la génération du fichier /etc/squid1/squid.conf on retrouvera la variable "rougail_variable" avec la valeur "squid1" et le fichier /etc/squid2/squid.conf on retrouvera la variable "rougail_variable" avec la valeur "squid2".
 Attention : les deux variables "my_variable1" et "my_variable2" doivent être multiple et de même longueur.
@ -97,23 +97,15 @@ Attention : les deux variables "my_variable1" et "my_variable2" doivent être mu
 Par défaut les droits du fichier généré sont "0644" avec comme utilisateur "root" et groupe "root".
-Il est possible de définir les droits, l'utilisateur ou le groupe d'un fichier généré :
+Il est possible de définir une autre valeur à un ou plusieurs de ces attributs :
 ```
 <file mode="0640" owner="nobody" group="squid">/etc/squid/squid.conf</file>
 ```
 Il est possible de personnaliser les droits par défaut dans la [configuration de rougail](../dev/config.md)
 ## Désactiver la génération d'un fichier
-Il est possible de désactiver la génération d'un fichier avec l'attribut "disabled" :
+Il est possible de définir une [condition](../condition/README.md) de type "disabled_if_in" ou "disabled_if_not_in" sur une balise fichier :
 ```
 <file disabled="True">/etc/squid/squid.conf</file>
 ```
 Il est aussi possible de définir une [condition](../condition/README.md) de type "disabled_if_in" ou "disabled_if_not_in" sur une balise fichier :
 ```
 <services>
@ -158,8 +150,6 @@ Ou d'utiliser le moteur "jinja2" :
 <file engine="jinja2">/etc/squid/squid.conf</file>
 ```
 Il est possible de personnaliser le moteur par défaut dans la [configuration de rougail](../dev/config.md)
 ## Inclusion de template
 Un attribut "included" permet de définir la nature du fichier. Cet attribut peut avoir trois valeurs :
@ -168,82 +158,11 @@ Un attribut "included" permet de définir la nature du fichier. Cet attribut peu
 - "name" : le répertoire de destination est listé dans un autre template, il faut que le fichier soit généré avant cet autre template
 - "content" : le contenu du fichier est copié dans un autre template, il faut que le fichier soit généré avant cet autre template et ce fichier n'a pas besoin d'être installé sur le serveur cible.
 Bien entendu, c'est au développeur de lister ou d'inclure le contenu de ce template dans le fichier de destination. Cet attribut permet juste de garantir que le fichier sera fait avant l'autre et de ne pas l'installer sur le serveur si ce n'est pas nécessaire.
 Il est possible de personnaliser les methodes d'inclusion par défaut dans la [configuration de rougail](../dev/config.md)
 Exemples :
 - créons un template qui inclut des noms de fichiers :
 Le contenu de ce template (squid.conf) est :
 ```
-%import os
+<file included="name">/etc/squid/squid.conf</file>
-%set %%confdir = 'etc/squid/squid.d/'
+<file included="content">/etc/squid/squid.conf</file>
 %if %%os.path.exists(%%confdir)
 %set %%files = %%os.listdir(%%confdir)
 %%files.sort()
 %for %%file in %%files
  %if %%file.endswith('.cfg')
 include '/' + %%confdir + file
  %end if
 %end for
 %end if
 ```
-Ajoutons un second template (squid.included.conf) qui sera copié dans ce répertoire :
+Bien entendu, c'est au développeur de lister ou d'inclure le contenu de ce template dans le fichier de destination. Cet attribut permet juste de garantir que le fichier sera fait avant l'autre et de ne pas l'installer sur le serveur si ce n'est pas nécessaire.
 ```
 template content
 ```
 Et déclaront ces deux templates :
 ```
 <file>/etc/squid/squid.conf</file>
 <file included="name" engine="none">/etc/squid/squid.d/squid.conf</file>
 ```
 Le contenu du fichier généré (/etc/squid/squid.conf) sera donc :
 ```
 include squid.d/squid.conf
 ```
 - créons un template qui inclut le contenu de fichiers :
 Le contenu de ce template (squid.conf) est :
 ```
 %import os
 %set %%confdir = 'squid.d/'
 %if %%os.path.exists(%%confdir)
 %set %%files = %%os.listdir(%%confdir)
 %%files.sort()
 %for %%file in %%files
  %if %%file.endswith('.cfg')
 %include raw %%confdir + file
  %end if
 %end for
 %end if
 ```
 Ajoutons un second template (squid.included.conf) qui sera copié dans ce répertoire :
 ```
 template content
 ```
 Et déclaront ces deux templates :
 ```
 <file>/etc/squid/squid.conf</file>
 <file included="content" engine="none">squid.d/squid.conf</file>
 ```
 Le contenu du fichier généré (/etc/squid/squid.conf) sera donc maintenant :
 ```
 template content
 ```
--- a/doc/service/ip.md
+++ b/doc/service/ip.md
@ -2,7 +2,7 @@
 ## La balise IP
-La gestion des IP se fait dans un conteneur de [service](README.md).
+La gestion des IP se fait dans un conteneur de [service](service.md).
 La déclaration de l'attribut permet d'associer une IP autorisé à accéder au service.
--- a/doc/service/override.md
+++ b/doc/service/override.md
@ -1,8 +1,8 @@
-# Réécriture du service
+# Override
 ## La balise override
-La gestion des overrides se fait dans un conteneur de [service](README.md).
+La gestion des overrides se fait dans un conteneur de [service](service.md).
 La balise override permet de redéfinir facilement un service systemd.
@ -41,5 +41,3 @@ Ou d'utiliser le moteur "jinja2" :
 ```
 <override engine="jinja2"/>
 ```
 Il est possible de personnaliser le moteur par défaut dans la [configuration de rougail](../dev/config.md)
--- a/doc/service/service.md
+++ b/doc/service/service.md
@ -0,0 +1,50 @@
 # La gestion d'un service
 ## La base service
 Un service est inclut dans un conteneur [services](../services.md).
 Cette balise permet de définir tous les éléments ([fichier](file.md), [IP](ip.md), ...) liés à un service ou à démon.
 Il faut, à la création du service, préciser son nom :
 ```
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
    <services>
        <service name="squid"/>
    </services>
 </rougail>
 ```
 Un service peut ne pas être géré :
 ```
 <service name="squid" manage="True"/>
 ```
 Un service non géré est généralement une service qui n'existe pas réellement (par exemple si on configure un client).
 Un service non géré ne peut conteneur que des fichiers.
 ## Désactiver la génération d'un service
 Il est possible de définir une [condition](../condition/README.md) de type "disabled_if_in" ou "disabled_if_not_in" sur une balise service :
 ```
 <services>
    <service name="test">
    </service>
 </services>
 <variables>
    <variable name="condition" type="boolean"/>
 </variables>
 <constraints>
    <condition name="disabled_if_in" source="condition">
        <param>False</param>
        <target type="servicelist">test</target>
    </condition>
 </constraints>
 ```
 Dans ce cas, tous les services et les éléments qu'il compose ([fichier](file.md), ...) avec un attribut servicelist à "test" seront désactivés si la variable "condition" est False.
--- a/doc/services.md
+++ b/doc/services.md
@ -1,6 +1,6 @@
 # Le conteneur des services
-La balise "services" est le conteneur de l'ensemble des [services](service/README.md).
+La balise "services" est le conteneur de l'ensemble des [services](service/service.md).
 Il est placé à la racine du dictionnaire :
--- a/doc/target/list.md
+++ b/doc/target/list.md
@ -4,7 +4,7 @@
 ### servicelist
-Une cible peut être de type [service](../service/README.md) :
+Une cible peut être de type [service](../service/service.md) :
 ```
 <target type="servicelist">example</target>
--- a/doc/variable/README.md
+++ b/doc/variable/README.md
@ -1,275 +1,4 @@
 # Variable
-## Un variable
+  - [Une variable](simple.md)
-
+  - [Variable meneuse ou suiveuse](leadership.md)
 Une variable est forcement dans [variables](../variables.md) ou dans une [famille](../family/README.md).
 Une variable est déjà un nom. C'est à dire qu'on pourra utiliser plus tard la variable via ce nom.
 ```
 <variables>
  <variable name="my_variable"/>
  <family name="my_family">
    <variable name="my_family_variable"/>
  </variable>
 </variables>
 ```
 ## Description et aide sur la variable
 En plus d'un nom, il est possible de mettre une "description" à la variable. C'est une information "utilisateur" qui nous permettra d'avoir des informations complémentaires sur le contenu de cette variable :
 ```
 <variable name="my_variable" description="This is a greate variable"/>
 ```
 En plus de la description, il est possible de préciser une aide complémentaire :
 ```
 <variable name="my_variable" help="This is a greate variable"/>
 ```
 Cette aide peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
 ## Le type de la variable
 Une variable a un type. Ce type permet de définir les valeurs acceptées par cette variable :
 - string : chaine de caractère (type par défaut)
 - number : un nombre
 - float : un chiffre flottant
 - boolean : "True" ou "False", si aucune valeur n'est défini la valeur par défaut de cette variable sera "True", ces variables sont également obligatoire par défaut
 - secret (ou password mais est obsolète) : un secret (comme un mot de passe, une clef privée, ...)
 - mail : une adresse mail
 - filename : nom de fichier au sens Unix (exemple : "/etc/passwd")
 - date : une date au format "%Y-%m-%d" (exemple : "2021-01-30")
 - unix_user : nom d'utilisateur au sens Unix
 - ip : n'importe quelle adresse IPv4
 - cidr : n'importe quelle adresse IPv4 au format CIDR
 - local_ip : adresse IPv4 sur un réseau local, si l'adresse IPv4 n'est pas local, un warning sera afficher mais la valeur sera accepté tout de même
 - netmask : masque d'une adresse IPv4
 - network : adresse réseau
 - network_cidr : adresse réseau au format CIDR
 - broadcast : adresse de diffusion
 - netbios : nom netbios
 - domain : nom de domaine
 - hostname : nom d'hôte
 - web_address : adresse web (http://www.cadoles.com/)
 - port : port
 - mac : adresse MAC
 - schedule : périodicité du schedule, les valeurs possibles sont "none", "daily", "weekly" ou "monthly"
 - schedulemod : type de schedule, les valeurs possibles sont "pre" ou "post"
 Pour définir le type d'une variable :
 ```
 <variable name="my_variable" type="number"/>
 ```
 ## Variable à valeur multiple
 Par défaut une variable ne peut acceuillir qu'une seule valeur. Il peut être utile de pouvoir spécifier plusieurs valeurs à une même variable.
 Pour définir une variable à valeur multiple :
 ```
 <variable name="my_variable" multi="True"/>
 ```
 ## Variable invisible
 Il est possible de cacher une variable.
 Cacher une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service.
 Par contre cette variable sera accessibles lorsqu'on va l'utiliser.
 Pour cacher une variable :
 ```
 <variable name="my_variable" hidden="True"/>
 ```
 ## Variable désactive
 Il est possible de désactiver une variable.
 Désactiver une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service mais également lorsqu'on va l'utiliser.
 Pour désactiver une variable :
 ```
 <variable name="my_variable" disabled="True"/>
 ```
 ## Variable obligatoire
 Variable dont une valeur est requise :
 ```
 <variable name="my_variable" mandatory="True"/>
 ```
 Les variables booléans sont par défaut obligatoire. Pour qu'une variable booléan ne soit pas obligatoire il faut le préciser explicitement :
 ```
 <variable name="my_variable" type="boolean" mandatory="False"/>
 ```
 Les variables avec une valeur par défaut (non calculée) sont également automatiquement obligatoire.
 ## Valeur par défaut d'une variable
 Il est possible de fixer les valeurs par défaut d'une variable :
 ```
 <variable name="my_variable">
  <value>value</value>
 </variable>
 ```
 Pour une variable multiple, il est possible de préciser plusieurs valeurs :
 ```
 <variable name="my_variable" multi="True">
  <value>value 1</value>
  <value>value 2</value>
 </variable>
 ```
 Si la variable n'est pas pas une [variable meneuse](../family/leadership.md), la première valeur défini dans cette liste sera également la valeur par défaut proposé si on ajoute une nouvelle valeur à cette variable.
 Une valeur par défaut peut également être [une valeur calculer](../fill/README.md).
 ## Redéfinir une variable
 Il est possible de définir une variable dans un dictionnaire et de changer son comportement dans une second dictionnaire.
 Attention trois attributs ne sont redéfinisable :
 - name
 - type
 - multi
 Créons notre variable :
 ```
 <variable name="my_variable"/>
 ```
 Et redéfinisons là :
 ```
 <variable name="my_variable" redefine="True" description="New description"/>
 ```
 ## Créer une variable inexistante
 Il est parfois utile de créer une variable si elle n'existe pas dans un autre dictionnaire :
 ```
 <variable name="my_variable" exists="False"/>
 ```
 Si cette variable existe dans un autre dictionnaire, elle ne sera pas modifié ni recréé
 ## Redéfinir une variable si elle existe
 Parfois on veut pouvoir redéfinir une variable mais seulement dans le cas où elle existe déjà :
 ```
 <variable name="my_variable" redefine="True" exists="True" hidden="True"/>
 ```
 ## Variable à valeur automatiquement modifiée
 Une variable avec valeur automatiquement modifiée est une variable dont la valeur sera considéré comme modifié quand la propriété global "force_store_value" de Tiramisu est mise.
 Voici une variable a valeur automatiquement modifiée :
 ```
 <variable name="my_variable" auto_save="True">
  <value>my_value</value>
 </variable>
 ```
 Dans ce cas la valeur est fixée à la valeur actuelle.
 Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
 Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont automatiquement modifiées que si elles ont une valeurs.
 Une [variable meneuse ou suiveuse](../family/leadership.md) ne peut pas avoir la propriété auto_save.
 ## Variable à valeur en lecture seule automatique
 Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand la [variable "server_deployed" passe à "True"](../dev/config.md).
 Voici un variable à valeur en lecture seule automatique :
 ```
 <variable name="server_deployed" type="boolean">
  <value>False</value>
 </variable>
 <variable name="my_variable" auto_freeze="True"/>
 ```
 Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.
 Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
 Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont en lecteur seul que si elles ont une valeurs.
 Une [variable meneuse ou suiveuse](../family/leadership.md) ne peut pas avoir la propriété auto_freeze.
 ## Information "test"
 L'attribut "test" est un attribut spécial qui permet aux concepteurs d'un dictionnaire d'influancer le robot de test en précisant de valeurs utile à tester.
 Concrêtement, le contenu de cet attribut est enregister dans une "information" de l'option Tiramisu correspondante.
 Exemple :
 ```
 <variable name="my_variable" test="yes"/>
 ```
 Il est possible de préciser plusieurs valeurs avec le séparateur "|" :
 ```
 <variable name="my_variable" test="yes|no"/>
 ```
 Cette valeur peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
 ## Mode de la variable
 Le [mode](../mode.md) par défaut d'une variable correspond au [mode](../mode.md) de la [famille](../family/README.md).
 Cas particuliers :
 - une variable à valeur automatiquement modifiée ou une variable en lecture seule automatique est par défaut en mode "basic".
 - si la variable n'est pas dans une famille, la variable aura le mode "normal" par défaut.
 - une variable obligatoire sans valeur par défaut (calculer ou non) aura le mode "basic".
 Pour définir le [mode](../mode.md) :
 ```
 <variable name="my_variable" mode="expert"/>
 ```
 ## Les variables qui fournissent des valeurs
 Il peut être intéressant de retrouver facilement des variables sans connaitre le chemin complet mais en utilisant le contenu du paramètre "provider".
 C'est particulièrement utile si un service peut être fournit par plusieurs services. Les variables n'auront donc pas le même nom. Utiliser ce paramètre, permet donc de retrouver facilement la variable.
 Pour déclarer :
 ```
 <variable name="my_variable" provider="my_function"/>
 ```
 Dans le code de l'application, on pourra retrouver le chemin de la variable en faisant :
 ```
 print(await config.information.get('provider:my_function'))
 ```
 Pour les variables inclusent dans une famille dynamique, le chemin de la variable sera un template comme ceci "rougail.family_{suffix}.my_variable_{suffix}". Il vous suffit de remplacer "{suffix}" par le suffix voulu de la famille dynamique.
--- a/doc/variable/choice.md
+++ b/doc/variable/choice.md
@ -1,91 +0,0 @@
 # Les variables à choix
 ## Une variable à choix
 Il est possible d'imposer une liste de valeur pour une variable particulière :
 ```
 <variable name="my_variable" type="choice">
  <choice>val1</choice>
  <choice>val2</choice>
  <choice>val3</choice>
 </variable>
 ```
 Dans ce cas, seules les valeurs proposées sont possibles pour cette variable.
 Cette variable n'est pas obligatoire dont il est possible de mettre la valeur "None".
 Si la variable est obligatoire ou si une valeur est précisée (la variable passe obligatoire) alors la valeur "None" n'est plus autorisé :
 ```
 <variable name="my_variable" type="choice">
  <choice>val1</choice>
  <choice>val2</choice>
  <choice>val3</choice>
  <value>val1</value>
 </variable>
 ```
 ## Un variable à choix typée
 Par défaut les choix sont de type "string". Il est possible de préciser des nombres, des booléens ou la valeur None :
 ```
 <variable name="my_variable" type="choice">
  <choice>val1</choice>
  <choice type="string">val2</choice>
  <choice type="number">3</choice>
  <choice type="boolean">True</choice>
  <choice type="nil"/>
 </variable>
 ```
 Comme vu précédement ajouter la valeur None n'est pas utile parce qu'elle est automatiquement ajouté si la variable n'est pas obligatoire.
 ## Ajouter une option à une variable à choix existante
 Pour ajouter un choix à une variable à choix existante, rien de plus simple, juste redéfinir la variable en ajoutant le choix voulu :
 ```
 <variable name="my_variable" redefine="True">
  <choice>val4</choice>
 </variable>
 ```
 ## Redéfinir une option à choix
 Si on veut supprimer un choix ou redéfinir complètement la liste, il faut redéfinir cette variable et ajouter l'attribut "remove_choice" à "True" :
 ```
 <variable name="my_variable" redefine="True" remove_choice="True">
  <choice>val1</choice>
  <choice>val2</choice>
 </variable>
 ```
 Dans ce cas toutes les anciens choix ne seront plus possible. Seuls les nouveaux le seront.
 ## Un variable à choix provenant d'une variable
 Une variable à valeur multiple peut servir de source des choix :
 ```
 <variable name="my_variable" type="choice">
  <choice type="variable">other_variable</choice>
 </variable>
 ```
 Dans ce cas, toutes les valeurs de la variable seront des choix utilisables par l'utilisateur.
 Seul un choice de type "variable" est possible par variable.
 ## Un variable à choix provenant d'une fonction
 ```
 <variable name="my_variable" type="choice">
  <choice type="function" name="trange">
    <param type="number">0</param>
    <param type="number">10</param>
  </choice>
  <value type="number">9</value>
 </variable>
 ```
--- a/doc/variable/leadership.md
+++ b/doc/variable/leadership.md
@ -60,17 +60,6 @@ Il est possible d'en définit d'autres :
 </constraints>
 ```
 ## Faire un calcul avec l'index de la variable meneuse
 Dans un calcul sur un variable suiveuse il est possible de récupérer l'index de la variable meneuse :
 ```
 <fill name="calc_val">
  <param type="index"/>
  <target>follower</target>
 </fill>
 ```
 ## Définition des variables meneuse et suiveuse dans un dictionnaire extra
 Voici un exemple de définition d'une variable meneuse et de deux variables meneuses dans un espace de nom "example" :
@ -85,15 +74,15 @@ Voici un exemple de définition d'une variable meneuse et de deux variables mene
 </variables>
 <constraints>
    <group leader="example.family.leader">
-    <follower>follower1</follower>
+        <follower>example.family.follower1</follower>
-    <follower>follower2</follower>
+        <follower>example.family.follower2</follower>
    </group>
 </constraints>
 ```
-Le chemin de la variable meneuse est traditionnel, par contre le chemin des variables suiveuses est le chemin relatif de la variable.
+Le chemin de la variable meneuse est traditionnel, par contre le chemin des variables suiveuses n'est pas le chemin définitif de la variable.
-Le chemin d'une variable suiveuse est normalement "example.family.leader.follower1" mais la variable n'est pas encore une variable suiveuse à ce moment là du traitement. C'est pour cela qu'il ne faut, uniquement dans les groupes, mettre le nom de la variable suiveuse.
+Le chemin d'une variable suiveuse est normalement "example.family.leader.follower1" mais la variable n'est pas encore une variable suiveuse à ce moment là du traitement. C'est pour cela qu'il ne faut, uniquement dans les groupes, mettre le nom de la variable meneuse dans le chemin.
 ## Ajout d'une nouvelle variable suiveuse
--- a/doc/variable/simple.md
+++ b/doc/variable/simple.md
@ -0,0 +1,255 @@
 # Variable
 ## Un variable
 Une variable est forcement dans [variables](../variables.md) ou dans une [famille](../family/README.md).
 Une variable est déjà un nom. C'est à dire qu'on pourra utiliser plus tard la variable via ce nom.
 ```
 <variables>
    <variable name="my_variable"/>
    <family name="my_family">
        <variable name="my_family_variable"/>
    </variable>
 </variables>
 ```
 ## Description et aide sur la variable
 En plus d'un nom, il est possible de mettre une "description" à la variable. C'est une information "utilisateur" qui nous permettra d'avoir des informations complémentaires sur le contenu de cette variable :
 ```
 <variable name="my_variable" description="This is a greate variable"/>
 ```
 En plus de la description, il est possible de préciser une aide complémentaire :
 ```
 <variable name="my_variable" help="This is a greate variable"/>
 ```
 Cette aide peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
 ## Le type de la variable
 Une variable a un type. Ce type permet de définir les valeurs acceptées par cette variable :
 - string : chaine de caractère (type par défaut)
 - number : un nombre
 - float : un chiffre flottant
 - boolean : "True" ou "False", si aucune valeur n'est défini la valeur par défaut de cette variable sera "True", ces variables sont également obligatoire par défaut
 - password : un mot de passe
 - mail : une adresse mail
 - filename : nom de fichier au sens Unix (exemple : "/etc/passwd")
 - date : une date au format "%Y-%m-%d" (exemple : "2021-01-30")
 - unix_user : nom d'utilisateur au sens Unix
 - ip : n'importe quelle adresse IPv4
 - cidr : n'importe quelle adresse IPv4 au format CIDR
 - local_ip : adresse IPv4 sur un réseau local, si l'adresse IPv4 n'est pas local, un warning sera afficher mais la valeur sera accepté tout de même
 - netmask : masque d'une adresse IPv4
 - network : adresse réseau
 - network_cidr : adresse réseau au format CIDR
 - broadcast : adresse de diffusion
 - netbios : nom netbios
 - domain : nom de domaine
 - hostname : nom d'hôte
 - web_address : adresse web (http://www.cadoles.com/)
 - port : port
 - mac : adresse MAC
 - schedule : périodicité du schedule, les valeurs possibles sont "none", "daily", "weekly" ou "monthly"
 - schedulemod : type de schedule, les valeurs possibles sont "pre" ou "post"
 Pour définir le type d'une variable :
 ```
 <variable name="my_variable" type="number"/>
 ```
 ## Variable à valeur multiple
 Par défaut une variable ne peut acceuillir qu'une seule valeur. Il peut être utile de pouvoir spécifier plusieurs valeurs à une même variable.
 Pour définir une variable à valeur multiple :
 ```
 <variable name="my_variable" multi="True"/>
 ```
 ## Variable invisible
 Il est possible de cacher une variable.
 Cacher une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service.
 Par contre cette variable sera accessibles lorsqu'on va l'utiliser.
 Pour cacher une variable :
 ```
 <variable name="my_variable" hidden="True"/>
 ```
 ## Variable désactive
 Il est possible de désactiver une variable.
 Désactiver une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service mais également lorsqu'on va l'utiliser.
 Pour désactiver une variable :
 ```
 <variable name="my_variable" disabled="True"/>
 ```
 ## Variable obligatoire
 Variable dont une valeur est requise :
 ```
 <variable name="my_variable" mandatory="True"/>
 ```
 Les variables booléans sont par défaut obligatoire. Pour qu'une variable booléan ne soit pas obligatoire il faut le préciser explicitement :
 ```
 <variable name="my_variable" type="boolean" mandatory="False"/>
 ```
 Les variables avec une valeur par défaut (non calculée) sont également automatiquement obligatoire.
 [Les variables à choix](../check/valid_enum.md) sans choix "None" sont également automatiquement obligatoire.
 ## Valeur par défaut d'une variable
 Il est possible de fixer les valeurs par défaut d'une variable :
 ```
 <variable name="my_variable">
    <value>value</value>
 </variable>
 ```
 Pour une variable multiple, il est possible de préciser plusieurs valeurs :
 ```
 <variable name="my_variable" multi="True">
    <value>value 1</value>
    <value>value 2</value>
 </variable>
 ```
 Si la variable n'est pas pas une [variable meneuse](leadership.md), la première valeur défini dans cette liste sera également la valeur par défaut proposé si on ajoute une nouvelle valeur à cette variable.
 Une valeur par défaut peut également être [une valeur calculer](../fill/README.md).
 ## Redéfinir une variable
 Il est possible de définir une variable dans un dictionnaire et de changer son comportement dans une second dictionnaire.
 Attention trois attributs ne sont redéfinisable :
 - name
 - type
 - multi
 Créons notre variable :
    <variable name="my_variable"/>
 Et redéfinisons là :
 ```
 <variable name="my_variable" redefine="True" description="New description"/>
 ```
 ## Créer une variable inexistante
 Il est parfois utile de créer une variable si elle n'existe pas dans un autre dictionnaire :
 ```
 <variable name="my_variable" exists="False"/>
 ```
 Si cette variable existe dans un autre dictionnaire, elle ne sera pas modifié ni recréé
 ## Redéfinir une variable si elle existe
 Parfois on veut pouvoir redéfinir une variable mais seulement dans le cas où elle existe déjà :
 ```
 <variable name="my_variable" redefine="True" exists="True" hidden="True"/>
 ```
 ## Variable à valeur automatiquement modifiée
 Une variable avec valeur automatiquement modifiée est une variable dont la valeur sera considéré comme modifié quand la propriété global "force_store_value" de Tiramisu est mise.
 Voici une variable a valeur automatiquement modifiée :
 ```
 <variable name="my_variable" auto_save="True">
    <value>my_value</value>
 </variable>
 ```
 Dans ce cas la valeur est fixée à la valeur actuelle.
 Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
 Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont automatiquement modifiées que si elles ont une valeurs.
 Une [variable meneuse ou suiveuse](leadership.md) ne peut pas avoir la propriété auto_save.
 ## Variable à valeur en lecture seule automatique
 Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand la [variable "server_deployed" passe à "True"](../dev/config.md).
 Voici un variable à valeur en lecture seule automatique :
 ```
 <variable name="server_deployed" type="boolean">
    <value>False</value>
 </variable>
 <variable name="my_variable" auto_freeze="True"/>
 ```
 Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.
 Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
 Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont en lecteur seul que si elles ont une valeurs.
 Une [variable meneuse ou suiveuse](leadership.md) ne peut pas avoir la propriété auto_freeze.
 ## Information "test"
 L'attribut "test" est un attribut spécial qui permet aux concepteurs d'un dictionnaire d'influancer le robot de test en précisant de valeurs utile à tester.
 Concrêtement, le contenu de cet attribut est enregister dans une "information" de l'option Tiramisu correspondante.
 Exemple :
 ```
 <variable name="my_variable" test="yes"/>
 ```
 Il est possible de préciser plusieurs valeurs avec le séparateur "|" :
 ```
 <variable name="my_variable" test="yes|no"/>
 ```
 Cette valeur peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
 ## Mode de la variable
 Le [mode](../mode.md) par défaut d'une variable correspond au [mode](../mode.md) de la [famille](../family/README.md).
 Cas particuliers :
 - une variable à valeur automatiquement modifiée ou une variable en lecture seule automatique est par défaut en mode "basic".
 - si la variable n'est pas dans une famille, la variable aura le mode "normal" par défaut.
 - une variable obligatoire sans valeur par défaut (calculer ou non) aura le mode "basic".
 Pour définir le [mode](../mode.md) :
 ```
 <variable name="my_variable" mode="expert"/>
 ```
--- a/src/rougail/annotator/init.py
+++ b/src/rougail/annotator/init.py
@ -24,70 +24,34 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from .variable import CONVERT_OPTION
+from .group import GroupAnnotator
-import importlib.resources
+from .service import ServiceAnnotator
-from os.path import dirname, join
+from .variable import VariableAnnotator, CONVERT_OPTION
-from ..utils import load_modules
+from .check import CheckAnnotator
-
+from .value import ValueAnnotator
-
+from .condition import ConditionAnnotator
-ANNOTATORS = None
+from .fill import FillAnnotator
-
+from .family import FamilyAnnotator
-
+from .property import PropertyAnnotator
 if not 'files' in dir(importlib.resources):
    # old python version
    class fake_files:
        def __init__(self, package):
            self.mod = []
            dir_package = dirname(importlib.resources._get_package(package).__file__)
            for mod in importlib.resources.contents(package):
                self.mod.append(join(dir_package, mod))
        def iterdir(self):
            return self.mod
    importlib.resources.files = fake_files
 def get_level(module):
    return module.level
 def get_annotators(annotators, module_name):
    annotators[module_name] = []
    for pathobj in importlib.resources.files(module_name).iterdir():
        path = str(pathobj)
        if not path.endswith('__') and not path.endswith('__.py'):
            module = load_modules(path)
            if 'Annotator' in dir(module):
                annotators[module_name].append(module.Annotator)
 class SpaceAnnotator:  # pylint: disable=R0903
    """Transformations applied on a object instance
    """
-    def __init__(self,
+    def __init__(self, objectspace, eosfunc_file):
-                 objectspace,
+        self.objectspace = objectspace
-                 eosfunc_files,
+        GroupAnnotator(objectspace)
-                 ):
+        ServiceAnnotator(objectspace)
-        global ANNOTATORS
+        VariableAnnotator(objectspace)
-        if ANNOTATORS is None:
+        CheckAnnotator(objectspace,
-            ANNOTATORS = {}
+                       eosfunc_file,
            get_annotators(ANNOTATORS, 'rougail.annotator')
            for extra_annotator in objectspace.rougailconfig['extra_annotators']:
                get_annotators(ANNOTATORS, extra_annotator)
        for extra_annotator in objectspace.rougailconfig['extra_annotators']:
            if extra_annotator not in ANNOTATORS:
                get_annotators(ANNOTATORS, extra_annotator)
        annotators = ANNOTATORS['rougail.annotator'].copy()
        for extra_annotator in objectspace.rougailconfig['extra_annotators']:
            annotators.extend(ANNOTATORS[extra_annotator])
        annotators = sorted(annotators, key=get_level)
        functions = []
        for eosfunc_file in eosfunc_files:
            functions.extend(dir(load_modules(eosfunc_file)))
        for annotator in annotators:
            annotator(objectspace,
                      functions,
                       )
        ConditionAnnotator(objectspace)
        FillAnnotator(objectspace,
                      eosfunc_file,
                      )
        ValueAnnotator(objectspace)
        FamilyAnnotator(objectspace)
        PropertyAnnotator(objectspace)
 __all__ = ('SpaceAnnotator', 'CONVERT_OPTION')
--- a/src/rougail/annotator/check.py
+++ b/src/rougail/annotator/check.py
@ -25,24 +25,22 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 from typing import List, Any
 from copy import copy
-from rougail.annotator.target import TargetAnnotator
+from .target import TargetAnnotator
-from rougail.annotator.param import ParamAnnotator
+from .param import ParamAnnotator
-from rougail.i18n import _
+from ..utils import load_modules
-from rougail.error import DictConsistencyError, display_xmlfiles
+from ..i18n import _
 from ..error import DictConsistencyError, display_xmlfiles
-INTERNAL_FUNCTIONS = ['valid_in_network', 'valid_differ', 'valid_entier']
+INTERNAL_FUNCTIONS = ['valid_enum', 'valid_in_network', 'valid_differ', 'valid_entier']
-class Annotator(TargetAnnotator, ParamAnnotator):
+class CheckAnnotator(TargetAnnotator, ParamAnnotator):
    """Annotate check
    """
    level = 40
    def __init__(self,
                 objectspace,
-                 functions,
+                 eosfunc_file,
                 *args,
                 ):
        if not hasattr(objectspace.space, 'constraints') or \
                not hasattr(objectspace.space.constraints, 'check'):
@ -50,7 +48,7 @@ class Annotator(TargetAnnotator, ParamAnnotator):
        self.objectspace = objectspace
        self.let_none = True
        self.only_variable = True
-        self.functions = copy(functions)
+        self.functions = dir(load_modules(eosfunc_file))
        self.functions.extend(INTERNAL_FUNCTIONS)
        self.functions.extend(self.objectspace.rougailconfig['internal_functions'])
        self.target_is_uniq = False
@ -58,11 +56,21 @@ class Annotator(TargetAnnotator, ParamAnnotator):
        self.convert_target(self.objectspace.space.constraints.check)
        self.convert_param(self.objectspace.space.constraints.check)
        self.check_check()
        self.check_valid_enum()
        self.check_change_warning()
        self.convert_valid_entier()
        self.convert_check()
        del objectspace.space.constraints.check
    def valid_type_validation(self,
                              obj,
                              ) -> None:
        variable_type = None
        if obj.name == 'valid_enum':
            for target in obj.target:
                variable_type = target.name.type
        return variable_type
    def check_check(self):  # pylint: disable=R0912
        """valid and manage <check>
        """
@ -77,6 +85,119 @@ class Annotator(TargetAnnotator, ParamAnnotator):
        for idx in remove_indexes:
            del self.objectspace.space.constraints.check[idx]
    def check_valid_enum(self):
        """verify valid_enum
        """
        remove_indexes = []
        for idx, check in enumerate(self.objectspace.space.constraints.check):
            if check.name != 'valid_enum':
                continue
            for target in check.target:
                if target.name.path in self.objectspace.valid_enums:
                    check_xmlfiles = display_xmlfiles(self.objectspace.valid_enums\
                            [target.name.path]['xmlfiles'])
                    msg = _(f'valid_enum already set in {check_xmlfiles} '
                            f'for "{target.name.name}", you may have forget remove_check')
                    raise DictConsistencyError(msg, 3, check.xmlfiles)
                if not hasattr(check, 'param'):
                    msg = _(f'param is mandatory for a valid_enum of variable "{target.name.name}"')
                    raise DictConsistencyError(msg, 4, check.xmlfiles)
                variable_type = target.name.type
                values = self._set_valid_enum(target.name,
                                              check,
                                              )
                if values:
                    if hasattr(target.name, 'value'):
                        # check value
                        self.check_valid_enum_value(target.name, values)
                    else:
                        # no value, set the first choice as default value
                        new_value = self.objectspace.value(check.xmlfiles)
                        new_value.name = values[0]
                        new_value.type = variable_type
                        target.name.value = [new_value]
            remove_indexes.append(idx)
        remove_indexes.sort(reverse=True)
        for idx in remove_indexes:
            del self.objectspace.space.constraints.check[idx]
    def _set_valid_enum(self,
                        variable,
                        check,
                        ) -> List[Any]:
        # build choice
        variable.values = []
        variable.ori_type = variable.type
        variable.type = 'choice'
        has_variable = False
        values = []
        has_nil = False
        is_function = False
        for param in check.param:
            if has_variable:
                msg = _(f'only one "variable" parameter is allowed for valid_enum '
                        f'of variable "{variable.name}"')
                raise DictConsistencyError(msg, 5, param.xmlfiles)
            if param.type == 'function':
                is_function = True
                choice = self.objectspace.choice(variable.xmlfiles)
                choice.name = param.text
                choice.type = 'function'
                choice.param = []
                variable.values.append(choice)
                continue
            if is_function:
                variable.values[0].param.append(param)
                continue
            param_type = variable.ori_type
            if param.type == 'variable':
                has_variable = True
                if param.optional is True:
                    msg = _(f'optional parameter in valid_enum for variable "{variable.name}" '
                            f'is not allowed')
                    raise DictConsistencyError(msg, 14, param.xmlfiles)
                if not param.text.multi:
                    msg = _(f'only multi "variable" parameter is allowed for valid_enum '
                            f'of variable "{variable.name}"')
                    raise DictConsistencyError(msg, 6, param.xmlfiles)
                param_type = 'variable'
            elif param.type == 'nil':
                has_nil = True
            values.append(param.text)
            choice = self.objectspace.choice(variable.xmlfiles)
            choice.name = param.text
            choice.type = param_type
            variable.values.append(choice)
        if is_function:
            return None
        if 'mandatory' not in vars(variable):
            variable.mandatory = not has_nil
        elif variable.mandatory is False:
            choice = self.objectspace.choice(variable.xmlfiles)
            choice.name = None
            choice.type = 'nil'
            variable.values.append(choice)
        if has_variable:
            return None
        self.objectspace.valid_enums[variable.path] = {'type': variable.ori_type,
                                                       'values': values,
                                                       'xmlfiles': check.xmlfiles,
                                                       }
        return values
    @staticmethod
    def check_valid_enum_value(variable,
                               values,
                               ) -> None:
        """check that values in valid_enum are valid
        """
        for value in variable.value:
            if value.name not in values:
                msg = _(f'value "{value.name}" of variable "{variable.name}" is not in list '
                        f'of all expected values ({values})')
                raise DictConsistencyError(msg, 15, value.xmlfiles)
    def check_change_warning(self):
        """convert level to "warnings_only"
        """
@ -99,8 +220,6 @@ class Annotator(TargetAnnotator, ParamAnnotator):
                if param.type != 'number':
                    msg = _(f'param in "valid_entier" must be an "integer", not "{param.type}"')
                    raise DictConsistencyError(msg, 18, check.xmlfiles)
                if not hasattr(param, 'name'):
                    continue
                for target in check.target:
                    if param.name == 'mini':
                        target.name.min_number = int(param.text)
--- a/src/rougail/annotator/condition.py
+++ b/src/rougail/annotator/condition.py
@ -27,21 +27,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from typing import List
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.annotator.target import TargetAnnotator
+from .target import TargetAnnotator
-from rougail.annotator.param import ParamAnnotator
+from .param import ParamAnnotator
-from rougail.annotator.variable import Walk
+from .variable import Walk
-class Annotator(TargetAnnotator, ParamAnnotator, Walk):
+class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
    """Annotate condition
    """
    level = 50
    def __init__(self,
                 objectspace,
                 *args,
                 ):
        self.objectspace = objectspace
        self.force_service_value = {}
@ -67,7 +65,7 @@ class Annotator(TargetAnnotator, ParamAnnotator, Walk):
                              obj,
                              ) -> None:
        if obj.source.type == 'choice':
-            return None
+            return obj.source.ori_type
        return obj.source.type
    def convert_auto_freeze(self):
@ -164,12 +162,13 @@ class Annotator(TargetAnnotator, ParamAnnotator, Walk):
                return target.name, [target.name]
            # it's a leader, so apply property to leadership
            family_name = self.objectspace.paths.get_variable_family_path(target.name.path)
-            namespace = target.name.namespace
+            family = self.objectspace.paths.get_family(family_name,
-        else:
+                                                       target.name.namespace,
-            family_name = target.name.path
+                                                       )
-            namespace = target.namespace
+            return family, family.variable
-        variable = self.objectspace.paths.get_family(family_name,
+        # it's a family
-                                                     namespace,
+        variable = self.objectspace.paths.get_family(target.name.path,
                                                     target.namespace,
                                                     )
        if hasattr(variable, 'variable'):
            return variable, list(variable.variable.values())
--- a/src/rougail/annotator/family.py
+++ b/src/rougail/annotator/family.py
@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.annotator.variable import Walk
+from .variable import Walk
 class Mode:  # pylint: disable=R0903
@ -43,13 +43,11 @@ class Mode:  # pylint: disable=R0903
        return other.level < self.level
-class Annotator(Walk):
+class FamilyAnnotator(Walk):
    """Annotate family
    """
    level = 80
    def __init__(self,
                 objectspace,
                 *args,
                 ):
        self.objectspace = objectspace
        if not hasattr(self.objectspace.space, 'variables'):
@ -76,7 +74,6 @@ class Annotator(Walk):
    def remove_empty_families(self) -> None:
        """Remove all families without any variable
        """
        #FIXME pas sous family
        for families in self.objectspace.space.variables.values():
            removed_families = []
            for family_name, family in families.variable.items():
@ -120,7 +117,7 @@ class Annotator(Walk):
                   obj,
                   ) -> None:
        modes_level = self.objectspace.rougailconfig['modes_level']
-        if self._has_mode(obj) and obj.mode not in modes_level:
+        if hasattr(obj, 'mode') and obj.mode not in modes_level:
            msg = _(f'mode "{obj.mode}" for "{obj.name}" is not a valid mode, '
                    f'valid modes are {modes_level}')
            raise DictConsistencyError(msg, 71, obj.xmlfiles)
@ -128,29 +125,23 @@ class Annotator(Walk):
    def _set_default_mode(self,
                         family: 'self.objectspace.family',
                         ) -> None:
-        if not hasattr(family, 'variable'):
+        if hasattr(family, 'mode') and 'mode' in vars(family):
            return
        if self._has_mode(family):
            family_mode = family.mode
        else:
            family_mode = None
-        leader = None
+        if not hasattr(family, 'variable'):
            return
        for variable in family.variable.values():
-            if leader is None and hasattr(family, 'leadership') and family.leadership:
+            self.valid_mode(variable)
                leader = variable
            if isinstance(variable, self.objectspace.family):
                # set default mode a subfamily
                if family_mode and not self._has_mode(variable):
                    self._set_auto_mode(variable, family_mode)
                continue
            if isinstance(variable, self.objectspace.leadership):
                func = self._set_default_mode_leader
            else:
-                # set default mode to a variable
+                func = self._set_default_mode_variable
-                self.valid_mode(variable)
+            func(variable, family_mode)
                if leader:
                    self._set_default_mode_leader(leader, variable)
                self._set_default_mode_variable(variable, family_mode)
        if leader:
            # here because follower can change leader mode
            self._set_auto_mode(family, leader.mode)
    @staticmethod
    def _has_mode(obj) -> bool:
@ -180,35 +171,45 @@ class Annotator(Walk):
        obj.mode_auto = True
    def _set_default_mode_leader(self,
-                                 leader: 'self.objectspace.variable',
+                                 leadership: 'self.objectspace.leadership',
-                                 follower: 'self.objectspace.variable',
+                                 family_mode: str,
                                 ) -> None:
        leader_mode = None
        for follower in leadership.variable:
            self.valid_mode(follower)
            if follower.auto_save is True:
                msg = _(f'leader/followers "{follower.name}" could not be auto_save')
-            raise DictConsistencyError(msg, 29, follower.xmlfiles)
+                raise DictConsistencyError(msg, 29, leadership.xmlfiles)
            if follower.auto_freeze is True:
                msg = f'leader/followers "{follower.name}" could not be auto_freeze'
-            raise DictConsistencyError(_(msg), 30, follower.xmlfiles)
+                raise DictConsistencyError(_(msg), 30, leadership.xmlfiles)
-        if leader == follower:
+            if leader_mode is not None:
-            # it's a leader
+                if hasattr(follower, 'mode'):
            if not hasattr(leader, 'mode'):
                self._set_auto_mode(leader, self.objectspace.rougailconfig['default_variable_mode'])
            return
        if self._has_mode(follower):
                    follower_mode = follower.mode
                else:
                    follower_mode = self.objectspace.rougailconfig['default_variable_mode']
-        if self.modes[leader.mode] > self.modes[follower_mode]:
+                if self.modes[leader_mode] > self.modes[follower_mode]:
-            if self._has_mode(follower) and not self._has_mode(leader):
+                    if self._has_mode(follower) and not self._has_mode(leadership.variable[0]):
                        # if follower has mode but not the leader
-                self._set_auto_mode(leader, follower_mode)
+                        self._set_auto_mode(leadership.variable[0], follower_mode)
                    else:
                        # leader's mode is minimum level
                        if self._has_mode(follower):
                            msg = _(f'the follower "{follower.name}" is in "{follower_mode}" mode '
-                            f'but leader have the higher mode "{leader.mode}"')
+                                    f'but leader have the higher mode "{leader_mode}"')
                            raise DictConsistencyError(msg, 63, follower.xmlfiles)
-                self._set_auto_mode(follower, leader.mode)
+                        self._set_auto_mode(follower, leader_mode)
            self._set_default_mode_variable(follower,
                                            family_mode,
                                            )
            if leader_mode is None:
                if hasattr(leadership.variable[0], 'mode'):
                    leader_mode = leadership.variable[0].mode
                else:
                    leader_mode = self.objectspace.rougailconfig['default_variable_mode']
        if hasattr(leadership.variable[0], 'mode'):
            leader_mode = leadership.variable[0].mode
        self._set_auto_mode(leadership, leader_mode)
    def _change_family_mode(self,
                           family: 'self.objectspace.family',
@ -219,41 +220,39 @@ class Annotator(Walk):
            family_mode = self.objectspace.rougailconfig['default_family_mode']
        min_variable_mode = self.objectspace.rougailconfig['modes_level'][-1]
        # change variable mode, but not if variables are not in a family
        is_leadership = hasattr(family, 'leadership') and family.leadership
        if hasattr(family, 'variable'):
-            for idx, variable in enumerate(family.variable.values()):
+            for variable in family.variable.values():
-                if isinstance(variable, self.objectspace.family):
+                if not isinstance(variable, self.objectspace.family):
-                    if not hasattr(variable, 'mode'):
+                    if isinstance(variable, self.objectspace.leadership):
-                        variable.mode = self.objectspace.rougailconfig['default_family_mode']
+                        func = self._change_variable_mode_leader
                elif idx == 0 and is_leadership:
                    variable.mode = None
                    continue
                    else:
-                    self._change_variable_mode(variable, family_mode, is_leadership)
+                        func = self._change_variable_mode
                    func(variable,
                         family_mode,
                         )
                elif not hasattr(variable, 'mode'):
                    variable.mode = self.objectspace.rougailconfig['default_family_mode']
                if self.modes[min_variable_mode] > self.modes[variable.mode]:
                    min_variable_mode = variable.mode
-        if not isinstance(family, self.objectspace.family) or is_leadership:
+        if isinstance(family, self.objectspace.family) and \
-            # it's Variable, Service, ... and leadership
+                (not hasattr(family, 'mode') or family.mode != min_variable_mode):
            return
        if not hasattr(family, 'mode'):
            # set the lower variable mode to family
-            self._set_auto_mode(family, min_variable_mode)
+            if self._has_mode(family):
        if family.mode != min_variable_mode:
                msg = _(f'the family "{family.name}" is in "{family.mode}" mode but variables and '
                        f'families inside have the higher modes "{min_variable_mode}"')
                raise DictConsistencyError(msg, 62, family.xmlfiles)
            self._set_auto_mode(family, min_variable_mode)
    def _change_variable_mode(self,
                             variable,
                             family_mode: str,
                             is_follower: bool,
                             ) -> None:
        if hasattr(variable, 'mode'):
            variable_mode = variable.mode
        else:
            variable_mode = self.objectspace.rougailconfig['default_variable_mode']
        # none basic variable in high level family has to be in high level
-        if not is_follower and self.modes[variable_mode] < self.modes[family_mode]:
+        if self.modes[variable_mode] < self.modes[family_mode]:
            if self._has_mode(variable):
                msg = _(f'the variable "{variable.name}" is in "{variable_mode}" mode '
                        f'but family has the higher family mode "{family_mode}"')
@ -262,20 +261,30 @@ class Annotator(Walk):
        if not hasattr(variable, 'mode'):
            variable.mode = variable_mode
    def _change_variable_mode_leader(self,
                                     leadership,
                                     family_mode: str,
                                     ) -> None:
        for follower in leadership.variable:
            self._change_variable_mode(follower,
                                      family_mode,
                                      )
        leadership.variable[0].mode = None
    def dynamic_families(self):
        """link dynamic families to object
        """
        for family in self.get_families():
            if 'dynamic' not in vars(family):
                continue
-            family.suffixes = self.objectspace.paths.get_variable(family.dynamic, family.xmlfiles)
+            family.suffixes = self.objectspace.paths.get_variable(family.dynamic)
            del family.dynamic
            if not family.suffixes.multi:
                msg = _(f'dynamic family "{family.name}" must be linked '
                        f'to multi variable')
                raise DictConsistencyError(msg, 16, family.xmlfiles)
            for variable in family.variable.values():
-                if isinstance(variable, self.objectspace.family) and not variable.leadership:
+                if isinstance(variable, self.objectspace.family):
                    msg = _(f'dynamic family "{family.name}" cannot contains another family')
                    raise DictConsistencyError(msg, 22, family.xmlfiles)
--- a/src/rougail/annotator/fill.py
+++ b/src/rougail/annotator/fill.py
@ -24,34 +24,30 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from copy import copy
+from ..utils import load_modules
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.annotator.target import TargetAnnotator
+from .target import TargetAnnotator
-from rougail.annotator.param import ParamAnnotator
+from .param import ParamAnnotator
-CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename', 'zone_information', 'get_certificates', 'nsd_filename', 'get_linked_configuration', 'get_internal_zones', 'nsd_concat_lists', 'get_internal_info_in_zone')
+CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename')
-class Annotator(TargetAnnotator, ParamAnnotator):
+class FillAnnotator(TargetAnnotator, ParamAnnotator):
    """Fill annotator
    """
    level = 60
    def __init__(self,
                 objectspace,
-                 functions,
+                 eosfunc_file,
                 *args,
                 ):
        if not hasattr(objectspace.space, 'constraints') or \
                not hasattr(objectspace.space.constraints, 'fill'):
            return
        self.objectspace = objectspace
-        self.functions = copy(functions)
+        if not hasattr(objectspace.space, 'constraints') or \
                not hasattr(self.objectspace.space.constraints, 'fill'):
            return
        self.functions = dir(load_modules(eosfunc_file))
        self.functions.extend(self.objectspace.rougailconfig['internal_functions'])
        self.calc_multi = list(CALC_MULTI)
        self.calc_multi.extend(self.objectspace.rougailconfig['multi_functions'])
        self.target_is_uniq = True
        self.only_variable = True
        self.allow_function = False
@ -72,16 +68,17 @@ class Annotator(TargetAnnotator, ParamAnnotator):
        """valid and manage <fill>
        """
        for fill in self.objectspace.space.constraints.fill:
            for target in fill.target:
                # test if the function exists
                if fill.name not in self.functions:
                    msg = _(f'cannot find fill function "{fill.name}"')
                    raise DictConsistencyError(msg, 25, fill.xmlfiles)
-            for target in fill.target:
+
                # create an object value
                value = self.objectspace.value(fill.xmlfiles)
                value.type = 'calculation'
                value.name = fill.name
-                if fill.name not in self.calc_multi:
+                if fill.name not in CALC_MULTI:
                    is_calc_multi = self.calc_is_multi(target.name)
                else:
                    is_calc_multi = False
@ -90,6 +87,7 @@ class Annotator(TargetAnnotator, ParamAnnotator):
                    target.name.default = value
                else:
                    target.name.value = [value]
                # manage params
                if hasattr(fill, 'param') and fill.param:
                    value.param = fill.param
--- a/src/rougail/annotator/group.py
+++ b/src/rougail/annotator/group.py
@ -24,54 +24,137 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.utils import normalize_family
+from ..utils import normalize_family
 from rougail.annotator.variable import Walk
-class Annotator(Walk):
+class GroupAnnotator:
    """Annotate group
    """
    level = 10
    def __init__(self,
                 objectspace,
                 *args,
                 ):
        if not hasattr(objectspace.space, 'variables'):
            return
        self.objectspace = objectspace
        if not hasattr(self.objectspace.space, 'constraints') or \
                not hasattr(self.objectspace.space.constraints, 'group'):
            return
        self.convert_groups()
    def convert_groups(self):  # pylint: disable=C0111
        """convert groups
        """
        # store old leaders family name
-        for family in self.get_families():
+        cache_paths = {}
-            if not isinstance(family, self.objectspace.family):
+        for group in self.objectspace.space.constraints.group:
-                continue
+            if group.leader in cache_paths:
-            if not family.leadership:
+                leader_fam_path = cache_paths[group.leader]
-                continue
+            else:
-            if hasattr(family, 'dynamic'):
+                leader_fam_path = self.objectspace.paths.get_variable_family_path(group.leader, group.xmlfiles)
-                msg = _(f'the family "{family.name}" cannot be leadership and dynamic together')
+                cache_paths[group.leader] = leader_fam_path
-                raise DictConsistencyError(msg, 31, family.xmlfiles)
+            follower_names = list(group.follower.keys())
-            for idx, variable in enumerate(family.variable.values()):
+            leader = self.objectspace.paths.get_variable(group.leader)
-                if idx == 0:
+            if '.' not in leader_fam_path:
                # it's a namespace
                ori_leader_family = self.objectspace.space.variables[leader_fam_path]
            else:
                # it's a sub family
                ori_leader_family = self.objectspace.paths.get_family(leader_fam_path,
                                                                      leader.namespace,
                                                                      )
            has_a_leader = False
            for variable in list(ori_leader_family.variable.values()):
                if isinstance(variable, self.objectspace.leadership) and \
                        variable.variable[0].name == leader.name:
                    # append follower to an existed leadership
                    leader_space = variable
                    has_a_leader = True
                elif variable.name == leader.name:
                    # it's a leader
                    leader_space = self.manage_leader(variable,
                                                      group,
                                                      ori_leader_family,
                                                      )
                    has_a_leader = True
                elif has_a_leader:
                    # it's should be a follower
                    self.manage_follower(follower_names.pop(0),
                                         leader_fam_path,
                                         variable,
                                         leader_space,
                                         )
                    # this variable is not more in ori_leader_family
                    ori_leader_family.variable.pop(normalize_family(variable.name))
                    if follower_names == []:
                        # no more follower
                        break
            else:
                joined = '", "'.join(follower_names)
                msg = _(f'when parsing leadership, we espect to find those followers "{joined}"')
                raise DictConsistencyError(msg, 31, variable.xmlfiles)
        del self.objectspace.space.constraints.group
    def manage_leader(self,
                      variable: 'Variable',
                      group: 'Group',
                      ori_leader_family,
                      ) -> 'Leadership':
        """manage leader's variable
        """
        if variable.multi is not True:
-                        msg = _(f'the variable "{variable.name}" in a leadership must be multi')
+            msg = _(f'the variable "{variable.name}" in a group must be multi')
            raise DictConsistencyError(msg, 32, variable.xmlfiles)
-                    family.hidden = variable.hidden
+        if hasattr(group, 'name'):
            ori_leadership_name = group.name
        else:
            ori_leadership_name = variable.name
        leadership_name = normalize_family(ori_leadership_name)
        leader_space = self.objectspace.leadership(variable.xmlfiles)
        leader_space.variable = []
        leader_space.name = leadership_name
        leader_space.hidden = variable.hidden
        if variable.hidden:
            variable.frozen = True
            variable.force_default_on_freeze = True
        variable.hidden = None
        if hasattr(group, 'description'):
            leader_space.doc = group.description
        elif variable.name == leadership_name and hasattr(variable, 'description'):
            leader_space.doc = variable.description
        else:
-                    # it's a follower
+            leader_space.doc = ori_leadership_name
-                    if family.hidden:
+        leadership_path = ori_leader_family.path + '.' + leadership_name
        self.objectspace.paths.add_leadership(variable.namespace,
                                              leadership_path,
                                              leader_space,
                                              )
        ori_leader_family.variable[normalize_family(variable.name)] = leader_space
        leader_space.variable.append(variable)
        self.objectspace.paths.set_leader(variable.namespace,
                                          ori_leader_family.path,
                                          leadership_name,
                                          normalize_family(variable.name),
                                          )
        return leader_space
    def manage_follower(self,
                        follower_name: str,
                        leader_family_name: str,
                        variable: 'Variable',
                        leader_space: 'Leadership',
                        ) -> None:
        """manage follower
        """
        if variable.name != follower_name:
            msg = _('when parsing leadership, we expect to find the follower '
                    f'"{follower_name}" but we found "{variable.name}"')
            raise DictConsistencyError(msg, 33, variable.xmlfiles)
        self.objectspace.paths.set_leader(variable.namespace,
                                          leader_family_name,
                                          leader_space.name,
                                          normalize_family(variable.name),
                                          )
        if leader_space.hidden:
            variable.frozen = True
            variable.force_default_on_freeze = True
-                    if variable.multi is True:
+        leader_space.variable.append(variable)
                        variable.multi = 'submulti'
                    else:
                        variable.multi = True
--- a/src/rougail/annotator/param.py
+++ b/src/rougail/annotator/param.py
@ -29,10 +29,10 @@ try:
 except ModuleNotFoundError:
    import tiramisu
-from rougail.annotator.variable import CONVERT_OPTION
+from .variable import CONVERT_OPTION
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
 class ParamAnnotator:
@ -59,7 +59,7 @@ class ParamAnnotator:
                    if param.type in ['suffix', 'index']:
                        msg = _(f'"{param.type}" parameter must not have a value')
                        raise DictConsistencyError(msg, 28, obj.xmlfiles)
-                    if param.type in ['nil', 'space']:
+                    if param.type == 'nil':
                        if param.text is not None:
                            msg = _(f'"{param.type}" parameter must not have a value')
                            raise DictConsistencyError(msg, 40, obj.xmlfiles)
@ -102,11 +102,8 @@ class ParamAnnotator:
                if param.type == 'suffix':
                    for target in obj.target:
                        if not self.objectspace.paths.variable_is_dynamic(target.name.path):
                            target_name = target.name
                            if isinstance(target_name, self.objectspace.variable):
                                target_name = target_name.name
                            msg = _(f'"{param.type}" parameter cannot be set with target '
-                                    f'"{target_name}" which is not a dynamic variable')
+                                    f'"{target.name}" which is not a dynamic variable')
                            raise DictConsistencyError(msg, 53, obj.xmlfiles)
                elif param.type == 'index':
                    for target in obj.target:
@ -116,9 +113,6 @@ class ParamAnnotator:
                            raise DictConsistencyError(msg, 60, obj.xmlfiles)
                elif param.type == 'nil':
                    param.text = None
                elif param.type == 'space':
                    param.type = 'string'
                    param.text = ' '
                elif param.type == 'string':
                    param.text = ''
                    if variable_type:
@ -138,7 +132,6 @@ class ParamAnnotator:
            msg = _(f'parameter has incompatible type "{param.type}" '
                    f'with type "{variable_type}"')
            raise DictConsistencyError(msg, 7, param.xmlfiles)
        if variable_type != 'choice':
        try:
            option = CONVERT_OPTION[variable_type]
            param.text = option.get('func', str)(param.text)
--- a/src/rougail/annotator/property.py
+++ b/src/rougail/annotator/property.py
@ -24,23 +24,19 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.annotator.variable import Walk
+from .variable import Walk
 PROPERTIES = ('hidden', 'frozen', 'force_default_on_freeze',
              'force_store_value', 'disabled', 'mandatory')
-class Annotator(Walk):
+class PropertyAnnotator(Walk):
    """Annotate properties
    """
-    level = 90
+    def __init__(self, objectspace):
    def __init__(self,
                 objectspace,
                 *args
                 ) -> None:
        self.objectspace = objectspace
        if hasattr(self.objectspace.space, 'services'):
            self.convert_services()
@ -56,13 +52,11 @@ class Annotator(Walk):
        # hidden variable is also frozen
        if isinstance(variable, self.objectspace.variable) and variable.hidden is True and \
                variable.name != self.objectspace.rougailconfig['auto_freeze_variable']:
-            if not variable.auto_freeze and \
+            if not variable.auto_freeze:
                    not hasattr(variable, 'provider'):
                variable.frozen = True
            if not variable.auto_save and \
                    not variable.auto_freeze and \
-                    'force_default_on_freeze' not in vars(variable) and \
+                    'force_default_on_freeze' not in vars(variable):
                    not hasattr(variable, 'provider'):
                variable.force_default_on_freeze = True
        if not hasattr(variable, 'properties'):
            variable.properties = []
@ -108,5 +102,8 @@ class Annotator(Walk):
    def convert_variable(self) -> None:
        """convert variables
        """
-        for variable in self.get_variables():
+        for variable in self.get_variables(with_leadership=True):
            if isinstance(variable, self.objectspace.leadership):
                for follower in variable.variable:
                    self.convert_property(follower)
            self.convert_property(variable)
--- a/src/rougail/annotator/service.py
+++ b/src/rougail/annotator/service.py
@ -27,17 +27,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from os.path import basename
 from typing import Tuple
-from rougail.i18n import _
+from ..i18n import _
-from rougail.utils import normalize_family
+from ..utils import normalize_family
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
 from ..config import RougailConfig
 # a object's attribute has some annotations
 # that shall not be present in the exported (flatened) XML
-ERASED_ATTRIBUTES = ('redefine', 'namespace', 'xmlfiles', 'disabled', 'name', 'manage')
+ERASED_ATTRIBUTES = ('redefine', 'exists', 'optional', 'remove_check', 'namespace',
-ERASED_ATTRIBUTES2 = ('redefine', 'namespace', 'xmlfiles', 'disabled')
+                     'remove_condition', 'path', 'instance_mode', 'index',
-ALLOW_ATTRIBUT_NOT_MANAGE = ['file', 'engine', 'target']
+                     'level', 'remove_fill', 'xmlfiles', 'type', 'reflector_name',
                     'reflector_object',)
 ALLOW_ATTRIBUT_NOT_MANAGE = ['file']
-class Annotator:
+class ServiceAnnotator:
    """Manage service's object
    for example::
        <services>
@ -47,11 +50,7 @@ class Annotator:
            </service>
        </services>
    """
-    level = 20
+    def __init__(self, objectspace):
    def __init__(self,
                 objectspace,
                 *args,
                 ) -> None:
        self.objectspace = objectspace
        self.uniq_overrides = []
        if 'network_type' not in self.objectspace.types:
@ -70,16 +69,14 @@ class Annotator:
        self.objectspace.space.services.doc = 'services'
        self.objectspace.space.services.path = 'services'
        for service_name, service in self.objectspace.space.services.service.items():
            service.name = normalize_family(service_name)
            activate_obj = self._generate_element('boolean',
                                                  None,
                                                  None,
                                                  'activate',
-                                                  not service.disabled,
+                                                  True,
                                                  service,
-                                                  '.'.join(['services', service.name, 'activate']),
+                                                  '.'.join(['services', normalize_family(service_name), 'activate']),
                                                  )
            service.disabled = None
            for elttype, values in dict(vars(service)).items():
                if elttype == 'servicelist':
                    self.objectspace.list_conditions.setdefault('servicelist',
@ -87,21 +84,19 @@ class Annotator:
                                                                    values,
                                                                    []).append(activate_obj)
                    continue
-                if elttype in ERASED_ATTRIBUTES:
+                if not isinstance(values, (dict, list)) or elttype in ERASED_ATTRIBUTES:
                    continue
                if not service.manage and elttype not in ALLOW_ATTRIBUT_NOT_MANAGE:
                    msg = _(f'unmanage service cannot have "{elttype}"')
                    raise DictConsistencyError(msg, 66, service.xmlfiles)
                if isinstance(values, (dict, list)):
                if elttype != 'ip':
                    eltname = elttype + 's'
                else:
                    eltname = elttype
-                    path = '.'.join(['services', service.name, eltname])
+                path = '.'.join(['services', normalize_family(service_name), eltname])
                family = self._gen_family(eltname,
                                          path,
                                          service.xmlfiles,
                                              with_informations=False,
                                          )
                if isinstance(values, dict):
                    values = list(values.values())
@ -111,21 +106,16 @@ class Annotator:
                                                          path,
                                                          )
                setattr(service, elttype, family)
                else:
                    if not hasattr(service, 'information'):
                        service.information = self.objectspace.information(service.xmlfiles)
                    setattr(service.information, elttype, values)
            service.path = '.'.join(['services', service.name])
            manage = self._generate_element('boolean',
                                            None,
                                            None,
                                            'manage',
                                            service.manage,
                                            service,
-                                            '.'.join(['services', service.name, 'manage']),
+                                            '.'.join(['services', normalize_family(service_name), 'manage']),
                                                  )
            service.variable = [activate_obj, manage]
-            service.doc = service_name
+            service.doc = service.name
    def make_group_from_elts(self,
                             service_name,
@ -153,20 +143,16 @@ class Annotator:
                                      elt.xmlfiles,
                                      )
            family.variable = []
            if hasattr(elt, 'disabled'):
                disabled = elt.disabled
            else:
                disabled = False
            activate_obj = self._generate_element('boolean',
                                                  None,
                                                  None,
                                                  'activate',
-                                                  not disabled,
+                                                  True,
                                                  elt,
                                                  '.'.join([subpath, 'activate']),
                                                  )
            for key in dir(elt):
-                if key.startswith('_') or key.endswith('_type') or key in ERASED_ATTRIBUTES2:
+                if key.startswith('_') or key.endswith('_type') or key in ERASED_ATTRIBUTES:
                    continue
                value = getattr(elt, key)
                if key == listname:
@ -179,8 +165,7 @@ class Annotator:
                    dtd_key_type = elttype + '_type'
                else:
                    dtd_key_type = key + '_type'
-                elt_type = getattr(elt, dtd_key_type, None)
+                elt_type = getattr(elt, dtd_key_type, 'string')
                if elt_type:
                if elt_type == 'variable':
                    elt_type = 'symlink'
                family.variable.append(self._generate_element(elt_type,
@ -191,9 +176,6 @@ class Annotator:
                                                              elt,
                                                              f'{subpath}.{key}'
                                                              ))
                else:
                    setattr(family.information, key, value)
            family.variable.append(activate_obj)
            families.append(family)
        return families
@ -223,8 +205,7 @@ class Annotator:
    def _gen_family(self,
                    name,
                    path,
-                    xmlfiles,
+                    xmlfiles
                    with_informations=True,
                    ):
        family = self.objectspace.family(xmlfiles)
        family.name = normalize_family(name)
@ -235,8 +216,6 @@ class Annotator:
                                          family,
                                          None,
                                          )
        if with_informations:
            family.information = self.objectspace.information(xmlfiles)
        return family
    def _generate_element(self,
@ -253,7 +232,7 @@ class Annotator:
        variable.mode = None
        variable.type = type_
        if type_ == 'symlink':
-            variable.opt = self.objectspace.paths.get_variable(value, xmlfiles=elt.xmlfiles)
+            variable.opt = self.objectspace.paths.get_variable(value)
            variable.multi = None
            needed_type = self.objectspace.types[dtd_key_type]
            if needed_type not in ('variable', variable.opt.type):
@ -284,8 +263,10 @@ class Annotator:
            raise DictConsistencyError(msg, 69, override.xmlfiles)
        self.uniq_overrides.append(service_name)
        override.name = service_name
        if not hasattr(override, 'engine'):
            override.engine = RougailConfig['default_engine']
        if not hasattr(override, 'source'):
-            override.source = service_name
+            override.source = f'{service_name}.service'
    @staticmethod
    def _update_file(file_,
@ -298,6 +279,8 @@ class Annotator:
            msg = _(f'attribute "source" is mandatory for the file "{file_.name}" '
                    f'"({service_name})"')
            raise DictConsistencyError(msg, 34, file_.xmlfiles)
        if not hasattr(file_, 'engine'):
            file_.engine = RougailConfig['default_engine']
    def _update_ip(self,
                   ip,
--- a/src/rougail/annotator/target.py
+++ b/src/rougail/annotator/target.py
@ -24,8 +24,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
 class TargetAnnotator:
--- a/src/rougail/annotator/value.py
+++ b/src/rougail/annotator/value.py
@ -24,33 +24,39 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.annotator.variable import Walk
+from .variable import Walk
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-class Annotator(Walk):  # pylint: disable=R0903
+class ValueAnnotator(Walk):  # pylint: disable=R0903
    """Annotate value
    """
    level = 70
    def __init__(self,
                 objectspace,
                 *args,
                 ) -> None:
        if not hasattr(objectspace.space, 'variables'):
            return
        self.objectspace = objectspace
        self.convert_value()
        self.add_choice_nil()
    def convert_value(self) -> None:
        """convert value
        """
-        for variable in self.get_variables():
+        for variable in self.get_variables(with_leadership=True):
            if isinstance(variable, self.objectspace.leadership):
                variable_type = 'leader'
                for follower in variable.variable:
                    self._convert_value(follower,
                                        variable_type,
                                        )
                    variable_type = 'follower'
            else:
                self._convert_value(variable)
    def _convert_value(self,
                       variable,
                       variable_type: str=None,
                       ) -> None:
        # a boolean must have value, the default value is "True"
        if not hasattr(variable, 'value') and variable.type == 'boolean':
@ -74,32 +80,19 @@ class Annotator(Walk):  # pylint: disable=R0903
            return
        if variable.value[0].type == 'calculation':
            variable.default = variable.value[0]
-        elif variable.multi:
+        else:
-            if not self.objectspace.paths.is_follower(variable.path):
+            if variable.multi:
                if variable_type != 'follower':
                    variable.default = [value.name for value in variable.value]
-            if not self.objectspace.paths.is_leader(variable.path):
+                if variable_type != 'leader':
                    if variable.multi == 'submulti':
                        variable.default_multi = [value.name for value in variable.value]
                    else:
                        variable.default_multi = variable.value[0].name
            else:
                if len(variable.value) > 1:
-                msg = _(f'the none multi variable "{variable.name}" cannot have '
+                    msg = _(f'the non multi variable "{variable.name}" cannot have '
                            'more than one value')
                    raise DictConsistencyError(msg, 68, variable.xmlfiles)
                variable.default = variable.value[0].name
        del variable.value
    def add_choice_nil(self) -> None:
        for variable in self.get_variables():
            if variable.type != 'choice':
                continue
            is_none = False
            for choice in variable.choice:
                if choice.type == 'nil':
                    is_none = True
            if not variable.mandatory and not is_none:
                choice = self.objectspace.choice(variable.xmlfiles)
                choice.name = None
                choice.type = 'nil'
                variable.choice.append(choice)
--- a/src/rougail/annotator/variable.py
+++ b/src/rougail/annotator/variable.py
@ -25,9 +25,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.objspace import convert_boolean
+from ..objspace import convert_boolean
 CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
@ -35,7 +35,6 @@ CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
                  'choice': dict(opttype="ChoiceOption"),
                  'string': dict(opttype="StrOption"),
                  'password': dict(opttype="PasswordOption"),
                  'secret': dict(opttype="PasswordOption"),
                  'mail': dict(opttype="EmailOption"),
                  'boolean': dict(opttype="BoolOption", func=convert_boolean),
                  'symlink': dict(opttype="SymLinkOption"),
@ -63,26 +62,37 @@ CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
                  }
 FORCE_CHOICE = {'schedule': ['none', 'daily', 'weekly', 'monthly'],
                'schedulemod': ['pre', 'post'],
                }
 class Walk:
    """Walk to objectspace to find variable or family
    """
    objectspace = None
-    def get_variables(self):
+    def get_variables(self,
                      with_leadership: bool=False,
                      ):
        """Iter all variables from the objectspace
        """
        for family in self.objectspace.space.variables.values():
-            yield from self._get_variables(family)
+            yield from self._get_variables(family, with_leadership)
    def _get_variables(self,
                       family: 'self.objectspace.family',
                       with_leadership: bool
                       ):
-        if not hasattr(family, 'variable'):
+        if hasattr(family, 'variable'):
            return
            for variable in family.variable.values():
                if isinstance(variable, self.objectspace.family):
-                yield from self._get_variables(variable)
+                    yield from self._get_variables(variable, with_leadership)
-            else:
+                    continue
                if not with_leadership and isinstance(variable, self.objectspace.leadership):
                    for follower in variable.variable:
                        yield follower
                    continue
                yield variable
    def get_families(self):
@ -95,20 +105,17 @@ class Walk:
                      family: 'self.objectspace.family',
                      ):
        yield family
-        if not hasattr(family, 'variable'):
+        if hasattr(family, 'variable'):
            return
            for fam in family.variable.values():
                if isinstance(fam, self.objectspace.family):
                    yield from self._get_families(fam)
-class Annotator(Walk):  # pylint: disable=R0903
+class VariableAnnotator(Walk):  # pylint: disable=R0903
    """Annotate variable
    """
    level = 30
    def __init__(self,
                 objectspace,
                 *args,
                 ):
        if not hasattr(objectspace.space, 'variables'):
            return
@ -123,11 +130,23 @@ class Annotator(Walk):  # pylint: disable=R0903
    def convert_variable(self):
        """convert variable
        """
-        for variable in self.get_variables():
+        for variable in self.get_variables(with_leadership=True):
-            self._convert_variable(variable)
+            if isinstance(variable, self.objectspace.leadership):
                # first variable is a leader, others are follower
                variable_type = 'leader'
                for follower in variable.variable:
                    self._convert_variable(follower,
                                           variable_type,
                                           )
                    variable_type = 'follower'
            else:
                self._convert_variable(variable,
                                       'variable',
                                       )
    def _convert_variable(self,
                          variable,
                          variable_type: str,
                          ) -> None:
        if variable.namespace == self.objectspace.rougailconfig['variable_namespace'] and \
                variable.name in self.forbidden_name:
@ -150,77 +169,72 @@ class Annotator(Walk):  # pylint: disable=R0903
                del variable.value[idx]
            if not variable.value:
                del variable.value
        if hasattr(variable, 'choice'):
            if variable.type != 'choice':
                msg = _(f'choice for the variable "{variable.name}" not allowed with "{variable.type}" type')
                raise DictConsistencyError(msg, 3, variable.xmlfiles)
            values = []
            choice_type = None
            for choice in variable.choice:
                if choice_type == 'variable':
                    msg = _(f'only one "variable" choice is allowed '
                            f'the variable "{variable.name}"')
                    raise DictConsistencyError(msg, 5, choice.xmlfiles)
                if choice.type == 'nil':
                    choice.name = None
                elif choice.type == 'space':
                    choice.name = ' '
                elif choice.type == 'variable':
                    choice.name = self.objectspace.paths.get_variable(choice.name)
                    if not choice.name.multi:
                        msg = _(f'only multi "variable" is allowed for a choice '
                                f'of variable "{variable.name}"')
                        raise DictConsistencyError(msg, 6, choice.xmlfiles)
                else:
                    if not hasattr(choice, 'name'):
                        msg = _(f'choice for variable "{variable.name}" must have a value')
                        raise DictConsistencyError(msg, 14, choice.xmlfiles)
                    choice.name = CONVERT_OPTION.get(choice.type, {}).get('func', str)(choice.name)
                if choice_type is None:
                    choice_type = choice.type
                values.append(choice.name)
            if choice_type not in ['function', 'variable'] and hasattr(variable, 'value'):
                for value in variable.value:
                    if value.name not in values:
                        msg = _(f'value "{value.name}" of variable "{variable.name}" is not in list '
                                f'of all expected values ({values})')
                        raise DictConsistencyError(msg, 15, value.xmlfiles)
            ref_choice = variable.choice[0]
            self.objectspace.valid_enums[variable.path] = {'type': ref_choice.type,
                                                           'values': values,
                                                           'xmlfiles': ref_choice.xmlfiles,
                                                           }
        elif variable.type == 'choice':
            msg = _(f'choice is mandatory for the variable "{variable.name}" with choice type')
            raise DictConsistencyError(msg, 4, variable.xmlfiles)
        variable.doc = variable.description
        del variable.description
        if variable_type == 'follower':
            if variable.multi is True:
                variable.multi = 'submulti'
            else:
                variable.multi = True
        self._convert_valid_enum(variable)
    def _convert_valid_enum(self,
                            variable,
                            ):
        """some types are, in fact, choices
        convert this kind of variables into choice
        """
        if variable.type in FORCE_CHOICE:
            if not hasattr(self.objectspace.space, 'constraints'):
                xmlfiles = variable.xmlfiles
                self.objectspace.space.constraints = self.objectspace.constraints(xmlfiles)
                self.objectspace.space.constraints.namespace = variable.namespace
            if not hasattr(self.objectspace.space.constraints, 'check'):
                self.objectspace.space.constraints.check = []
            check = self.objectspace.check(variable.xmlfiles)
            check.name = 'valid_enum'
            target = self.objectspace.target(variable.xmlfiles)
            target.name = variable.path
            check.target = [target]
            check.namespace = variable.namespace
            check.param = []
            for value in FORCE_CHOICE[variable.type]:
                param = self.objectspace.param(variable.xmlfiles)
                param.text = value
                check.param.append(param)
            self.objectspace.space.constraints.check.append(check)
            variable.type = 'string'
    def convert_test(self):
        """Convert variable tests value
        """
        for variable in self.get_variables():
-            if not hasattr(variable, 'test') or not variable.test:
+            if not hasattr(variable, 'test'):
                # with we want remove test, we set "" has test value
                continue
            if variable.test:
                if not hasattr(variable, 'information'):
                    variable.information = self.objectspace.information(variable.xmlfiles)
                values = variable.test.split('|')
                new_values = []
-            for value in variable.test.split('|'):
+                for value in values:
                    if value == '':
                        value = None
                    else:
                        value = CONVERT_OPTION.get(variable.type, {}).get('func', str)(value)
                    new_values.append(value)
            if not hasattr(variable, 'information'):
                variable.information = self.objectspace.information(variable.xmlfiles)
                variable.information.test = tuple(new_values)
            del variable.test
    def convert_help(self):
        """Convert variable help
        """
        for variable in self.get_variables():
            if not hasattr(variable, 'help'):
                continue
            if not hasattr(variable, 'information'):
                variable.information = self.objectspace.information(variable.xmlfiles)
            self._convert_help(variable)
    @staticmethod
    def _convert_help(variable) -> None:
        if hasattr(variable, 'help'):
            variable.information.help = variable.help
            del variable.help
--- a/src/rougail/config.py
+++ b/src/rougail/config.py
@ -40,19 +40,11 @@ RougailConfig = {'dictionaries_dir': [join(ROUGAILROOT, 'dictionaries')],
                 'tmp_dir': join(ROUGAILROOT, 'tmp'),
                 'dtdfilename': join(DTDDIR, 'rougail.dtd'),
                 'functions_file': join(ROUGAILROOT, 'functions.py'),
                 'tmpfile_dest_dir': '/usr/local/lib',
                 'variable_namespace': 'rougail',
                 'auto_freeze_variable': 'server_deployed',
                 'default_engine': 'creole',
                 'internal_functions': [],
                 'multi_functions': [],
                 'extra_annotators': [],
                 'modes_level': ['basic', 'normal', 'expert'],
                 'default_family_mode': 'basic',
                 'default_variable_mode': 'normal',
                 'default_files_engine': 'creole',
                 'default_files_mode': '0644',
                 'default_files_owner': 'root',
                 'default_files_group': 'root',
                 'default_files_included': 'no',
                 'default_overrides_engine': 'creole',
                 }
--- a/src/rougail/convert.py
+++ b/src/rougail/convert.py
@ -79,14 +79,11 @@ class RougailConvert:
                                    extra_dir,
                                    )
        functions_file = rougailconfig['functions_file']
        if not isinstance(functions_file, list):
            functions_file = [functions_file]
        SpaceAnnotator(rougailobjspace,
                       functions_file,
                       )
        self.output = TiramisuReflector(rougailobjspace,
                                        functions_file,
                                        rougailconfig['internal_functions'],
                                        ).get_text() + '\n'
    @staticmethod
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@ -38,7 +38,7 @@
 <!-- =============== -->
 <!ELEMENT rougail (services|variables|constraints)*>
-<!ATTLIST rougail version (0.10) #REQUIRED>
+<!ATTLIST rougail version (0.9) #REQUIRED>
 <!-- ============== -->
 <!-- files element  -->
@ -50,11 +50,6 @@
 <!ATTLIST service name CDATA #REQUIRED>
 <!ATTLIST service manage (True|False) "True">
 <!ATTLIST service servicelist CDATA #IMPLIED>
 <!ATTLIST service disabled (True|False) "False">
 <!ATTLIST service engine (none|creole|jinja2) #IMPLIED>
 <!ATTLIST service target CDATA #IMPLIED>
 <!ATTLIST service type (service|mount|swap|timer) "service">
 <!ATTLIST service undisable (True|False) "False">
 <!ELEMENT ip (#PCDATA)>
 <!ATTLIST ip iplist CDATA #IMPLIED>
@ -67,16 +62,13 @@
 <!ATTLIST file variable CDATA #IMPLIED>
 <!ATTLIST file variable_type (variable) "variable">
 <!ATTLIST file source CDATA #IMPLIED>
-<!ATTLIST file mode CDATA #IMPLIED>
+<!ATTLIST file mode CDATA "0644">
-<!ATTLIST file owner CDATA #IMPLIED>
+<!ATTLIST file owner CDATA "root">
-<!ATTLIST file owner_type (unix_user|variable) "unix_user">
+<!ATTLIST file group CDATA "root">
 <!ATTLIST file group CDATA #IMPLIED>
 <!ATTLIST file group_type (unix_user|variable) "unix_user">
 <!ATTLIST file filelist CDATA #IMPLIED>
 <!ATTLIST file redefine (True|False) "False">
 <!ATTLIST file engine (none|creole|jinja2|creole_legacy) #IMPLIED>
-<!ATTLIST file included (no|name|content) #IMPLIED>
+<!ATTLIST file included (no|name|content) "no">
 <!ATTLIST file disabled (True|False) "False">
 <!ELEMENT override EMPTY>
 <!ATTLIST override source CDATA #IMPLIED>
@ -91,11 +83,10 @@
 <!ATTLIST family mode CDATA #IMPLIED>
 <!ATTLIST family hidden (True|False) "False">
 <!ATTLIST family dynamic CDATA #IMPLIED>
 <!ATTLIST family leadership (True|False) "False">
-<!ELEMENT variable ((choice*|value*)*)>
+<!ELEMENT variable (value*)>
 <!ATTLIST variable name CDATA #REQUIRED>
-<!ATTLIST variable type (number|float|string|password|secret|mail|boolean|filename|date|unix_user|ip|local_ip|netmask|network|broadcast|netbios|domainname|hostname|web_address|port|mac|cidr|network_cidr|choice) "string">
+<!ATTLIST variable type (number|float|string|password|mail|boolean|filename|date|unix_user|ip|local_ip|netmask|network|broadcast|netbios|domainname|hostname|web_address|port|mac|cidr|network_cidr|schedule|schedulemod) "string">
 <!ATTLIST variable description CDATA #IMPLIED>
 <!ATTLIST variable help CDATA #IMPLIED>
 <!ATTLIST variable hidden (True|False) "False">
@ -107,21 +98,14 @@
 <!ATTLIST variable auto_freeze (True|False) "False">
 <!ATTLIST variable auto_save (True|False) "False">
 <!ATTLIST variable mode CDATA #IMPLIED>
 <!ATTLIST variable remove_choice (True|False) "False">
 <!ATTLIST variable remove_check (True|False) "False">
 <!ATTLIST variable remove_condition (True|False) "False">
 <!ATTLIST variable remove_fill (True|False) "False">
 <!ATTLIST variable provider CDATA #IMPLIED>
 <!ATTLIST variable test CDATA #IMPLIED>
 <!ELEMENT value (#PCDATA)>
 <!ATTLIST value type (string|number|nil|space|boolean) #IMPLIED>
-<!ELEMENT choice (#PCDATA | param)*>
+<!ELEMENT constraints ((fill*|check*|condition*|group*)*)>
 <!ATTLIST choice type (string|number|nil|space|boolean|function|variable) "string">
 <!ATTLIST choice name CDATA #IMPLIED>
 <!ELEMENT constraints ((fill*|check*|condition*)*)>
 <!ELEMENT fill ((target|param)+)>
 <!ATTLIST fill name CDATA #REQUIRED>
@ -137,7 +121,7 @@
 <!ATTLIST condition apply_on_fallback (True|False) #IMPLIED>
 <!ELEMENT param (#PCDATA)>
-<!ATTLIST param type (string|number|nil|space|boolean|variable|function|information|target_information|suffix|index) "string">
+<!ATTLIST param type (string|number|nil|boolean|variable|function|information|target_information|suffix|index) "string">
 <!ATTLIST param name CDATA #IMPLIED>
 <!ATTLIST param propertyerror (True|False) "True">
 <!ATTLIST param optional (True|False) "False">
@ -145,3 +129,10 @@
 <!ELEMENT target (#PCDATA)>
 <!ATTLIST target type (variable|family|servicelist|filelist|iplist) "variable">
 <!ATTLIST target optional (True|False) "False">
 <!ELEMENT group (follower+)>
 <!ATTLIST group leader CDATA #REQUIRED>
 <!ATTLIST group name CDATA #IMPLIED>
 <!ATTLIST group description CDATA #IMPLIED>
 <!ELEMENT follower (#PCDATA)>
--- a/src/rougail/objspace.py
+++ b/src/rougail/objspace.py
@ -38,9 +38,9 @@ FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables')
 # RougailObjSpace's elements that shall be forced to the UnRedefinable type
 FORCE_UNREDEFINABLES = ('value',)
 # RougailObjSpace's elements that shall not be modify
-UNREDEFINABLE = ('multi', 'type',)
+UNREDEFINABLE = ('multi', 'type')
 # RougailObjSpace's elements that did not created automaticly
-FORCE_ELEMENTS = ('property_', 'information')
+FORCE_ELEMENTS = ('choice', 'property_', 'leadership', 'information')
 # XML text are convert has name
 FORCED_TEXT_ELTS_AS_NAME = ('choice', 'property', 'value',)
@ -179,7 +179,6 @@ class RougailObjSpace:
                        self.space,
                        namespace,
                        redefine_variables,
                        False,
                        )
    def _xml_parse(self,  # pylint: disable=R0913
@ -188,15 +187,10 @@ class RougailObjSpace:
                   space,
                   namespace,
                   redefine_variables,
                   is_dynamic,
                   ) -> None:
        # var to check unique family name in a XML file
        family_names = []
        for child in document:
            if is_dynamic:
                is_sub_dynamic = True
            else:
                is_sub_dynamic = document.attrib.get('dynamic') is not None
            if not isinstance(child.tag, str):
                # doesn't proceed the XML commentaries
                continue
@ -231,7 +225,6 @@ class RougailObjSpace:
                              document,
                              variableobj,
                              space,
                              is_sub_dynamic,
                              )
            self.add_to_tree_structure(variableobj,
                                       space,
@ -244,7 +237,6 @@ class RougailObjSpace:
                                variableobj,
                                namespace,
                                redefine_variables,
                                is_sub_dynamic,
                                )
    def get_variableobj(self,
@ -286,8 +278,6 @@ class RougailObjSpace:
                  ) -> Optional[str]:
        if child.tag == 'variables':
            return namespace
        if child.tag == 'service':
            return child.attrib['name'] + '.' + child.attrib.get('type', 'service')
        if 'name' in child.attrib:
            return child.attrib['name']
        if child.text and child.tag in self.forced_text_elts_as_name:
@ -403,7 +393,7 @@ class RougailObjSpace:
        for attr, val in child.attrib.items():
            if redefine and attr in UNREDEFINABLE:
                msg = _(f'cannot redefine attribute "{attr}" for variable "{child.attrib["name"]}"'
-                        f' already defined')
+                        f' in "{xmlfile}", already defined')
                raise DictConsistencyError(msg, 48, variableobj.xmlfiles[:-1])
            if attr in self.booleans_attributs:
                val = convert_boolean(val)
@ -420,12 +410,6 @@ class RougailObjSpace:
        """Rougail object tree manipulations
        """
        if child.tag == 'variable':
            if child.attrib.get('remove_choice', False):
                if variableobj.type != 'choice':
                    msg = _(f'cannot remove choices for variable "{variableobj.path}"'
                            f' the variable has type "{variableobj.type}"')
                    raise DictConsistencyError(msg, 33, variableobj.xmlfiles)
                variableobj.choice = []
            if child.attrib.get('remove_check', False):
                self.remove_check(variableobj.name)
            if child.attrib.get('remove_condition', False):
@ -440,7 +424,6 @@ class RougailObjSpace:
    def remove_check(self, name):
        """Remove a check with a specified target
        """
        if hasattr(self.space.constraints, 'check'):
        remove_checks = []
        for idx, check in enumerate(self.space.constraints.check):  # pylint: disable=E1101
            for target in check.target:
@ -482,7 +465,6 @@ class RougailObjSpace:
                 document,
                 variableobj,
                 space,
                 is_dynamic,
                 ):
        """Fill self.paths attributes
        """
@ -492,21 +474,16 @@ class RougailObjSpace:
            else:
                family_name = namespace
            if isinstance(space, self.family) and space.leadership:
                leader = space.path
            else:
                leader = None
            self.paths.add_variable(namespace,
                                    variableobj.name,
                                    space.path,
-                                    is_dynamic,
+                                    document.attrib.get('dynamic') is not None,
                                    variableobj,
                                    leader,
                                    )
        elif isinstance(variableobj, self.family):  # pylint: disable=E1101
            family_name = variableobj.name
            if namespace != self.rougailconfig['variable_namespace']:
-                family_name = space.path + '.' + family_name
+                family_name = namespace + '.' + family_name
            self.paths.add_family(namespace,
                                  family_name,
                                  variableobj,
--- a/src/rougail/path.py
+++ b/src/rougail/path.py
@ -77,6 +77,19 @@ class Path:
                                        )
        variableobj.path = full_name
    def add_leadership(self,
                       namespace: str,
                       path: str,
                       variableobj: str,
                       ) -> str:  # pylint: disable=C0111
        """add a new leadership
        """
        self.families[path] = dict(name=path,
                                   namespace=namespace,
                                   variableobj=variableobj,
                                   )
        variableobj.path = path
    def get_family(self,
                   name: str,
                   current_namespace: str,
@ -96,6 +109,26 @@ class Path:
            raise DictConsistencyError(msg, 38, [])
        return dico['variableobj']
    # Leadership
    def set_leader(self,
                   namespace: str,
                   leader_family_name: str,
                   leadership_name: str,
                   name: str,
                   ) -> None:  # pylint: disable=C0111
        """set a variable a leadership member
        """
        # need rebuild path and move object in new path
        old_path = leader_family_name + '.' + name
        leadership_path = leader_family_name + '.' + leadership_name
        new_path = leadership_path + '.' + name
        self.variables[new_path] = self.variables.pop(old_path)
        self.variables[new_path]['leader'] = leadership_path
        self.variables[new_path]['variableobj'].path = new_path
        self.variables[new_path]['family'] = leadership_path
        if namespace == self.variable_namespace:
            self.full_paths_variables[name] = new_path
    def is_leader(self, path):  # pylint: disable=C0111
        """Is the variable is a leader
        """
@ -103,7 +136,7 @@ class Path:
        if not variable['leader']:
            return False
        leadership = self.get_family(variable['leader'], variable['variableobj'].namespace)
-        return next(iter(leadership.variable.values())).path == path
+        return leadership.variable[0].path == path
    def is_follower(self, path):
        """Is the variable is a follower
@ -112,7 +145,7 @@ class Path:
        if not variable['leader']:
            return False
        leadership = self.get_family(variable['leader'], variable['variableobj'].namespace)
-        return next(iter(leadership.variable.values())).path != path
+        return leadership.variable[0].path != path
    # Variable
    def add_variable(self,  # pylint: disable=R0913
@ -121,12 +154,9 @@ class Path:
                     family: str,
                     is_dynamic: bool,
                     variableobj,
                     leader: 'self.objectspace.family'=None,
                     ) -> str:  # pylint: disable=C0111
        """Add a new variable (with path)
        """
        if name == 'hostname_' and not is_dynamic:
            raise Exception('pffff')
        if '.' not in name:
            full_path = '.'.join([family, name])
            if namespace == self.variable_namespace:
@ -139,7 +169,7 @@ class Path:
            raise DictConsistencyError(msg, 57, variableobj.xmlfiles)
        self.variables[full_path] = dict(name=name,
                                         family=family,
-                                         leader=leader,
+                                         leader=None,
                                         is_dynamic=is_dynamic,
                                         variableobj=variableobj,
                                         )
@ -176,7 +206,6 @@ class Path:
                                          )
        namespace = dico['variableobj'].namespace
        if namespace not in [self.variable_namespace, 'services'] and \
                current_namespace != 'services' and \
                current_namespace != namespace:
            msg = _(f'A variable located in the "{namespace}" namespace shall not be used '
                    f'in the "{current_namespace}" namespace')
--- a/src/rougail/template/base.py
+++ b/src/rougail/template/base.py
@ -29,15 +29,15 @@ from shutil import copy
 import logging
 from typing import Dict, Any
 from subprocess import call
-from os import listdir, makedirs, getcwd, chdir, unlink, rmdir
+from os import listdir, makedirs, getcwd, chdir
 from os.path import dirname, join, isfile, isdir, abspath
 try:
-    from tiramisu3 import Config, undefined
+    from tiramisu3 import Config
    from tiramisu3.error import PropertiesOptionError  # pragma: no cover
 except ModuleNotFoundError:  # pragma: no cover
-    from tiramisu import Config, undefined
+    from tiramisu import Config
    from tiramisu.error import PropertiesOptionError
 from ..config import RougailConfig
@ -55,14 +55,6 @@ log = logging.getLogger(__name__)
 log.addHandler(logging.NullHandler())
 INFORMATIONS = {'files': ['source', 'mode', 'engine', 'included'],
                'overrides': ['name', 'source', 'engine'],
                }
 DEFAULT = {'files': ['owner', 'group'],
           'overrides': [],
           }
 class RougailLeaderIndex:
    """This object is create when access to a specified Index of the variable
    """
@ -77,21 +69,12 @@ class RougailLeaderIndex:
    def __getattr__(self, name):
        if name not in self._follower:
-            raise AttributeError(f'unable to find follower "{name}"')
+            raise AttributeError()
        value = self._follower[name]
        if isinstance(value, PropertiesOptionError):
-            raise AttributeError(f'unable to access to follower "{name}": {value}')
+            raise AttributeError()
        return value
    def __getitem__(self, name):
        return self.__getattr__(name)
    def __contains__(self, name):
        if self._follower.__contains__(name):
            value = self._follower[name]
            return not isinstance(value, PropertiesOptionError)
        return False
    def __str__(self):
        return str(self._value)
@ -125,11 +108,10 @@ class RougailLeader:
    For examples: %%leader, %%leader[0].follower1
    """
    def __init__(self,
                 leader_name,
                 value,
                 ) -> None:
        self._value = value
-        self._follower = {leader_name: value}
+        self._follower = {}
    def __getitem__(self, index):
        """Get a leader.follower at requested index.
@ -154,7 +136,7 @@ class RougailLeader:
    def __contains__(self, value):
        return self._value.__contains__(value)
-    async def _add_follower(self,
+    async def add_follower(self,
                           config,
                           name: str,
                           path: str,
@ -175,34 +157,22 @@ class RougailExtra:
    For example %%extra1.family.variable
    """
    def __init__(self,
-                 suboption: Dict,
+                 suboption: Dict) -> None:
-                 ) -> None:
+        self.suboption = suboption
        self._suboption = suboption
    def __getattr__(self,
                    key: str,
                    ) -> Any:
        try:
-            return self._suboption[key]
+            return self.suboption[key]
        except KeyError:
            raise AttributeError(f'unable to find extra "{key}"')
    def __getitem__(self,
                    key: str,
                    ) -> Any:
        return self.__getattr__(key)
    def __iter__(self):
-        return iter(self._suboption.values())
+        return iter(self.suboption.values())
    def items(self):
-        return self._suboption.items()
+        return self.suboption.items()
    def __str__(self):
        suboptions = {}
        for key, value in self._suboption.items():
            suboptions[key] = str(value)
        return f'<extra object with: {suboptions}>'
 class RougailBaseTemplate:
@ -217,20 +187,12 @@ class RougailBaseTemplate:
        self.config = config
        self.destinations_dir = abspath(rougailconfig['destinations_dir'])
        self.tmp_dir = abspath(rougailconfig['tmp_dir'])
-        self.templates_dir = []
+        self.templates_dir = abspath(rougailconfig['templates_dir'])
        templates_dir = rougailconfig['templates_dir']
        if not isinstance(templates_dir, list):
            templates_dir = [templates_dir]
        for templ_dir in templates_dir:
            self.templates_dir.append(abspath(templ_dir))
        self.patches_dir = abspath(rougailconfig['patches_dir'])
        eos = {}
        functions_file = rougailconfig['functions_file']
-        if not isinstance(functions_file, list):
+        if isfile(functions_file):
-            functions_file = [functions_file]
+            eosfunc = load_modules(functions_file)
        for function in functions_file:
            if isfile(function):
                eosfunc = load_modules(function)
            for func in dir(eosfunc):
                if not func.startswith('_'):
                    eos[func] = getattr(eosfunc, func)
@ -242,7 +204,6 @@ class RougailBaseTemplate:
    def patch_template(self,
                       filename: str,
                       templates_dir: str,
                       ) -> None:
        """Apply patch to a template
        """
@ -258,25 +219,24 @@ class RougailBaseTemplate:
                msg = _(f"Error applying patch: '{patch_file}'\n"
                        f"To reproduce and fix this error {patch_cmd_err}")
                self.log.error(_(msg))
-                copy(join(templates_dir, filename), self.tmp_dir)
+                copy(join(self.templates_dir, filename), self.tmp_dir)
    def prepare_template(self,
                         filename: str,
                         templates_dir: str,
                         ) -> None:
        """Prepare template source file
        """
        self.log.info(_("Copy template: '{filename}' -> '{self.tmp_dir}'"))
        if not isdir(self.tmp_dir):
            raise TemplateError(_(f'cannot find tmp_dir {self.tmp_dir}'))
-        copy(join(templates_dir, filename), self.tmp_dir)
+        copy(filename, self.tmp_dir)
-        self.patch_template(filename, templates_dir)
+        self.patch_template(filename)
    def instance_file(self,
                      filevar: Dict,
                      type_: str,
                      service_name: str,
-                      ) -> str:
+                      ) -> None:
        """Run templatisation on one file
        """
        self.log.info(_("Instantiating file '{filename}'"))
@ -291,13 +251,12 @@ class RougailBaseTemplate:
                variable = [variable]
        if not isdir(self.destinations_dir):
            raise TemplateError(_(f'cannot find destinations_dir {self.destinations_dir}'))
        destfilenames = []
        for idx, filename, in enumerate(filenames):
            if variable:
                var = variable[idx]
            else:
                var = None
-            func = f'get_data_{type_}'
+            func = f'_instance_{type_}'
            data = getattr(self, func)(filevar,
                                       filename,
                                       service_name,
@ -306,80 +265,44 @@ class RougailBaseTemplate:
                                       )
            if data is None:
                continue
-            filename, source, true_destfilename, var = data
+            filename, source, destfile, var = data
-            destfilename = join(self.destinations_dir, true_destfilename[1:])
+            destfilename = join(self.destinations_dir, destfile[1:])
            makedirs(dirname(destfilename), exist_ok=True)
            self.log.info(_(f"{filevar['engine']} processing: '{destfilename}'"))
            self.engines[filevar['engine']].process(filename=filename,
                                                    source=source,
-                                                    true_destfilename=true_destfilename,
+                                                    true_destfilename=destfile,
                                                    destfilename=destfilename,
                                                    destdir=self.destinations_dir,
                                                    variable=var,
                                                    index=idx,
                                                    rougail_variables_dict=self.rougail_variables_dict,
                                                    eosfunc=self.eosfunc,
                                                    )
            self.process(true_destfilename,
                         destfilename,
                         filevar.get('mode'),
                         filevar.get('owner'),
                         filevar.get('group'),
                         )
            destfilenames.append(destfilename)
        return destfilenames
    async def instance_files(self) -> None:
        """Run templatisation on all files
        """
        try:
        ori_dir = getcwd()
-        except FileNotFoundError:
+        chdir(self.templates_dir)
            ori_dir = None
        chdir(self.tmp_dir)
        for option in await self.config.option.list(type='all'):
            namespace = await option.option.name()
-            is_variable_namespace = namespace == self.rougailconfig['variable_namespace']
+            is_var_namespace = namespace == self.rougailconfig['variable_namespace']
            if namespace == 'services':
                is_service_namespace = 'root'
            else:
                is_service_namespace = False
            self.rougail_variables_dict[namespace] = await self.load_variables(option,
-                                                                               is_variable_namespace,
+                                                                               is_var_namespace,
                                                                               is_service_namespace,
                                                                               )
-        for templates_dir in self.templates_dir:
+        for template in listdir('.'):
-            for template in listdir(templates_dir):
+            self.prepare_template(template)
                self.prepare_template(template,
                                      templates_dir,
                                      )
        files_to_delete = []
        for included in (True, False):
            for service_obj in await self.config.option('services').list('all'):
-                service_name = await service_obj.option.description()
+                service_name = await service_obj.option.name()
                if await service_obj.option('activate').value.get() is False:
-                    if included is False and not await service_obj.information.get('undisable', False):
+                    if included is False:
                        self.desactive_service(service_name)
                    continue
                if not included:
                    engine = await service_obj.information.get('engine', None)
                    if engine:
                        self.instance_file({'engine': engine},
                                           'service',
                                           service_name,
                                           )
                    target_name = await service_obj.information.get('target', None)
                    if target_name:
                        self.target_service(service_name,
                                            target_name,
                                            engine is None,
                                            )
                for fills in await service_obj.list('optiondescription'):
                    type_ = await fills.option.name()
                    for fill_obj in await fills.list('all'):
                        fill = await fill_obj.value.dict()
                        self.get_default(type_, fill, fill_obj)
                        await self.get_informations(type_, fill, fill_obj)
                        if 'included' in fill:
                            if (fill['included'] == 'no' and included is True) or \
                                    (fill['included'] != 'no' and included is False):
@ -387,101 +310,42 @@ class RougailBaseTemplate:
                        elif included is True:
                            continue
                        if fill['activate']:
-                            destfilenames = self.instance_file(fill,
+                            self.instance_file(fill, type_, service_name)
                                                               type_,
                                                               service_name,
                                                               )
                            if included and fill.get('included', 'no') == 'content':
                                files_to_delete.extend(destfilenames)
                        else:
-                            self.log.debug(_(f"Instantiation of file '{fill['name']}' disabled"))
+                            self.log.debug(_("Instantiation of file '{filename}' disabled"))
                self.post_instance_service(service_name)
        for filename in files_to_delete:
            unlink(filename)
            parent = filename
            while True:
                parent = dirname(parent)
                if listdir(parent):
                    break
                rmdir(parent)
        self.post_instance()
        if ori_dir is not None:
        chdir(ori_dir)
    def get_default(self,
                    type_: str,
                    dico: dict,
                    obj: 'Option',
                    ) -> None:
        for key in DEFAULT.get(type_, []):
            default_key = f'default_{type_}_{key}'
            if default_key in RougailConfig:
                default_value = RougailConfig[default_key]
            else:
                default_value = undefined
            dico[key] = dico.get(key, default_value)
    async def get_informations(self,
                               type_: str,
                               dico: dict,
                               obj: 'Option',
                               ) -> None:
        for key in INFORMATIONS.get(type_, []):
            default_key = f'default_{type_}_{key}'
            if default_key in RougailConfig:
                default_value = RougailConfig[default_key]
            else:
                default_value = undefined
            dico[key] = await obj.information.get(key, default_value)
    def desactive_service(self,
-                          *args,
+                          service_name: str,
                          ):
        raise NotImplementedError(_('cannot desactivate a service'))
-    def target_service(self,
+    def post_instance_service(self, service_name):  # pragma: no cover
                       service_name: str,
                       *args,
                       ):
        raise NotImplementedError(_('cannot use target for the service {service_name}'))
    def post_instance_service(self,
                              *args,
                              ):  # pragma: no cover
        pass
    def process(self,
                *args,
                ):  # pragma: no cover
        raise NotImplementedError(_('cannot processed'))
    def post_instance(self):  # pragma: no cover
        pass
-    def get_data_ip(self,
+    def _instance_ip(self,
                     *args,
                     ) -> None:  # pragma: no cover
        raise NotImplementedError(_('cannot instanciate this service type ip'))
-    def get_data_files(self,
+    def _instance_files(self,
                        *args,
                        ) -> None:  # pragma: no cover
        raise NotImplementedError(_('cannot instanciate this service type file'))
-    def get_data_service(self,
+    def _instance_overrides(self,
                         *args,
                          ) -> None:  # pragma: no cover
        raise NotImplementedError(_('cannot instanciate this service'))
    def get_data_overrides(self,
                            *args,
                            ) -> None:  # pragma: no cover
        raise NotImplementedError(_('cannot instanciate this service type override'))
    async def load_variables(self,
                             optiondescription,
-                             is_variable_namespace: str,
+                             is_variable_namespace,
                             is_service_namespace: str,
                             ) -> RougailExtra:
        """Load all variables and set it in RougailExtra objects
        """
@ -491,30 +355,19 @@ class RougailBaseTemplate:
                if await option.option.isleadership():
                    for idx, suboption in enumerate(await option.list('all')):
                        if idx == 0:
                            leader = RougailLeader(await suboption.value.get())
                            leader_name = await suboption.option.name()
                            leader = RougailLeader(leader_name, await suboption.value.get())
                            leadership_name = await option.option.name()
                            if is_variable_namespace:
                                self.rougail_variables_dict[await suboption.option.name()] = leader
                        else:
-                            await leader._add_follower(self.config,
+                            await leader.add_follower(self.config,
                                                      await suboption.option.name(),
                                                      await suboption.option.path(),
                                                      )
-                    variables[leadership_name] = RougailExtra({leader_name: leader})
+                    variables[leader_name] = leader
                else:
                    if is_service_namespace == 'root':
                        new_is_service_namespace = 'service_name'
                    elif is_service_namespace == 'service_name':
                        new_is_service_namespace = await option.option.name()
                    elif is_service_namespace in INFORMATIONS:
                        # remove 's'
                        new_is_service_namespace = is_service_namespace[:-1]
                    else:
                        new_is_service_namespace = is_service_namespace
                    subfamilies = await self.load_variables(option,
                                                            is_variable_namespace,
                                                            new_is_service_namespace,
                                                            )
                    variables[await option.option.name()] = subfamilies
            else:
@ -529,13 +382,4 @@ class RougailBaseTemplate:
                else:
                    value = await option.value.get()
                variables[await option.option.name()] = value
        if isinstance(is_service_namespace, str) and is_service_namespace + 's' in INFORMATIONS:
            self.get_default(is_service_namespace + 's',
                             variables,
                             optiondescription,
                             )
            await self.get_informations(is_service_namespace + 's',
                                        variables,
                                        optiondescription,
                                        )
        return RougailExtra(variables)
--- a/src/rougail/template/engine/creole.py
+++ b/src/rougail/template/engine/creole.py
@ -38,12 +38,12 @@ from ...error import TemplateError
 def cl_compile(kls, *args, **kwargs):
    """Rewrite compile methode to force some settings
    """
-    kwargs['compilerSettings'] = {'directiveStartToken': '%',
+    kwargs['compilerSettings'] = {'directiveStartToken' : '%',
-                                  'cheetahVarStartToken': '%%',
+                                  'cheetahVarStartToken' : '%%',
-                                  'EOLSlurpToken': '%',
+                                  'EOLSlurpToken' : '%',
-                                  'commentStartToken': '#',
+                                  'commentStartToken' : '#',
-                                  'multiLineCommentStartToken': '#*',
+                                  'multiLineCommentStartToken' : '#*',
-                                  'multiLineCommentEndToken': '*#',
+                                  'multiLineCommentEndToken' : '*#',
                                  }
    return kls.old_compile(*args, **kwargs)  # pylint: disable=E1101
 Template.old_compile = Template.compile
@ -97,7 +97,6 @@ def process(filename: str,
            destfilename: str,
            destdir: str,
            variable: Any,
            index: int,
            rougail_variables_dict: Dict,
            eosfunc: Dict,
            ):
@ -111,8 +110,6 @@ def process(filename: str,
                         }
        if variable is not None:
            extra_context['rougail_variable'] = variable
        if index is not None:
            extra_context['rougail_index'] = index
        cheetah_template = CheetahTemplate(filename,
                                           source,
                                           rougail_variables_dict,
@ -121,7 +118,7 @@ def process(filename: str,
                                           )
        data = str(cheetah_template)
    except NotFound as err:  # pragma: no cover
-        varname = err.args[0][13:].split(' ', 1)[0][:-1]
+        varname = err.args[0][13:-1]
        if filename:
            msg = f"Error: unknown variable used in template {filename} to {destfilename}: {varname}"
        else:
--- a/src/rougail/template/engine/creole_legacy.py
+++ b/src/rougail/template/engine/creole_legacy.py
@ -49,6 +49,7 @@ def cl_compile(kls, *args, **kwargs):
                   'multiLineCommentStartToken' : u'µ' * 10,
                   'multiLineCommentEndToken' : u'µ' * 10}
    return kls.old_compile(*args, **kwargs)  # pylint: disable=E1101
 oriCheetahTemplate.compile = cl_compile
 class IsDefined:
@ -118,15 +119,12 @@ def process(filename: str,
            destfilename: str,
            destdir: str,
            variable: Any,
            index: int,
            rougail_variables_dict: Dict,
            eosfunc: Dict,
            ):
    """Process a cheetah template
    """
    # full path of the destination file
    ori_compile = oriCheetahTemplate.compile
    oriCheetahTemplate.compile = cl_compile
    try:
        extra_context = {'normalize_family': normalize_family,
                         'rougail_filename': true_destfilename,
@ -134,8 +132,6 @@ def process(filename: str,
                         }
        if variable is not None:
            extra_context['rougail_variable'] = variable
        if index is not None:
            extra_context['rougail_index'] = index
        cheetah_template = CheetahTemplate(filename,
                                           source,
                                           rougail_variables_dict,
@ -149,16 +145,13 @@ def process(filename: str,
            msg = f"Error: unknown variable used in template {filename} to {destfilename}: {varname}"
        else:
            msg = f"Error: unknown variable used in file {destfilename}: {varname}"
        oriCheetahTemplate.compile = ori_compile
        raise TemplateError(_(msg)) from err
    except Exception as err:  # pragma: no cover
        if filename:
            msg = _(f"Error while instantiating template {filename} to {destfilename}: {err}")
        else:
            msg = _(f"Error while instantiating filename {destfilename}: {err}")
        oriCheetahTemplate.compile = ori_compile
        raise TemplateError(msg) from err
    with open(destfilename, 'w') as file_h:
        file_h.write(data)
    oriCheetahTemplate.compile = ori_compile
--- a/src/rougail/template/engine/jinja2.py
+++ b/src/rougail/template/engine/jinja2.py
@ -39,7 +39,6 @@ def process(filename: str,
            destfilename: str,
            destdir: str,
            variable: Any,
            index: int,
            rougail_variables_dict: Dict,
            eosfunc: Dict,
            ):
@ -49,11 +48,11 @@ def process(filename: str,
    dir_name, template_name = filename.rsplit('/', 1)
    if source is not None:  # pragma: no cover
        raise TemplateError(_('source is not supported for jinja2'))
-    var = {}
+        rougail_variables_dict['rougail_variable'] = variable
    if variable is not None:
-        var['rougail_variable'] = variable
+        var = {'rougail_variable': variable}
-    if index is not None:
+    else:
-        var['rougail_index'] = index
+        var = {}
    try:
        # extra_context = {'normalize_family': normalize_family,
        # eosfunc
--- a/src/rougail/template/systemd.py
+++ b/src/rougail/template/systemd.py
@ -21,13 +21,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 from typing import Dict, Any
-from os import makedirs, symlink, chmod
+from os import makedirs, symlink
 from os.path import dirname, isfile, join
 from ipaddress import ip_network
 from .base import RougailBaseTemplate
 from ..i18n import _
-from ..error import FileNotFound, TemplateError
+from ..error import FileNotFound
 ROUGAIL_IP_TEMPLATE = """[Service]
@ -38,24 +38,10 @@ IPAddressDeny=any
 """
-ROUGAIL_GLOBAL_SYSTEMD_FILE = '/usr/lib/systemd/system'
+ROUGAIL_TMPL_TEMPLATE = """%def display(%%file, %%filename)
-ROUGAIL_DEST_FILE = '/tmpfiles.d/0rougail.conf'
+%if %%filename.startswith('/etc/') or %%filename.startswith('/var/') or %%filename.startswith('/srv/')
-LOCAL_DIR = ('/etc/', '/var/', '/srv/')
+C %%filename %%file.mode %%file.owner %%file.group - /usr/local/lib%%filename
-
+z %%filename - - - - -
 class RougailSystemdTemplate(RougailBaseTemplate):
    def __init__(self,  # pylint: disable=R0913
                 config: 'Config',
                 rougailconfig: 'RougailConfig'=None,
                 ) -> None:
        self.ip_per_service = None
        super().__init__(config, rougailconfig)
        self.rougail_tmpl_template = f"""%def display(%%file, %%filename)
 """
        tmp_local_dir = (f"%%filename.startswith('{local_dir}')" for local_dir in LOCAL_DIR)
        self.rougail_tmpl_template += '%if ' + ' or '.join(tmp_local_dir)
        self.rougail_tmpl_template += f"""
 C %%filename %%file.mode %%file.owner %%file.group - {self.rougailconfig['tmpfile_dest_dir']}%%filename
 %end if
 %end def
 %for %%service in %%services
@ -75,7 +61,16 @@ C %%filename %%file.mode %%file.owner %%file.group - {self.rougailconfig['tmpfil
 %end for
 """
-    def get_data_files(self,
+
 class RougailSystemdTemplate(RougailBaseTemplate):
    def __init__(self,  # pylint: disable=R0913
                 config: 'Config',
                 rougailconfig: 'RougailConfig'=None,
                 ) -> None:
        self.ip_per_service = None
        super().__init__(config, rougailconfig)
    def _instance_files(self,
                        filevar: Dict,
                        destfile: str,
                        service_name: str,
@ -84,7 +79,7 @@ C %%filename %%file.mode %%file.owner %%file.group - {self.rougailconfig['tmpfil
                        ) -> tuple:
        source = filevar['source']
        if not isfile(source):  # pragma: no cover
-            raise FileNotFound(_(f'Source file "{source}" does not exist in {", ".join(self.templates_dir)}'))
+            raise FileNotFound(_(f"File {source} does not exist."))
        tmp_file = join(self.tmp_dir, source)
        #self.instance_file(fill, 'files')
        if variable:
@ -93,7 +88,7 @@ C %%filename %%file.mode %%file.owner %%file.group - {self.rougailconfig['tmpfil
            var = None
        return tmp_file, None, destfile, var
-    def get_data_overrides(self,
+    def _instance_overrides(self,
                            filevar: Dict,
                            destfile,
                            service_name: str,
@ -101,13 +96,12 @@ C %%filename %%file.mode %%file.owner %%file.group - {self.rougailconfig['tmpfil
                            ) -> tuple:
        source = filevar['source']
        if not isfile(source):  # pragma: no cover
-            raise FileNotFound(_(f'Override source file "{source}" does not exist in {", ".join(self.templates_dir)}'))
+            raise FileNotFound(_(f"File {source} does not exist."))
        tmp_file = join(self.tmp_dir, source)
        service_name = filevar['name']
-        destfile = f'/systemd/system/{service_name}.d/rougail.conf'
+        return tmp_file, None, f'/systemd/system/{service_name}.service.d/rougail.conf', None
        return tmp_file, None, destfile, None
-    def get_data_ip(self,
+    def _instance_ip(self,
                     filevar: Dict,
                     ip,
                     service_name: str,
@ -126,44 +120,19 @@ C %%filename %%file.mode %%file.owner %%file.group - {self.rougailconfig['tmpfil
        elif ip:
            self.ip_per_service.append(ip)
    def get_data_service(self,
                         servicevar: Dict,
                         info,
                         service_name: str,
                         *args,
                         ):
        tmp_file = join(self.tmp_dir, service_name)
        var = None
        destfile = f'/systemd/system/{service_name}'
        return tmp_file, None, destfile, var
    def desactive_service(self,
                          service_name: str,
                          ):
-        filename = f'{self.destinations_dir}/systemd/system/{service_name}'
+        filename = f'{self.destinations_dir}/systemd/system/{service_name}.service'
        makedirs(dirname(filename), exist_ok=True)
        symlink('/dev/null', filename)
    def target_service(self,
                       service_name: str,
                       target_name: str,
                       global_service: str,
                       ):
        filename = f'{self.destinations_dir}/systemd/system/{target_name}.target.wants/{service_name}'
        makedirs(dirname(filename), exist_ok=True)
        if global_service:
            source_filename = f'{ROUGAIL_GLOBAL_SYSTEMD_FILE}/{service_name}'
        else:
            source_filename = f"{self.rougailconfig['tmpfile_dest_dir']}/systemd/system/{service_name}"
        symlink(source_filename, filename)
    def post_instance_service(self,
                              service_name: str,
                              ) -> None:  # pragma: no cover
        if self.ip_per_service is None:
            return
-        destfile = f'/systemd/system/{service_name}.d/rougail_ip.conf'
+        destfile = f'/systemd/system/{service_name}.service.d/rougail_ip.conf'
        destfilename = join(self.destinations_dir, destfile[1:])
        makedirs(dirname(destfilename), exist_ok=True)
        self.log.info(_(f"creole processing: '{destfilename}'"))
@ -173,40 +142,22 @@ C %%filename %%file.mode %%file.owner %%file.group - {self.rougailconfig['tmpfil
                                       destfilename=destfilename,
                                       destdir=self.destinations_dir,
                                       variable=self.ip_per_service,
                                       index=None,
                                       rougail_variables_dict=self.rougail_variables_dict,
                                       eosfunc=self.eosfunc,
                                       )
        self.ip_per_service = None
    def process(self,
                filename: str,
                destfilename: str,
                mode: str,
                owner: str,
                group: str,
                ) -> None:
        for local_dir in LOCAL_DIR:
            if filename.startswith(local_dir):
                return
        if owner not in [None, self.rougailconfig['default_files_owner']]:
            raise TemplateError(_(f'cannot change owner of file {destfilename}'))
        if group not in [None, self.rougailconfig['default_files_group']]:
            raise TemplateError(_(f'cannot change group of file {destfilename}'))
        if mode not in [None, self.rougailconfig['default_files_mode']]:
            chmod(destfilename, eval(f'0o{mode}'))
    def post_instance(self):
-        destfilename = join(self.destinations_dir, ROUGAIL_DEST_FILE[1:])
+        destfile = '/tmpfiles.d/rougail.conf'
        destfilename = join(self.destinations_dir, destfile[1:])
        makedirs(dirname(destfilename), exist_ok=True)
        self.log.info(_(f"creole processing: '{destfilename}'"))
        self.engines['creole'].process(filename=None,
-                                       source=self.rougail_tmpl_template,
+                                       source=ROUGAIL_TMPL_TEMPLATE,
-                                       true_destfilename=ROUGAIL_DEST_FILE,
+                                       true_destfilename=destfile,
                                       destfilename=destfilename,
                                       destdir=self.destinations_dir,
                                       variable=None,
                                       index=None,
                                       rougail_variables_dict=self.rougail_variables_dict,
                                       eosfunc=self.eosfunc,
                                       )
--- a/src/rougail/tiramisu.py
+++ b/src/rougail/tiramisu.py
@ -36,8 +36,6 @@ class ConvertDynOptionDescription(DynOptionDescription):
    Suffix could also contain invalid character, so we should "normalize" it
    """
    def convert_suffix_to_path(self, suffix):
        if suffix is None:
            return suffix
        if not isinstance(suffix, str):
            suffix = str(suffix)
        return normalize_family(suffix)
--- a/src/rougail/tiramisureflector.py
+++ b/src/rougail/tiramisureflector.py
@ -28,10 +28,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from json import dumps
 from os.path import isfile
 from .i18n import _
 from .annotator import CONVERT_OPTION
 from .objspace import RootRougailObject
-from .error import DictConsistencyError
+
 class Root():  # pylint: disable=R0903
    """Root classes
    """
    path = '.'
 class BaseElt:  # pylint: disable=R0903
@ -47,32 +51,20 @@ class TiramisuReflector:
    """
    def __init__(self,
                 objectspace,
-                 funcs_paths,
+                 funcs_path,
                 internal_functions,
                 ):
        self.index = 0
        self.text = []
-        if funcs_paths:
+        if funcs_path and isfile(funcs_path):
-            self.text.extend(["from importlib.machinery import SourceFileLoader as _SourceFileLoader",
+            self.text.extend(["from importlib.machinery import SourceFileLoader",
-                              "from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec",
+                              "from importlib.util import spec_from_loader, module_from_spec",
-                              "class func:",
+                              f"loader = SourceFileLoader('func', '{funcs_path}')",
-                              "    pass",
+                              "spec = spec_from_loader(loader.name, loader)",
-                              ])
+                              "func = module_from_spec(spec)",
-            for funcs_path in funcs_paths:
+                              "loader.exec_module(func)",
-                if not isfile(funcs_path):
+                              "for key, value in dict(locals()).items():",
-                    continue
+                              "    if key != ['SourceFileLoader', 'func']:",
-                self.text.extend([f"_loader = _SourceFileLoader('func', '{funcs_path}')",
+                              "        setattr(func, key, value)"])
                                  "_spec = _spec_from_loader(_loader.name, _loader)",
                                  "_func = _module_from_spec(_spec)",
                                  "_loader.exec_module(_func)",
                                  "for function in dir(_func):",
                                  "    if function.startswith('_'):",
                                  "        continue",
                                  "    setattr(func, function, getattr(_func, function))",
                                  ])
        if internal_functions:
            for func in internal_functions:
                self.text.append(f"setattr(func, '{func}', {func})")
        self.text.extend(["try:",
                          "    from tiramisu3 import *",
                          "except:",
@ -86,11 +78,8 @@ class TiramisuReflector:
    def make_tiramisu_objects(self) -> None:
        """make tiramisu objects
        """
        providers = {}
        baseelt = BaseElt()
        self.set_name(baseelt)
        dynamic_path = ''
        dynamic = False
        basefamily = Family(baseelt,
                            self.text,
                            self.objectspace,
@ -98,12 +87,7 @@ class TiramisuReflector:
        for elt in self.reorder_family():
            self.populate_family(basefamily,
                                 elt,
                                 providers,
                                 dynamic,
                                 dynamic_path,
                                 )
        basefamily.elt.information = providers
        basefamily.populate_informations()
        self.baseelt = baseelt
    def reorder_family(self):
@ -123,9 +107,6 @@ class TiramisuReflector:
    def populate_family(self,
                        parent_family,
                        elt,
                        providers,
                        dynamic,
                        dynamic_path,
                        ):
        """Populate family
        """
@ -134,21 +115,11 @@ class TiramisuReflector:
                        self.text,
                        self.objectspace,
                        )
        if not dynamic_path:
            dynamic_path = elt.name
        else:
            dynamic_path = dynamic_path + '.' + elt.name
        if dynamic or hasattr(elt, 'suffixes'):
            dynamic_path += '{suffix}'
            dynamic = True
        parent_family.add(family)
        for children in vars(elt).values():
            if isinstance(children, self.objectspace.family):
                self.populate_family(family,
                                     children,
                                     providers,
                                     dynamic,
                                     dynamic_path,
                                     )
                continue
            if isinstance(children, dict):
@ -160,21 +131,13 @@ class TiramisuReflector:
                        continue
                    if isinstance(child, self.objectspace.variable):
                        self.set_name(child)
                        sub_dynamic_path = dynamic_path + '.' + child.name
                        if dynamic:
                            sub_dynamic_path += '{suffix}'
                        family.add(Variable(child,
                                            self.text,
                                            self.objectspace,
                                            providers,
                                            sub_dynamic_path,
                                            ))
                    else:
                        self.populate_family(family,
                                             child,
                                             providers,
                                             dynamic,
                                             dynamic_path,
                                             )
    def set_name(self,
@ -188,7 +151,7 @@ class TiramisuReflector:
    def get_text(self):
        """Get text
        """
-        self.baseelt.reflector_object.get([])  # pylint: disable=E1101
+        self.baseelt.reflector_object.get()  # pylint: disable=E1101
        return '\n'.join(self.text)
@ -207,25 +170,13 @@ class Common:
        self.elt.reflector_object = self
        self.object_type = None
-    def get(self, calls):
+    def get(self):
        """Get tiramisu's object
        """
        self_calls = calls.copy()
        if self.elt.path in self_calls:
            msg = f'"{self.elt.path}" will make an infinite loop'
            raise DictConsistencyError(msg, 80, self.elt.xmlfiles)
        self_calls.append(self.elt.path)
        self.calls = self_calls
        if self.option_name is None:
            self.option_name = self.elt.reflector_name
            self.populate_attrib()
            self.populate_informations()
            if hasattr(self.elt, 'provider'):
                name = 'provider:' + self.elt.provider
                if name in self.providers:
                    msg = f'provider {name} declare multiple time'
                    raise DictConsistencyError(msg, 79, self.elt.xmlfiles)
                self.providers[name] = self.dynamic_path
        return self.option_name
    def populate_attrib(self):
@ -267,7 +218,7 @@ class Common:
                        ) -> str:
        """Populate properties
        """
-        option_name = child.source.reflector_object.get(self.calls)
+        option_name = child.source.reflector_object.get()
        kwargs = (f"'condition': ParamOption({option_name}, todict=True, notraisepropertyerror=True), "
                  f"'expected': {self.populate_param(child.expected)}")
        if child.inverse:
@ -280,11 +231,7 @@ class Common:
        """
        if not hasattr(self.elt, 'information'):
            return
-        if isinstance(self.elt.information, dict):
+        for key, value in vars(self.elt.information).items():
            informations = self.elt.information
        else:
            informations = vars(self.elt.information)
        for key, value in informations.items():
            if key == 'xmlfiles':
                continue
            if isinstance(value, str):
@ -296,7 +243,7 @@ class Common:
                       ):
        """Populate variable parameters
        """
-        if param.type in ['number', 'boolean', 'nil', 'string', 'port', 'choice', 'space']:
+        if param.type in ['number', 'boolean', 'nil', 'string', 'port']:
            value = param.text
            if param.type == 'string' and value is not None:
                value = self.convert_str(value)
@ -304,29 +251,25 @@ class Common:
        if param.type == 'variable':
            return self.build_option_param(param)
        if param.type == 'information':
-            if hasattr(self.elt, 'multi') and self.elt.multi:
+            return f'ParamInformation("{param.text}", None)'
                default = []
            else:
                default = None
            return f'ParamInformation("{param.text}", {default})'
        if param.type == 'target_information':
            return f'ParamSelfInformation("{param.text}", None)'
        if param.type == 'suffix':
            return 'ParamSuffix()'
        if param.type == 'index':
            return 'ParamIndex()'
-        raise Exception(_(f'unknown type {param.type}'))  # pragma: no cover
+        raise Exception(f'unknown type {param.type}')  # pragma: no cover
-    def build_option_param(self,
+    @staticmethod
-                           param,
+    def build_option_param(param,
                           ) -> str:
        """build variable parameters
        """
-        option_name = param.text.reflector_object.get(self.calls)
+        option_name = param.text.reflector_object.get()
        params = [f'{option_name}']
        if hasattr(param, 'suffix'):
            param_type = 'ParamDynOption'
-            family = param.family.reflector_object.get(self.calls)
+            family = param.family.reflector_object.get()
            params.extend([f"'{param.suffix}'", f'{family}'])
        else:
            param_type = 'ParamOption'
@ -342,11 +285,7 @@ class Variable(Common):
                 elt,
                 text,
                 objectspace,
                 providers,
                 dynamic_path,
                 ):
        self.providers = providers
        self.dynamic_path = dynamic_path
        super().__init__(elt, text, objectspace)
        self.object_type = CONVERT_OPTION[elt.type]['opttype']
@ -354,14 +293,14 @@ class Variable(Common):
                         keys: dict,
                         ):
        if hasattr(self.elt, 'opt'):
-            keys['opt'] = self.elt.opt.reflector_object.get(self.calls)
+            keys['opt'] = self.elt.opt.reflector_object.get()
-        if hasattr(self.elt, 'choice'):
+        if hasattr(self.elt, 'values'):
-            values = self.elt.choice
+            values = self.elt.values
            if values[0].type == 'variable':
-                value = values[0].name.reflector_object.get(self.calls)
+                value = values[0].name.reflector_object.get()
                keys['values'] = f"Calculation(func.calc_value, Params((ParamOption({value}))))"
            elif values[0].type == 'function':
-                keys['values'] = self.calculation_value(values[0], [])
+                keys['values'] = self.calculation_value(self.elt.values[0], [])
            else:
                keys['values'] = str(tuple([val.name for val in values]))
        if hasattr(self.elt, 'multi') and self.elt.multi:
@ -432,7 +371,7 @@ class Family(Common):
        if hasattr(self.elt, 'suffixes'):
            self.objectspace.has_dyn_option = True
            self.object_type = 'ConvertDynOptionDescription'
-        elif hasattr(self.elt, 'leadership') and self.elt.leadership:
+        elif isinstance(self.elt, self.objectspace.leadership):
            self.object_type = 'Leadership'
        else:
            self.object_type = 'OptionDescription'
@ -447,6 +386,6 @@ class Family(Common):
                         keys: list,
                         ) -> None:
        if hasattr(self.elt, 'suffixes'):
-            dyn = self.elt.suffixes.reflector_object.get(self.calls)
+            dyn = self.elt.suffixes.reflector_object.get()
            keys['suffixes'] = f"Calculation(func.calc_value, Params((ParamOption({dyn}, notraisepropertyerror=True))))"
-        keys['children'] = '[' + ', '.join([child.get(self.calls) for child in self.children]) + ']'
+        keys['children'] = '[' + ', '.join([child.get() for child in self.children]) + ']'
--- a/src/rougail/update.py
+++ b/src/rougail/update.py
@ -31,11 +31,10 @@ from .i18n import _
 from .error import UpgradeError
 from .utils import normalize_family
 from .config import RougailConfig
 VERSIONS = {'creole': ['1'],
-            'rougail': ['0.9', '0.10'],
+            'rougail': ['0.9'],
            }
@ -48,24 +47,16 @@ FUNCTION_VERSIONS = [(root, version, get_function_name(root, version)) for root,
 class RougailUpgrade:
-    def __init__(self,
+    def __init__(self, test=False, upgrade_help=None):
                 test=False,
                 upgrade_help=None,
                 rougailconfig: RougailConfig=None,
                 ) -> None:
        self.test = test
        if upgrade_help is None:
            upgrade_help = {}
        self.upgrade_help = upgrade_help
        if rougailconfig is None:
            rougailconfig = RougailConfig
        self.rougailconfig = rougailconfig
    def load_xml_from_folders(self,
                              srcfolder: str,
                              dstfolder: str,
                              namespace: str,
                              display: bool=True,
                              ):
        """Loads all the XML files located in the xmlfolders' list
@ -76,8 +67,6 @@ class RougailUpgrade:
        for filename in filenames:
            xmlsrc = join(srcfolder, filename)
            xmldst = join(dstfolder, filename)
            if isfile(xmldst):
                raise Exception(f'cannot update "{xmlsrc}" destination file "{xmldst}" already exists')
            try:
                parser = XMLParser(remove_blank_text=True)
                document = parse(xmlsrc, parser)
@ -88,7 +77,6 @@ class RougailUpgrade:
            function_found = False
            for root_name, version, function_version in FUNCTION_VERSIONS:
                if function_found and hasattr(self, function_version):
                    if display:
                    print(f'  - convert {filename} to version {version}')
                    upgrade_help = self.upgrade_help.get(function_version, {}).get(filename, {})
                    if upgrade_help.get('remove') is True:
@ -96,7 +84,6 @@ class RougailUpgrade:
                    root = getattr(self, function_version)(root, upgrade_help, namespace)
                if function_version == search_function_name:
                    function_found = True
                root.attrib['version'] = version
            with open(xmldst, 'wb') as xmlfh:
                xmlfh.write(tostring(root, pretty_print=True, encoding="UTF-8", xml_declaration=True))
    #            if
@ -107,182 +94,6 @@ class RougailUpgrade:
    #            yield xmlfile, document.getroot()
    def update_rougail_0_10(self,
                           root: 'Element',
                           upgrade_help: dict,
                           namespace: str,
                           ) -> 'Element':
        variables = root.find('variables')
        if variables is None:
            return root
        paths = self._get_path_variables(variables,
                                         namespace == 'configuration',
                                         namespace,
                                         )
        constraints = root.find('constraints')
        # convert schedule and schedulemod
        for variable in paths.values():
            variable = variable['variable']
            if variable.tag != 'variable':
                continue
            if 'type' in variable.attrib and variable.attrib['type'] in ['schedule', 'schedulemod']:
                if variable.attrib['type'] == 'schedule':
                    choices = ('none', 'daily', 'weekly', 'monthly')
                else:
                    choices = ('pre', 'post')
                variable.attrib['type'] = 'choice'
                has_value = False
                for value in variable:
                    if value.tag == 'value':
                        has_value = True
                        break
                for name in choices:
                    choice = SubElement(variable, 'choice')
                    choice.text = name
                if not has_value:
                    value = SubElement(variable, 'value')
                    value.text = choices[0]
                variable.attrib['mandatory'] = 'True'
        # convert group to leadership
        groups = []
        if constraints is not None:
            for constraint in constraints:
                if constraint.tag == 'group':
                    constraints.remove(constraint)
                    groups.append(constraint)
        for group in groups:
            if group.attrib['leader'] in paths:
                leader_obj = paths[group.attrib['leader']]
                #FIXME name peut avoir "." il faut le virer
                #FIXME si extra c'est un follower !
                if 'name' in group.attrib:
                    grpname = group.attrib['name']
                    if 'description' in group.attrib:
                        description = group.attrib['description']
                    else:
                        description = grpname
                else:
                    grpname = leader_obj['variable'].attrib['name']
                    if '.' in grpname:
                        grpname = grpname.rsplit('.', 1)[-1]
                    if 'description' in group.attrib:
                        description = group.attrib['description']
                    elif 'description' in leader_obj['variable'].attrib:
                        description = leader_obj['variable'].attrib['description']
                    else:
                        description = grpname
                family = SubElement(leader_obj['parent'], 'family', name=grpname, description=description, leadership="True")
                leader_obj['parent'].remove(leader_obj['variable'])
                family.append(leader_obj['variable'])
            else:
                # append in group
                follower = next(iter(group))
                leader_name = group.attrib['leader']
                if '.' in leader_name:
                    leader_path = leader_name.rsplit('.', 1)[0]
                    follower_path = leader_path + '.' + follower.text
                else:
                    follower_path = follower.text
                obj = paths[follower_path]
                family = SubElement(obj['parent'], 'family', name=leader_name, leadership="True")
                grpname = leader_name
            for follower in group:
                leader_name = group.attrib['leader']
                if '.' in leader_name:
                    leader_path = leader_name.rsplit('.', 1)[0]
                    follower_path = leader_path + '.' + follower.text
                else:
                    follower_path = follower.text
                follower_obj = paths[follower_path]
                follower_obj['parent'].remove(follower_obj['variable'])
                family.append(follower_obj['variable'])
                if '.' in follower_path:
                    new_path = follower_path.rsplit('.', 1)[0] + '.' + grpname + '.' + follower_path.rsplit('.', 1)[1]
                    paths[new_path] = paths[follower_path]
        # convert choice option
        valid_enums = []
        if constraints is not None:
            for constraint in constraints:
                if constraint.tag == 'check' and constraint.attrib['name'] == 'valid_enum':
                    constraints.remove(constraint)
                    valid_enums.append(constraint)
        for valid_enum in valid_enums:
            targets = []
            for target in valid_enum:
                if target.tag != 'target':
                    continue
                if target.text in paths:
                    # not in paths if it's optional
                    # but not check it
                    targets.append(paths[target.text]['variable'])
            params = []
            function_param = None
            for param in valid_enum:
                if param.tag != 'param':
                    continue
                if 'type' in param.attrib and param.attrib['type'] == 'function':
                    function_param = param.text
                    continue
                params.append(param)
            first_choice = None
            for target in targets:
                if function_param is not None:
                    function = SubElement(target, 'choice', type='function', name=function_param)
                for param in params:
                    if function_param is not None:
                        function.append(param)
                    else:
                        choice = SubElement(target, 'choice')
                        if first_choice is None and ('type' not in param.attrib or param.attrib['type'] != 'variable'):
                            first_choice = choice
                        choice.text = param.text
                        if 'type' not in param.attrib and param.text is None:
                            choice_type = 'nil'
                        elif 'type' in param.attrib:
                            choice_type = param.attrib['type']
                        elif 'type' in target.attrib:
                            choice_type = target.attrib['type']
                        else:
                            choice_type = 'string'
                        choice.attrib['type'] = choice_type
            has_value = False
            for target in targets:
                if 'remove_check' in target.attrib:
                    target.attrib['remove_choice'] = target.attrib['remove_check']
            for target in targets:
                for value in target:
                    if value.tag == 'value':
                        has_value = True
                        if 'type' in target.attrib:
                            value.attrib['type'] = target.attrib['type']
            if first_choice is not None and not has_value:
                value = SubElement(target, 'value')
                value.attrib['type'] = first_choice.attrib['type']
                value.text = first_choice.text
            for target in targets:
                if 'remove_choice' not in target.attrib or target.attrib['remove_choice'] != 'True':
                    target.attrib['type'] = 'choice'
        return root
    def _get_path_variables(self, variables, is_variable_namespace, path, dico=None):
        if dico is None:
            dico = {}
        for variable in variables:
            if not is_variable_namespace and path:
                subpath = path + '.'
            else:
                subpath = ''
            if variable.tag not in ['variable', 'family']:
                continue
            subpath += variable.attrib['name']
            if variable.tag == 'family':
                self._get_path_variables(variable, is_variable_namespace, subpath, dico)
            elif variable.tag == 'variable':
                dico[subpath] = {'variable': variable, 'parent': variables}
        return dico
    def update_rougail_0_9(self,
                           root: 'Element',
                           upgrade_help: dict,
@ -290,6 +101,7 @@ class RougailUpgrade:
                           ) -> 'Element':
        # rename root
        root.tag = 'rougail'
        root.attrib['version'] = '0.9'
        variables_auto_valid_enum = {}
        variables_help = {}
        families_help = {}
--- a/src/rougail/xmlreflector.py
+++ b/src/rougail/xmlreflector.py
@ -61,20 +61,11 @@ class XMLReflector:
        :param xmlfolders: list of full folder's name
        """
        filenames = {}
        for xmlfolder in xmlfolders:
-            for filename in listdir(xmlfolder):
+            filenames = [join(xmlfolder, filename) for filename in listdir(xmlfolder) if \
-                if not filename.endswith('.xml'):
+                         filename.endswith('.xml')]
-                    continue
+            filenames.sort()
-                if filename in filenames:
+            for xmlfile in filenames:
                    raise DictConsistencyError(_(f'duplicate xml file name {filename}'), 78, [xmlfolder])
                filenames[filename] = join(xmlfolder, filename)
        if not filenames:
            raise DictConsistencyError(_('there is no XML file'), 77, [xmlfolder])
        file_names = list(filenames.keys())
        file_names.sort()
        for filename in file_names:
            xmlfile = filenames[filename]
                try:
                    document = parse(xmlfile)
                except XMLSyntaxError as err:
--- a/tests/dictionaries/00empty/00_base.xml
+++ b/tests/dictionaries/00empty/00_base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <services>
        <service name="tata">
        </service>
--- a/tests/dictionaries/00empty/makedict/after.json
+++ b/tests/dictionaries/00empty/makedict/after.json
@ -1,9 +1,9 @@
 {
-    "services.tata_service.activate": {
+    "services.tata.activate": {
        "owner": "default",
        "value": true
    },
-    "services.tata_service.manage": {
+    "services.tata.manage": {
        "owner": "default",
        "value": true
    }
--- a/tests/dictionaries/00empty/makedict/base.json
+++ b/tests/dictionaries/00empty/makedict/base.json
@ -1,4 +1,4 @@
 {
-    "services.tata_service.activate": true,
+    "services.tata.activate": true,
-    "services.tata_service.manage": true
+    "services.tata.manage": true
 }
--- a/tests/dictionaries/00empty/makedict/before.json
+++ b/tests/dictionaries/00empty/makedict/before.json
@ -1,9 +1,9 @@
 {
-    "services.tata_service.activate": {
+    "services.tata.activate": {
        "owner": "default",
        "value": true
    },
-    "services.tata_service.manage": {
+    "services.tata.manage": {
        "owner": "default",
        "value": true
    }
--- a/tests/dictionaries/00empty/tiramisu/base.py
+++ b/tests/dictionaries/00empty/tiramisu/base.py
@ -1,21 +1,18 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
    from tiramisu import *
 option_3 = BoolOption(name="activate", doc="activate", default=True)
 option_4 = BoolOption(name="manage", doc="manage", default=True)
-option_2 = OptionDescription(name="tata_service", doc="tata.service", children=[option_3, option_4])
+option_2 = OptionDescription(name="tata", doc="tata", children=[option_3, option_4])
 option_1 = OptionDescription(name="services", doc="services", children=[option_2], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
--- a/tests/dictionaries/00load_autofreeze/00-base.xml
+++ b/tests/dictionaries/00load_autofreeze/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <variable name="myvar" auto_freeze="True">
            <value>no</value>
@ -9,3 +9,5 @@
        </variable>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/00load_autofreeze/tiramisu/base.py
+++ b/tests/dictionaries/00load_autofreeze/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/00load_autofreezeexpert/00-base.xml
+++ b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <variable name="my_var" auto_freeze="True" mode="expert">
            <value>no</value>
@ -9,3 +9,5 @@
        </variable>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py
+++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/00load_autosave/00-base.xml
+++ b/tests/dictionaries/00load_autosave/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <variable name="server_deployed" type="boolean"/>
        <family name="general" description="général">
@ -9,3 +9,5 @@
        </family>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/00load_autosave/tiramisu/base.py
+++ b/tests/dictionaries/00load_autosave/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/00load_autosaveexpert/00-base.xml
+++ b/tests/dictionaries/00load_autosaveexpert/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <variable name="server_deployed" type="boolean"/>
        <family name="general" description="général">
@ -9,3 +9,5 @@
        </family>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py
+++ b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/00load_comment/00-base.xml
+++ b/tests/dictionaries/00load_comment/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <family name="general" description="général">
            <!-- this is a comment -->
@ -9,3 +9,5 @@
        </family>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/00load_comment/tiramisu/base.py
+++ b/tests/dictionaries/00load_comment/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/00load_notype/00-base.xml
+++ b/tests/dictionaries/00load_notype/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <family name="general" description="général">
            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
@ -11,3 +11,5 @@
        </family>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/00load_notype/tiramisu/base.py
+++ b/tests/dictionaries/00load_notype/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/00load_save/00-base.xml
+++ b/tests/dictionaries/00load_save/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <family name="general" description="général">
            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
@ -8,3 +8,5 @@
        </family>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/00load_save/tiramisu/base.py
+++ b/tests/dictionaries/00load_save/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/00load_subfolder/99-base.xml
+++ b/tests/dictionaries/00load_subfolder/99-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <family name="general" description="général">
            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
@ -8,3 +8,5 @@
        </family>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/00load_subfolder/makedict/after.json
+++ b/tests/dictionaries/00load_subfolder/makedict/after.json
@ -1,9 +1,9 @@
 {
-    "rougail.general.mode_conteneur_actif1": {
+    "rougail.general.mode_conteneur_actif": {
        "owner": "default",
        "value": "non"
    },
-    "rougail.general.mode_conteneur_actif": {
+    "rougail.general.mode_conteneur_actif1": {
        "owner": "default",
        "value": "non"
    }
--- a/tests/dictionaries/00load_subfolder/makedict/base.json
+++ b/tests/dictionaries/00load_subfolder/makedict/base.json
@ -1,4 +1,4 @@
 {
-    "rougail.general.mode_conteneur_actif1": "non",
+    "rougail.general.mode_conteneur_actif": "non",
-    "rougail.general.mode_conteneur_actif": "non"
+    "rougail.general.mode_conteneur_actif1": "non"
 }
--- a/tests/dictionaries/00load_subfolder/makedict/before.json
+++ b/tests/dictionaries/00load_subfolder/makedict/before.json
@ -1,9 +1,9 @@
 {
-    "rougail.general.mode_conteneur_actif1": {
+    "rougail.general.mode_conteneur_actif": {
        "owner": "default",
        "value": "non"
    },
-    "rougail.general.mode_conteneur_actif": {
+    "rougail.general.mode_conteneur_actif1": {
        "owner": "default",
        "value": "non"
    }
--- a/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
+++ b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
@ -1,10 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.10">
+
 <rougail version="0.9">
    <variables>
        <family name="general" description="général">
-      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+            <variable name='mode_conteneur_actif1' type='string' description="No change" hidden="True">
                <value>non</value>
            </variable>
        </family>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/00load_subfolder/tiramisu/base.py
+++ b/tests/dictionaries/00load_subfolder/tiramisu/base.py
@ -1,21 +1,18 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
    from tiramisu import *
-option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
--- a/tests/dictionaries/01auto_autofreeze/00-base.xml
+++ b/tests/dictionaries/01auto_autofreeze/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <variable name="server_deployed" type="boolean">
            <value>no</value>
@ -15,3 +15,5 @@
        </fill>
    </constraints>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py
+++ b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/01auto_base/00-base.xml
+++ b/tests/dictionaries/01auto_base/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <family name="general">
            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
@ -10,6 +10,7 @@
            </variable>
        </family>
    </variables>
    <constraints>
        <fill name="calc_val">
            <param type="variable">mode_conteneur_actif1</param>
@ -17,3 +18,5 @@
        </fill>
    </constraints>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/01auto_base/tiramisu/base.py
+++ b/tests/dictionaries/01auto_base/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/01auto_withoutparam/00-base.xml
+++ b/tests/dictionaries/01auto_withoutparam/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <family name="general">
            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
@ -10,9 +10,12 @@
            </variable>
        </family>
    </variables>
    <constraints>
        <fill name="calc_val">
            <target>mode_conteneur_actif</target>
        </fill>
    </constraints>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/01auto_withoutparam/tiramisu/base.py
+++ b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/01base_domainname/00-base.xml
+++ b/tests/dictionaries/01base_domainname/00-base.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <variables>
        <family name="general">
            <variable name="domain" type="domainname" description="Description">
@ -8,3 +8,5 @@
        </family>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/01base_domainname/tiramisu/base.py
+++ b/tests/dictionaries/01base_domainname/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
--- a/tests/dictionaries/01base_file/00-base.xml
+++ b/tests/dictionaries/01base_file/00-base.xml
@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
+<rougail version="0.9">
    <services>
        <service name="test">
            <file>/etc/file</file>
            <file engine="jinja2">/etc/file2</file>
        </service>
    </services>
    <variables>
        <family name="general">
            <variable name="mode_conteneur_actif" type="string" description="Description">
@ -14,3 +16,5 @@
        </family>
    </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
--- a/tests/dictionaries/01base_file/makedict/after.json
+++ b/tests/dictionaries/01base_file/makedict/after.json
@ -3,27 +3,75 @@
        "owner": "default",
        "value": "non"
    },
-    "services.test_service.files.file.name": {
+    "services.test.files.file.engine": {
        "owner": "default",
        "value": "creole"
    },
    "services.test.files.file.group": {
        "owner": "default",
        "value": "root"
    },
    "services.test.files.file.included": {
        "owner": "default",
        "value": "no"
    },
    "services.test.files.file.mode": {
        "owner": "default",
        "value": "0644"
    },
    "services.test.files.file.name": {
        "owner": "default",
        "value": "/etc/file"
    },
-    "services.test_service.files.file.activate": {
+    "services.test.files.file.owner": {
        "owner": "default",
        "value": "root"
    },
    "services.test.files.file.source": {
        "owner": "default",
        "value": "file"
    },
    "services.test.files.file.activate": {
        "owner": "default",
        "value": true
    },
-    "services.test_service.files.file2.name": {
+    "services.test.files.file2.engine": {
        "owner": "default",
        "value": "jinja2"
    },
    "services.test.files.file2.group": {
        "owner": "default",
        "value": "root"
    },
    "services.test.files.file2.included": {
        "owner": "default",
        "value": "no"
    },
    "services.test.files.file2.mode": {
        "owner": "default",
        "value": "0644"
    },
    "services.test.files.file2.name": {
        "owner": "default",
        "value": "/etc/file2"
    },
-    "services.test_service.files.file2.activate": {
+    "services.test.files.file2.owner": {
        "owner": "default",
        "value": "root"
    },
    "services.test.files.file2.source": {
        "owner": "default",
        "value": "file2"
    },
    "services.test.files.file2.activate": {
        "owner": "default",
        "value": true
    },
-    "services.test_service.activate": {
+    "services.test.activate": {
        "owner": "default",
        "value": true
    },
-    "services.test_service.manage": {
+    "services.test.manage": {
        "owner": "default",
        "value": true
    }
--- a/tests/dictionaries/01base_file/makedict/base.json
+++ b/tests/dictionaries/01base_file/makedict/base.json
@ -1,9 +1,21 @@
 {
    "rougail.general.mode_conteneur_actif": "non",
-    "services.test_service.files.file.name": "/etc/file",
+    "services.test.files.file.engine": "creole",
-    "services.test_service.files.file.activate": true,
+    "services.test.files.file.group": "root",
-    "services.test_service.files.file2.name": "/etc/file2",
+    "services.test.files.file.included": "no",
-    "services.test_service.files.file2.activate": true,
+    "services.test.files.file.mode": "0644",
-    "services.test_service.activate": true,
+    "services.test.files.file.name": "/etc/file",
-    "services.test_service.manage": true
+    "services.test.files.file.owner": "root",
    "services.test.files.file.source": "file",
    "services.test.files.file.activate": true,
    "services.test.files.file2.engine": "jinja2",
    "services.test.files.file2.group": "root",
    "services.test.files.file2.included": "no",
    "services.test.files.file2.mode": "0644",
    "services.test.files.file2.name": "/etc/file2",
    "services.test.files.file2.owner": "root",
    "services.test.files.file2.source": "file2",
    "services.test.files.file2.activate": true,
    "services.test.activate": true,
    "services.test.manage": true
 }
--- a/tests/dictionaries/01base_file/makedict/before.json
+++ b/tests/dictionaries/01base_file/makedict/before.json
@ -3,27 +3,75 @@
        "owner": "default",
        "value": "non"
    },
-    "services.test_service.files.file.name": {
+    "services.test.files.file.engine": {
        "owner": "default",
        "value": "creole"
    },
    "services.test.files.file.group": {
        "owner": "default",
        "value": "root"
    },
    "services.test.files.file.included": {
        "owner": "default",
        "value": "no"
    },
    "services.test.files.file.mode": {
        "owner": "default",
        "value": "0644"
    },
    "services.test.files.file.name": {
        "owner": "default",
        "value": "/etc/file"
    },
-    "services.test_service.files.file.activate": {
+    "services.test.files.file.owner": {
        "owner": "default",
        "value": "root"
    },
    "services.test.files.file.source": {
        "owner": "default",
        "value": "file"
    },
    "services.test.files.file.activate": {
        "owner": "default",
        "value": true
    },
-    "services.test_service.files.file2.name": {
+    "services.test.files.file2.engine": {
        "owner": "default",
        "value": "jinja2"
    },
    "services.test.files.file2.group": {
        "owner": "default",
        "value": "root"
    },
    "services.test.files.file2.included": {
        "owner": "default",
        "value": "no"
    },
    "services.test.files.file2.mode": {
        "owner": "default",
        "value": "0644"
    },
    "services.test.files.file2.name": {
        "owner": "default",
        "value": "/etc/file2"
    },
-    "services.test_service.files.file2.activate": {
+    "services.test.files.file2.owner": {
        "owner": "default",
        "value": "root"
    },
    "services.test.files.file2.source": {
        "owner": "default",
        "value": "file2"
    },
    "services.test.files.file2.activate": {
        "owner": "default",
        "value": true
    },
-    "services.test_service.activate": {
+    "services.test.activate": {
        "owner": "default",
        "value": true
    },
-    "services.test_service.manage": {
+    "services.test.manage": {
        "owner": "default",
        "value": true
    }
--- a/tests/dictionaries/01base_file/result/tmpfiles.d/0rougail.conf
+++ b/tests/dictionaries/01base_file/result/tmpfiles.d/0rougail.conf
@ -1,2 +0,0 @@
 C /etc/file 0644 root root - /usr/local/lib/etc/file
 C /etc/file2 0644 root root - /usr/local/lib/etc/file2
--- a/tests/dictionaries_old/01base_file/result/tmpfiles.d/rougail.conf
+++ b/tests/dictionaries_old/01base_file/result/tmpfiles.d/rougail.conf
--- a/tests/dictionaries/01base_file/tiramisu/base.py
+++ b/tests/dictionaries/01base_file/tiramisu/base.py
@ -1,15 +1,12 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
+from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
+from importlib.util import spec_from_loader, module_from_spec
-class func:
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-    pass
+spec = spec_from_loader(loader.name, loader)
-_loader = _SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+func = module_from_spec(spec)
-_spec = _spec_from_loader(_loader.name, _loader)
+loader.exec_module(func)
-_func = _module_from_spec(_spec)
+for key, value in dict(locals()).items():
-_loader.exec_module(_func)
+    if key != ['SourceFileLoader', 'func']:
-for function in dir(_func):
+        setattr(func, key, value)
    if function.startswith('_'):
        continue
    setattr(func, function, getattr(_func, function))
 try:
    from tiramisu3 import *
 except:
@ -17,18 +14,27 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_8 = StrOption(name="engine", doc="engine", default="creole")
-option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_9 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_10 = StrOption(name="included", doc="included", default="no")
-option_7.impl_set_information('source', "file")
+option_11 = StrOption(name="mode", doc="mode", default="0644")
-option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = StrOption(name="owner", doc="owner", default="root")
-option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_14 = StrOption(name="source", doc="source", default="file")
-option_10.impl_set_information('engine', "jinja2")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
-option_10.impl_set_information('source', "file2")
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
-option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_17 = StrOption(name="engine", doc="engine", default="jinja2")
-option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = StrOption(name="group", doc="group", default="root")
-option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = StrOption(name="included", doc="included", default="no")
-option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_13, option_14])
+option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_22 = StrOption(name="owner", doc="owner", default="root")
 option_23 = StrOption(name="source", doc="source", default="file2")
 option_24 = BoolOption(name="activate", doc="activate", default=True)
 option_16 = OptionDescription(name="file2", doc="file2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
 option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_16])
 option_25 = BoolOption(name="activate", doc="activate", default=True)
 option_26 = BoolOption(name="manage", doc="manage", default=True)
 option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_25, option_26])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
--- a/tests/dictionaries/01base_file_disabled/00-base.xml
+++ b/tests/dictionaries/01base_file_disabled/00-base.xml
@ -1,17 +0,0 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.10">
  <services>
    <service name="test">
      <file>/etc/file</file>
      <file engine="jinja2">/etc/file2</file>
      <file disabled='True'>/etc/file3</file>
    </service>
  </services>
  <variables>
    <family name="general">
      <variable name="mode_conteneur_actif" type="string" description="Description">
        <value>non</value>
      </variable>
    </family>
  </variables>
 </rougail>
--- a/tests/dictionaries/01base_file_disabled/makedict/after.json
+++ b/tests/dictionaries/01base_file_disabled/makedict/after.json
@ -1,38 +0,0 @@
 {
    "rougail.general.mode_conteneur_actif": {
        "owner": "default",
        "value": "non"
    },
    "services.test_service.files.file.name": {
        "owner": "default",
        "value": "/etc/file"
    },
    "services.test_service.files.file.activate": {
        "owner": "default",
        "value": true
    },
    "services.test_service.files.file2.name": {
        "owner": "default",
        "value": "/etc/file2"
    },
    "services.test_service.files.file2.activate": {
        "owner": "default",
        "value": true
    },
    "services.test_service.files.file3.name": {
        "owner": "default",
        "value": "/etc/file3"
    },
    "services.test_service.files.file3.activate": {
        "owner": "default",
        "value": false
    },
    "services.test_service.activate": {
        "owner": "default",
        "value": true
    },
    "services.test_service.manage": {
        "owner": "default",
        "value": true
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Emmanuel Garette	0970eee14e	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2021-03-28 15:49:59 +02:00
Emmanuel Garette	e9596c2e2a	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2021-03-27 15:42:06 +01:00
Emmanuel Garette	42b67ce575	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2021-03-27 11:08:19 +01:00
Emmanuel Garette	7eb78e5346	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-11-21 08:11:39 +01:00
Emmanuel Garette	11553e6f09	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-11-20 18:02:55 +01:00
Emmanuel Garette	0722e76fcc	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-11-18 22:18:54 +01:00
Emmanuel Garette	adaafde2e5	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-11-15 11:22:19 +01:00
Emmanuel Garette	19d9fdc705	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-11-15 11:02:10 +01:00
Emmanuel Garette	11294fdd61	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-11-14 17:21:05 +01:00
Emmanuel Garette	4351662f2e	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-11-14 08:02:45 +01:00
Emmanuel Garette	5bf8d69e91	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-11-08 18:06:45 +01:00
Emmanuel Garette	a9c74d68ff	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-10-14 18:17:45 +02:00
Emmanuel Garette	48d190d39b	update dependencies	2020-08-12 12:22:19 +02:00
Emmanuel Garette	f474edd8ae	rougail => python3-rougail	2020-08-12 11:14:02 +02:00
Emmanuel Garette	61fc9b15e5	ajout de la dependance vers cheetah	2020-08-12 08:41:54 +02:00
Emmanuel Garette	79312cc8c8	Merge branch 'develop' into dist/risotto/risotto-2.7.1/develop	2020-08-12 08:37:12 +02:00
Emmanuel Garette	0da8b868ac	Merge branch 'develop' into dist/risotto/risotto-2.7.1/develop	2020-08-07 17:18:01 +02:00
Emmanuel Garette	a2e8b5dad4	Merge branch 'develop' into dist/risotto/risotto-2.7.1/develop	2020-08-05 10:33:54 +02:00
Benjamin Bohard	58b3880e9b	Delete changelog	2020-07-29 09:56:15 +02:00
Benjamin Bohard	413ab6dbb0	Add debian folder in packaging branch	2020-07-29 09:55:51 +02:00
		`@ -1,2 +0,0 @@`
			`C /etc/file 0644 root root - /usr/local/lib/etc/file`
			`C /etc/file2 0644 root root - /usr/local/lib/etc/file2`