diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..cbb3a13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.rpm
+*.log
+*spec-20*
+*.tar.gz
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0eee92f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+# Makefile for source rpm: smeserver-affa
+# $Id: Makefile,v 1.1 2020/10/07 09:57:03 brianr Exp $
+NAME := smeserver-affa
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
diff --git a/README.md b/README.md
index aad1b84..90ea55e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,21 @@
-# smeserver-affa
+# smeserver-affa
-SMEServer Koozali developed git repo for smeserver-affa smecontribs
\ No newline at end of file
+SMEServer Koozali developed git repo for smeserver-affa smecontribs
+
+## Wiki
+
https://wiki.koozali.org/Affa
+
https://wiki.koozali.org/Affa/fr
+
https://wiki.koozali.org/Affa:Additional_information
+
https://wiki.koozali.org/Backup_with_Affa_and_FreeDup
+
https://wiki.koozali.org/Backup_Windows_Computers_Using_Affa
+
https://wiki.koozali.org/Backup_of_ESXi_Virtual_Machines_using_Affa
+
https://wiki.koozali.org/Rsyncd_setup_on_a_windows_computer_for_use_with_Affa_backup
+
+## Bugzilla
+Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-affa&product=SME%20Contribs&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
+
+## Description
+
+
*This description has been generated by an LLM AI system and cannot be relied on to be fully correct.*
+*Once it has been checked, then this comment will be deleted*
+
diff --git a/additional/COPYING b/additional/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/additional/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is 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. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ 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.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ 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 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. Use with the GNU Affero General Public License.
+
+ 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 Affero 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 special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 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 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 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.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ 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 GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/additional/LICENSE b/additional/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/additional/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is 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. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ 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.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ 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 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. Use with the GNU Affero General Public License.
+
+ 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 Affero 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 special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 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 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 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.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ 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 GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/additional/README b/additional/README
new file mode 100644
index 0000000..9225543
--- /dev/null
+++ b/additional/README
@@ -0,0 +1 @@
+smeserver-affa is a RPM for SME Server, a Linux distro oriented server. see http://wiki.contribs.org
diff --git a/additional/WARRANTY b/additional/WARRANTY
new file mode 100644
index 0000000..d30b2cc
--- /dev/null
+++ b/additional/WARRANTY
@@ -0,0 +1,8 @@
+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.
diff --git a/contriborbase b/contriborbase
new file mode 100644
index 0000000..9b7fd51
--- /dev/null
+++ b/contriborbase
@@ -0,0 +1 @@
+contribs10
diff --git a/createlinks b/createlinks
new file mode 100644
index 0000000..9919ed5
--- /dev/null
+++ b/createlinks
@@ -0,0 +1,74 @@
+#! /usr/bin/perl -w
+
+use esmith::Build::CreateLinks qw(:all);
+
+# our event specific for updating with yum without reboot
+$event = "smeserver-affa-update";
+# add here the path to your templates needed to expand
+# see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
+
+#foreach my $file (qw(
+# /etc/systemd/system-preset/49-koozali.preset
+#))
+#{
+# templates2events( $file, $event );
+#}
+
+# action needed in case we have a systemd unit
+#event_link("systemd-default", $event, "10");
+#event_link("systemd-reload", $event, "50");
+
+# action specific to this package
+#event_link("affa-update", $event, "60");
+
+# services we need to restart
+#safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/affa");
+
+# affa-update
+#my $event = "affa-update";
+#foreach (qw(
+# Files to expand
+# /etc/rc.d/init.d/masq
+# /etc/sysctl.conf
+# ))
+#
+# templates2events("$_", qw(
+# Events
+# post-upgrade
+# console-save
+# bootstrap-console-save
+# remoteaccess-update
+# affa-update
+# ));
+#
+
+#--------------------------------------------------
+# actions for affa-update event
+#--------------------------------------------------
+
+#event_link("ipsec-update", $event, "10");
+
+# Runlevel init links.
+#service_link_enhanced("ipsec", "S95", "7");
+#service_link_enhanced("ipsec", "K21", "6");
+#service_link_enhanced("ipsec", "K21", "0");
+#service_link_enhanced("ipsec", "K21", "1");
+
+#safe_symlink("adjust", "root/etc/e-smith/events/$event/services2adjust/masq");
+
+# Set up generic logfile timestamp renaming/symlinking
+
+#foreach (qw(
+# /var/log/affa/affa.log
+# ))
+#{
+# safe_touch "root/etc/e-smith/events/logrotate/logfiles2timestamp/$_";
+#
+
+#--------------------------------------------------
+# actions for logrotate event
+#--------------------------------------------------
+
+#$event = "logrotate";
+
+#safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ipsec");
diff --git a/root/etc/affa/GlobalAffaConfig.conf b/root/etc/affa/GlobalAffaConfig.conf
new file mode 100644
index 0000000..21079b9
--- /dev/null
+++ b/root/etc/affa/GlobalAffaConfig.conf
@@ -0,0 +1,5 @@
+[GlobalAffaConfig]
+sendStatus=weekly
+globalStatus=jobs
+EmailAddress=root
+status=enabled
diff --git a/root/etc/affa/localhost.conf b/root/etc/affa/localhost.conf
new file mode 100644
index 0000000..b27e87f
--- /dev/null
+++ b/root/etc/affa/localhost.conf
@@ -0,0 +1,22 @@
+[localhost]
+remoteHostName=localhost
+Include=/root
+Include=/etc/affa
+ConnectionCheckTimeout=120
+Debug=no
+Description=Testjob localhost backup
+DiskSpaceWarn=strict
+RootDir=/var/affa
+TimeSchedule=0215
+dailyKeep=7
+localNice=15
+monthlyKeep=12
+remoteNice=15
+rsync--inplace=yes
+rsyncCompress=no
+rsyncTimeout=900
+scheduledKeep=1
+sshPort=22
+weeklyKeep=4
+yearlyKeep=1
+status=disabled
diff --git a/root/etc/affa/sample.conf.dist b/root/etc/affa/sample.conf.dist
new file mode 100644
index 0000000..d672048
--- /dev/null
+++ b/root/etc/affa/sample.conf.dist
@@ -0,0 +1,5 @@
+[samplejob]
+remoteHostName=192.168.1.100
+sshPort=22
+Include=/root
+Include=/home
diff --git a/root/etc/affa/sample_SME_SME.conf.sample b/root/etc/affa/sample_SME_SME.conf.sample
new file mode 100644
index 0000000..bb50cb7
--- /dev/null
+++ b/root/etc/affa/sample_SME_SME.conf.sample
@@ -0,0 +1,22 @@
+[SME_SME]
+remoteHostName=IP_SME_to_backup
+SMEServer=yes
+Watchdog=yes
+RPMCheck=yes
+ConnectionCheckTimeout=120
+Debug=no
+Description=Testjob bckup of a SME by a SME
+DiskSpaceWarn=strict
+RootDir=/var/affa
+TimeSchedule=0215
+localNice=15
+remoteNice=15
+rsync--inplace=yes
+rsyncCompress=no
+rsyncTimeout=900
+scheduledKeep=1
+dailyKeep=7
+weeklyKeep=4
+monthlyKeep=12
+yearlyKeep=1
+status=enabled
diff --git a/root/etc/affa/sample_SME_usb.conf.sample b/root/etc/affa/sample_SME_usb.conf.sample
new file mode 100644
index 0000000..f6802cb
--- /dev/null
+++ b/root/etc/affa/sample_SME_usb.conf.sample
@@ -0,0 +1,25 @@
+[SME_SME]
+remoteHostName=IP_SME_to_backup
+SMEServer=yes
+Watchdog=yes
+RPMCheck=yes
+ConnectionCheckTimeout=120
+Debug=no
+Description=Testjob backup of a SME on the usb hard-drive of a SME
+DiskSpaceWarn=strict
+RootDir=/mnt/hard_drive
+AutomountDevice=/dev/sdc1
+AutomountPoint=/mnt/hard_drive
+AutoUnmount=yes
+TimeSchedule=0215
+localNice=15
+remoteNice=15
+rsync--inplace=yes
+rsyncCompress=no
+rsyncTimeout=900
+scheduledKeep=1
+dailyKeep=7
+weeklyKeep=4
+monthlyKeep=12
+yearlyKeep=1
+status=enabled
diff --git a/root/etc/affa/sample_localhost_SME_complete.conf.sample b/root/etc/affa/sample_localhost_SME_complete.conf.sample
new file mode 100644
index 0000000..904af7d
--- /dev/null
+++ b/root/etc/affa/sample_localhost_SME_complete.conf.sample
@@ -0,0 +1,22 @@
+[localSME]
+remoteHostName=localhost
+SMEServer=yes
+Watchdog=yes
+ConnectionCheckTimeout=120
+Debug=no
+Description=Testjob localhost for SME comlete configuration
+DiskSpaceWarn=strict
+RootDir=/var/affa
+TimeSchedule=0215
+localNice=15
+remoteNice=15
+rsync--inplace=yes
+rsyncCompress=no
+rsyncTimeout=900
+scheduledKeep=1
+sshPort=22
+dailyKeep=7
+weeklyKeep=4
+monthlyKeep=12
+yearlyKeep=1
+status=enabled
diff --git a/root/etc/affa/sample_localhost_SME_minimal.conf.sample b/root/etc/affa/sample_localhost_SME_minimal.conf.sample
new file mode 100644
index 0000000..ae64618
--- /dev/null
+++ b/root/etc/affa/sample_localhost_SME_minimal.conf.sample
@@ -0,0 +1,8 @@
+[localSME]
+remoteHostName=localhost
+SMEServer=yes
+Watchdog=yes
+Description=Testjob localhost for SME minimal configuration
+RootDir=/var/affa
+TimeSchedule=0215
+
diff --git a/root/etc/affa/scripts/SME/backupList.pl b/root/etc/affa/scripts/SME/backupList.pl
new file mode 100755
index 0000000..c076ebf
--- /dev/null
+++ b/root/etc/affa/scripts/SME/backupList.pl
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+use esmith::Backup;
+my $b = new esmith::Backup or die 'Error';
+my @list = $b->restore_list;
+
+foreach my $dir (@list){
+ $dir = "/$dir";
+ push (@newList, $dir);
+}
+
+print (join ',', @newList);
+
+exit;
+
diff --git a/root/etc/affa/scripts/SME/backupList.sh b/root/etc/affa/scripts/SME/backupList.sh
new file mode 100755
index 0000000..be7a927
--- /dev/null
+++ b/root/etc/affa/scripts/SME/backupList.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+VALUE=$(/usr/bin/perl -w /tmp/backupList.pl)
+echo $VALUE
+
diff --git a/root/etc/affa/scripts/SME/signal-post-backup b/root/etc/affa/scripts/SME/signal-post-backup
new file mode 100755
index 0000000..83d3950
--- /dev/null
+++ b/root/etc/affa/scripts/SME/signal-post-backup
@@ -0,0 +1,3 @@
+#!/bin/sh
+/sbin/e-smith/signal-event post-backup
+
diff --git a/root/etc/affa/scripts/SME/signal-post-upgrade-reboot b/root/etc/affa/scripts/SME/signal-post-upgrade-reboot
new file mode 100755
index 0000000..c791523
--- /dev/null
+++ b/root/etc/affa/scripts/SME/signal-post-upgrade-reboot
@@ -0,0 +1,3 @@
+#!/bin/sh
+/sbin/e-smith/signal-event post-upgrade
+/sbin/e-smith/signal-event reboot
diff --git a/root/etc/affa/scripts/SME/signal-pre-backup b/root/etc/affa/scripts/SME/signal-pre-backup
new file mode 100755
index 0000000..57e6c87
--- /dev/null
+++ b/root/etc/affa/scripts/SME/signal-pre-backup
@@ -0,0 +1,3 @@
+#!/bin/sh
+/sbin/e-smith/signal-event pre-backup desktop
+
diff --git a/root/etc/affa/scripts/SME/signal-pre-restore b/root/etc/affa/scripts/SME/signal-pre-restore
new file mode 100755
index 0000000..b074891
--- /dev/null
+++ b/root/etc/affa/scripts/SME/signal-pre-restore
@@ -0,0 +1,2 @@
+#!/bin/sh
+/sbin/e-smith/signal-event pre-restore desktop
diff --git a/root/etc/affa/scripts/mysql-dump-tables b/root/etc/affa/scripts/mysql-dump-tables
new file mode 100755
index 0000000..549f158
--- /dev/null
+++ b/root/etc/affa/scripts/mysql-dump-tables
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+mkdir -p /tmp/MySQL-Dumps
+chmod 700 /tmp/MySQL-Dumps
+for db in $(mysql -BNre "show databases;")
+do
+ mysqldump --add-drop-table --single-transaction -QB "$db" -r /tmp/MySQL-Dumps/"$db".dump || exit 1
+ chmod 400 /tmp/MySQL-Dumps/"$db".dump
+done
+exit 0
diff --git a/root/etc/affa/scripts/postscript-sample.pl b/root/etc/affa/scripts/postscript-sample.pl
new file mode 100755
index 0000000..f050959
--- /dev/null
+++ b/root/etc/affa/scripts/postscript-sample.pl
@@ -0,0 +1,14 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+(my $hostname, my $job, my $sshCmd) = @ARGV;
+
+# output is written to the log
+print "postJobCommand script postscript-sample.pl\n";
+print "hostname=$hostname\n";
+print "job=$job\n";
+print "sshCmd=$sshCmd\n";
+system("$sshCmd $hostname df");
+
+exit 0;
diff --git a/root/etc/affa/scripts/postscriptRemote-sample.pl b/root/etc/affa/scripts/postscriptRemote-sample.pl
new file mode 100755
index 0000000..c1cfbb5
--- /dev/null
+++ b/root/etc/affa/scripts/postscriptRemote-sample.pl
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+(my $hostname, my $job) = @ARGV;
+
+# output is written to the log
+print "postJobCommandRemote script postscriptRemote-sample.pl\n";
+print "hostname=$hostname\n";
+print "job=$job\n";
+system("df");
+
+exit 0;
diff --git a/root/etc/affa/scripts/prescript-sample.pl b/root/etc/affa/scripts/prescript-sample.pl
new file mode 100755
index 0000000..7803f8b
--- /dev/null
+++ b/root/etc/affa/scripts/prescript-sample.pl
@@ -0,0 +1,14 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+(my $hostname, my $job, my $sshCmd) = @ARGV;
+
+# output is written to the log
+print "preJobCommand script prescript-sample.pl\n";
+print "hostname=$hostname\n";
+print "job=$job\n";
+print "sshCmd=$sshCmd\n";
+system("$sshCmd $hostname ls -l /var");
+
+exit 0;
diff --git a/root/etc/affa/scripts/prescriptRemote-sample.pl b/root/etc/affa/scripts/prescriptRemote-sample.pl
new file mode 100755
index 0000000..0f64358
--- /dev/null
+++ b/root/etc/affa/scripts/prescriptRemote-sample.pl
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+(my $hostname, my $job) = @ARGV;
+
+# output is written to the log
+print "preJobCommandRemote script prescriptRemote-sample.pl\n";
+print "hostname=$hostname\n";
+print "job=$job\n";
+system("ls -l /var");
+
+exit 0;
diff --git a/root/etc/affa/scripts/yum_install_packages.sh b/root/etc/affa/scripts/yum_install_packages.sh
new file mode 100755
index 0000000..8358cb8
--- /dev/null
+++ b/root/etc/affa/scripts/yum_install_packages.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+mkdir -p /tmp/yum-install
+echo -n "yum install " > /tmp/yum-install/install_all.$$
+yum list installed |grep -v "^ "|sed -e 's/ .*//' | grep "\."| sed -e 's/\..*//' | tr '\n' ' ' >> /tmp/yum-install/install_all.$$
+mv /tmp/yum-install/install_all.$$ /tmp/yum-install/install_all
diff --git a/root/etc/cron.d/affa b/root/etc/cron.d/affa
new file mode 100644
index 0000000..10dfec9
--- /dev/null
+++ b/root/etc/cron.d/affa
@@ -0,0 +1 @@
+*/15 * * * * root /sbin/affa --_cronupdate
diff --git a/root/etc/e-smith/templates/etc/smb.conf/95Affa b/root/etc/e-smith/templates/etc/smb.conf/95Affa
new file mode 100644
index 0000000..a9cfe5d
--- /dev/null
+++ b/root/etc/e-smith/templates/etc/smb.conf/95Affa
@@ -0,0 +1,3 @@
+# WARNING: don't remove the # of the following section!
+#[Affa-jobs]
+
diff --git a/root/etc/logrotate.d/affa b/root/etc/logrotate.d/affa
new file mode 100644
index 0000000..9126b5f
--- /dev/null
+++ b/root/etc/logrotate.d/affa
@@ -0,0 +1,5 @@
+/var/log/affa/*.log {
+ weekly
+ rotate 5
+ missingok
+}
diff --git a/root/etc/profile.d/affa.sh b/root/etc/profile.d/affa.sh
new file mode 100755
index 0000000..4bc2694
--- /dev/null
+++ b/root/etc/profile.d/affa.sh
@@ -0,0 +1,20 @@
+function _affa()
+{
+ local cur; cur=${COMP_WORDS[$COMP_CWORD]}
+ case $COMP_CWORD in
+ # option
+ 1)
+ COMPREPLY=( $(/sbin/affa --_shorthelp | grep " affa $cur"|awk '{print $3}' ) )
+ ;;
+ # job
+ 2)
+ /sbin/affa --_shorthelp | grep -qs -- "${COMP_WORDS[1]}.*JOB"
+ if [ "$?" == 0 ] ; then
+ COMPREPLY=( $(/sbin/affa --_jobs | grep "^$cur" ) )
+ fi
+ ;;
+ esac
+ return 0
+}
+complete -F _affa affa
+
diff --git a/root/etc/sudoers.d/affa b/root/etc/sudoers.d/affa
new file mode 100644
index 0000000..55b4560
--- /dev/null
+++ b/root/etc/sudoers.d/affa
@@ -0,0 +1,2 @@
+Defaults:nagios !requiretty
+nagios ALL=(ALL) NOPASSWD: /sbin/affa
diff --git a/root/sbin/affa b/root/sbin/affa
new file mode 100644
index 0000000..7eb4de9
--- /dev/null
+++ b/root/sbin/affa
@@ -0,0 +1,5264 @@
+#!/usr/bin/perl -w
+
+#----------------------------------------------------------------------
+# Affa is a rsync based backup program for Linux.
+# It remotely backups Linux or other systems, which have either the rsync
+# program and the sshd service or the rsyncd service installed.
+# Please see http://affa.sf.net for full documentation.
+# Copyright (C) 2004-2012 by Michael Weinberger
+# This program comes with ABSOLUTELY NO WARRANTY; for details type 'affa --warranty'.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; type 'affa --license' for details.
+#----------------------------------------------------------------------
+
+# ToDO
+# re-order the getSourceDirs
+
+# Line 820
+#2969; my $needed = int( $report->val( 'Report', 'TotalFileSize' ) / 1024 );
+
+# Fix the CLI
+#1629; my $archive = $ARGV[1] eq '' ? $job{'Archive'} : $ARGV[1] ; #Overide archive from the CLI if set
+
+# Need to fix the 'selected' rise version here
+# sub riseFromDeath() {
+
+# not ExecCmd( @cmd, 0 ) or affaErrorExit("writing list of installed RPMs failed."); # reetp fix this around 1580
+
+# Restore will fail if contribs are not installed first. rsycn < 3.3.0 cannot make the directories.
+# This will be fixed in rsync 3.3.0+ and v11
+
+# 19-08-24
+# RPM version
+my $VERSION='4.0-2';
+# Script Sub Version j
+
+# This will remove the trailing -1 release number for docs
+my $shortVersion = $VERSION;
+$shortVersion =~ s/-[0-9]+//;
+
+
+# Development code to find which routines take time
+# my $develTimer = 0;
+# use Devel::Timer;
+# my $timer = Devel::Timer->new();
+
+
+
+#----------------------------------------------------------------------
+#
+# A few notes - 21/09/2021
+#
+# This is a huge script and probably needs breaking up
+# It probably has lots that can be cleaned or removed
+# It is starting to become systemd aware, but
+# SME is still not fully systemd manageable and still relies
+# on some old init scripts
+#
+# freedup for SME v10 is in smetest or smecontribs
+#
+# reetp - what if this is backing up a remote linux box but non SME?
+# This has become more and more SME specific and certain config settings
+# may trigger unusual behavior.
+#----------------------------------------------------------------------
+
+use strict;
+use Date::Format;
+use Errno;
+use File::Path;
+use File::stat;
+use File::Copy;
+use Digest::MD5;
+use Cwd;
+use Filesys::DiskFree;
+use Getopt::Long;
+use Mail::Send;
+use Time::Local;
+use Sys::Hostname;
+use Config::IniFiles;
+use Proc::ProcessTable;
+
+##########################
+#ajoute
+use esmith::Backup;
+use esmith::ConfigDB;
+
+# ajout pour V3.2.2-2
+use File::Basename;
+
+# Added for 3.3.1
+use esmith::Service;
+
+#use Affa::lib qw(ExecCmd setlog lg dbg);
+########use Affa::lib qw(ExecCmd setlog lg dbg);
+#fin ajout
+#########################
+
+$| = 1; # flush output
+
+#$ARGV[0]
+# prototypes
+sub affaErrorExit($);
+sub affaExit($);
+sub checkArchiveExists($$);
+sub checkConfig();
+sub checkConnection($);
+sub checkConnectionsAll();
+sub checkConnection_silent($$$);
+
+# ajout pour V3.2.2-2
+sub checkForDiskLabel($);
+# fin ajout
+
+sub checkCrossFS($$);
+sub cleanup();
+sub convertReportV2toV3($$);
+sub cronSetup();
+# sub dbg($); reetp - duplicate
+sub dbg($);
+sub deduplicate($);
+sub deleteJob();
+sub df($);
+sub DiskSpaceWarn();
+sub DiskUsage();
+sub DiskUsageRaw();
+sub ExecCmd( \@$ );
+sub ExecCmdBackupList( \@$ );
+sub execJobCommand($$);
+sub execJobCommandRemote($$);
+sub execPostJobCommand($);
+sub execPreJobCommand($);
+sub findProcessId($$);
+sub fullRestore();
+sub getChildProcess($$);
+sub getConfigFile($);
+sub getConfigFileList();
+sub getIncExc($);
+sub getExcludedString();
+sub getIncludedString();
+sub getJobConfig($);
+sub getJobs();
+sub getLinkdest($$);
+sub getLock($);
+sub getMultivalueKeys();
+sub getProcessState($);
+sub getReportVal($$);
+sub getSourceDirs($);
+sub getSourceDirsString($);
+sub getStatus();
+sub getStatusRaw();
+sub isMounted($$);
+sub jobsnrpe($);
+sub killall();
+sub killJob($);
+sub killProcessGroup($$);
+sub lg($);
+sub listArchives();
+sub listArchivesRaw($);
+sub listJobs();
+sub logTail();
+sub mailTest();
+###### ligne suivante modifiée umount diskusage - bug 9147
+# sub mount($$$); # reetp - which mount?
+sub mount($$$%);
+sub moveArchive();
+sub moveFileorDir($$);
+sub nrpe();
+sub remoteCopy($$$);
+sub removeDir($$);
+sub removeLock();
+sub renameConfigKey($$$);
+sub renameJob();
+sub resumeInterrupted();
+sub revokeKeys($);
+sub sanityCheckConfFiles();
+sub sendErrorMesssage();
+sub sendKeys();
+sub sendStatus();
+sub sendSuccessMesssage();
+sub setLock();
+sub setlog($);
+sub setupSamba();
+sub shiftArchives();
+sub showConfigPathes();
+sub showConfigPathesRaw();
+sub showDefaults();
+sub showHelp($);
+sub showProperty();
+sub showSchedule();
+sub showTextfile($);
+sub showVersion();
+sub SignalHandler();
+sub trim($);
+sub unmount($$);
+sub writeConfigFile($);
+
+####################################################################################
+########### ajouts
+sub compareRPMLists($);
+sub imapIndexFilesDelete();
+sub imapIndexFilesDeleteCommand();
+sub installedRPMsList($);
+sub installWatchdog($);
+sub mailTestWatchdogRemote($);
+sub riseFromDeath();
+sub runRiseRsync($$$);
+sub saveMySoul();
+sub undoRise();
+
+########## fin ajouts
+###################################################################################
+
+###################################################################################
+################ ajouts
+
+my $configDB = esmith::ConfigDB->open or die "Error: Couldn't open config db.";
+my $LocalIP = $configDB->get("LocalIP")->value;
+my $DomainName = $configDB->get("DomainName")->value;
+my $SystemName = $configDB->get("SystemName")->value;
+
+my $rpmlist = "/home/e-smith/db/affa-rpmlist"; # list of installed RPMs
+my $backupList = "BackupDirectoryList.txt";
+
+my @services = ( 'crond', 'smbd', 'qmail', 'qpsmtpd', 'sqpsmtpd' );
+
+my $ServicesStopped = 0;
+
+my $sshQuiet = "-q";
+
+my $ServerBasename = "AFFA.$SystemName.$DomainName-$LocalIP";
+
+my $allow_retry = 0;
+my $defaultEmail = 'admin';
+
+my $affaTitle = "Affa version $VERSION on $SystemName";
+my $smbconf = '/etc/samba/smb.conf';
+
+#############
+# reetp
+# So we could change this to check the samba status as this is ONLY checking
+# For the script existence OR /sbin/e-smith/service smb status | grep Active
+
+my $systemD = new esmith::Service();
+
+# Service command << not required now
+# $serviceCommand = '/sbin/e-smith/service'
+
+my $SambaStartScript = '/usr/lib/systemd/system/smbd.service';
+#my $smbStatus = $configDB->get_prop( 'smb', 'status' ) || 'disabled';
+
+$systemD->{'serviceName'} = 'smbd';
+
+my $smbdStatus = ( $systemD->is_enabled() ) ? "enabled" : "disabled";
+
+# nrpe too
+my $NRPEStartScript = '/usr/lib/systemd/system/nrpe.service';
+#my $nrpeStatus = $configDB->get_prop( 'nrpe', 'status' ) || 'disabled';
+
+$systemD->{'serviceName'} = 'nrpe';
+
+my $nrpeStatus = ( $systemD->is_enabled() ) ? "enabled" : "disabled";
+
+#############
+
+# Test binary built in reetpTest repo
+# No idea if it works on v10
+my $dedupBinary = '/usr/bin/freedup';
+
+my $cfg; # ini file
+
+my $curtime = time(); # now timestamp
+my $thisDay = time2str( "%Y%j", $curtime ); # day of year 1-366
+my $thisWeek = time2str( "%Y%W", $curtime ); # week of year 1-53
+my $thisMonth = time2str( "%Y%m", $curtime ); # month 1-12
+my $thisYear = time2str( "%Y", $curtime ); # 4-digit year
+my $process_id = $$; # my PID
+my $jobname = 'NONE';
+my $Command = '';
+my $interactive = 0;
+my %autoMounted = ();
+my $interrupt = '';
+my $ExecCmdOut = '';
+my @Messages = (); # List of all log messages
+my $logdir = '/var/log/affa'; # Logdir
+my $logfile = "$logdir/affa-GLOBAL-LOGFILE.log"; # Logfile
+my $scriptdir = '/etc/affa/scripts';
+my $lockdir = '/var/lock/affa'; # Process lock
+my $archive = '';
+my $restoreVer = '';
+File::Path::mkpath( $lockdir, 0, 0700 ) if not -d $lockdir;
+
+# reetp this was not set anywhere at this point so added it right at the start
+# otherwise when you initially run you get a dir not found
+# it does get set in getDefaultConfig()
+# 'RootDir' => '/var/affa',
+# Maybe should be called earlier?
+my $storagedir = '/var/affa'; # Storage directory
+File::Path::mkpath( $storagedir, 0, 0700 ) if not -d $storagedir;
+
+
+if ( not $ARGV[0] ) {
+ showHelp(1);
+ exit;
+}
+
+my %opts;
+my $runninglog = "Affa $VERSION: Running $0 @ARGV";
+my $getRes = GetOptions(
+ '15' => \$opts{'15'},
+ '30' => \$opts{'30'},
+ 'all' => \$opts{'all'},
+ 'backup' => \$opts{'run'}, # same as --run
+ 'check-connections' => \$opts{'check-connections'},
+ 'cleanup' => \$opts{'cleanup'},
+ 'csv' => \$opts{'csv'},
+ 'configcheck' => \$opts{'configcheck'},
+ 'nrpe' => \$opts{'nrpe'},
+ 'debug' => \$opts{'debug'},
+ 'cli-debug' => \$opts{'cli-debug'},
+ 'delete-job' => \$opts{'delete-job'},
+ 'disk-usage' => \$opts{'disk-usage'},
+ 'full-restore' => \$opts{'full-restore'},
+ 'help' => \$opts{'help'},
+ '_jobs' => \$opts{'jobs'},
+ '_jobsnrpe' => \$opts{'jobsnrpe'},
+ 'init-nrpe' => \$opts{'init-nrpe'},
+ '_cronupdate' => \$opts{'cronupdate'},
+ 'killall' => \$opts{'killall'},
+ 'kill' => \$opts{'kill'},
+ 'resume=s' => \$opts{'resume'},
+ 'list-archives' => \$opts{'list-archives'},
+ 'preserve-newer=s' => \$opts{'preserve-newer'},
+ 'delete=s' => \$opts{'delete'},
+ '_delay=s' => \$opts{'delay'},
+ 'log-tail' => \$opts{'log-tail'},
+ 'mailtest' => \$opts{'mailtest'},
+ 'make-cronjobs' => \$opts{'make-cronjobs'},
+ 'move-archive' => \$opts{'move-archive'},
+ 'outfile=s' => \$opts{'outfile'},
+ 'rename-job' => \$opts{'rename-job'},
+ 'RetryAfter=s' => \$opts{'RetryAfter'},
+ 'RetryAttempts=s' => \$opts{'RetryAttempts'},
+ 'revoke-key' => \$opts{'revoke-key'},
+ 'run' => \$opts{'run'},
+ 'send-keys' => \$opts{'send-keys'},
+ 'send-status' => \$opts{'send-status'},
+ '_shorthelp' => \$opts{'shorthelp'},
+ 'show-config-pathes' => \$opts{'show-config-pathes'},
+ 'show-property' => \$opts{'show-property'},
+ 'show-schedule' => \$opts{'show-schedule'},
+ 'show-default-config' => \$opts{'show-default-config'},
+ 'status' => \$opts{'status'},
+ 'resume-interrupted' => \$opts{'resume-interrupted'},
+ 'version' => \$opts{'version'},
+ 'warranty' => \$opts{'warranty'},
+ 'license' => \$opts{'license'},
+ 'silent' => \$opts{'silent'},
+ 'watchdog=s' => \$opts{'watchdog'},
+ "rise" => \$opts{'rise'},
+ "undo-rise" => \$opts{'undo-rise'},
+ "sanity-check" => \$opts{'sanityheck'},
+);
+
+####################################################################################
+#### ajouté paramètre watchdog=s + rise + undo-rise 2 lignes plus haut
+
+my $configfile = "/tmp/affa-config-$curtime-$$";
+unlink($configfile);
+
+# Check the config files are OK
+sanityCheckConfFiles();
+
+my $cliDebug = 0;
+
+if ( $opts{'cli-debug'} ) {
+ $cliDebug = 1;
+}
+
+# get default config - no job specificed
+my %job = getJobConfig('');
+
+if ( $opts{'nrpe'} ) {
+ exit nrpe();
+}
+
+if ( $opts{'cronupdate'} ) {
+ $interactive = 1;
+ cronSetup();
+ exit 0;
+}
+
+if ( $opts{'version'} ) {
+ showVersion();
+ exit 0;
+}
+if ( $opts{'license'} ) {
+ showTextfile("/usr/share/doc/smeserver-affa-$shortVersion/LICENSE");
+ exit 0;
+}
+if ( $opts{'warranty'} ) {
+ showTextfile("/usr/share/doc/smeserver-affa-$shortVersion/WARRANTY");
+ exit 0;
+}
+if ( $opts{'help'} ) {
+ showHelp(0);
+ exit 0;
+}
+if ( $opts{'jobs'} ) {
+ listJobs();
+ exit 0;
+}
+if ( $opts{'init-nrpe'} ) {
+ jobsnrpe(1);
+ exit 0;
+}
+if ( $opts{'jobsnrpe'} ) {
+ exit jobsnrpe(0);
+}
+if ( $opts{'shorthelp'} ) {
+ showHelp(1);
+ exit 0;
+}
+
+#lg( $runninglog ); $runninglog='';
+
+if ( $opts{'list-archives'} ) {
+ print listArchives();
+ affaExit('Done.');
+}
+elsif ( $opts{'show-config-pathes'} ) {
+ undef $jobname;
+ showConfigPathes();
+ affaExit('Done.');
+}
+elsif ( $opts{'show-default-config'} ) {
+ undef $jobname;
+ showDefaults();
+ affaExit('Done.');
+}
+elsif ( $opts{'log-tail'} ) {
+ undef $jobname;
+ logTail();
+ affaExit('Done.');
+}
+elsif ( $opts{'configcheck'} ) {
+ undef $jobname;
+ checkConfig();
+ affaExit('Done.');
+}
+elsif ( $opts{'send-keys'} ) {
+ $jobname = 'send keys';
+ sendKeys();
+ affaExit('Done.');
+}
+elsif ( $opts{'disk-usage'} ) {
+ undef $jobname;
+ print DiskUsage();
+ affaExit('Done.');
+}
+elsif ( $opts{'status'} ) {
+ undef $jobname;
+ print getStatus();
+ affaExit('Done.');
+}
+elsif ( $opts{'send-status'} ) {
+ undef $jobname;
+ sendStatus();
+ affaExit('Done.');
+}
+elsif ( $opts{'mailtest'} ) {
+ mailTest();
+ affaExit('Done.');
+}
+elsif ( $opts{'full-restore'} ) {
+ $jobname = $ARGV[0] || '';
+ $jobname =~ /([a-z0-9_\.-]*)/i;
+ $jobname = $1; # untaint
+ if ( not $cfg->SectionExists($jobname) ) {
+ my $txt = "Full-Restore Job '$jobname' undefined.";
+ print("$txt\n");
+ affaErrorExit("$txt");
+ }
+ # Don't untaint as it removes the digit
+ # regex to check [0-9] ?
+ $restoreVer = $ARGV[1] || 'scheduled.0';
+ fullRestore();
+ affaExit('Done.');
+}
+elsif ( $opts{'resume-interrupted'} ) {
+ resumeInterrupted();
+ affaExit('Done.');
+}
+elsif ( $opts{'cleanup'} ) {
+ cleanup();
+ affaExit('Done.');
+}
+elsif ( $opts{'delete-job'} ) {
+ deleteJob();
+ affaExit('Done.');
+}
+elsif ( $opts{'rename-job'} ) {
+ renameJob();
+ affaExit('Done.');
+}
+elsif ( $opts{'move-archive'} ) {
+ moveArchive();
+ affaExit('Done.');
+}
+elsif ( $opts{'revoke-key'} ) {
+ $jobname = 'revoke key';
+ revokeKeys( $ARGV[0] || '' );
+ affaExit('Done.');
+}
+elsif ( $opts{'check-connections'} ) {
+ $jobname = 'check-connections';
+ checkConnectionsAll();
+ affaExit('Done.');
+}
+elsif ( $opts{'kill'} ) {
+ killJob( $ARGV[0] || '' );
+ affaExit('Done.');
+}
+elsif ( $opts{'killall'} ) {
+ killall();
+ affaExit('Done.');
+}
+elsif ( $opts{'show-schedule'} ) {
+ showSchedule();
+ affaExit('Done.');
+}
+elsif ( $opts{'show-property'} ) {
+ showProperty();
+ affaExit('Done.');
+}
+
+####################################################################################
+#### début des modifs: ajout de
+elsif ( $opts{'rise'} ) {
+ #$jobname = 'rising from archive';
+ $jobname = $ARGV[0] || '';
+ $jobname =~ /([a-z0-9_\.-]*)/i;
+ $jobname = $1; # untaint
+ if ( not $cfg->SectionExists($jobname) ) {
+ my $txt = "Rise Job '$jobname' undefined.";
+ print("$txt\n");
+ affaErrorExit("$txt");
+ }
+ # Don't untaint as it removes the digit
+ # regex to check [0-9] ?
+ $restoreVer = $ARGV[1] || 'scheduled.0';
+ riseFromDeath();
+ affaExit('Done.');
+}
+
+elsif ( $opts{'undo-rise'} ) {
+ $jobname = 'undo-rise';
+ $jobname = $ARGV[0] || '';
+ $jobname =~ /([a-z0-9_\.-]*)/i;
+ $jobname = $1; # untaint
+ undoRise();
+ affaExit('Done.');
+}
+
+#### fin des modifs
+####################################################################################
+
+if ( $opts{'make-cronjobs'} ) {
+ $jobname = 'make cronjobs';
+ cronSetup();
+ affaExit('Done.');
+}
+
+if ( not $opts{'run'} ) {
+ print "Run affa --help for help.\n";
+ affaErrorExit("Unkown option.");
+}
+
+# With all other options tested we now run a backup job
+
+my $StartTime = time();
+$jobname = $ARGV[0] || '';
+$jobname =~ /([a-z0-9_\.-]*)/i;
+$jobname = $1; # untaint
+if ( not $cfg->SectionExists($jobname) ) {
+ my $txt = "Job '$jobname' undefined.";
+ print("$txt\n");
+ affaErrorExit("$txt");
+}
+
+$Command = defined $ARGV[1] ? lc( $ARGV[1] ) : 'scheduled';
+$Command =~ /([a-z]*)/i;
+$Command = $1; # untaint
+if ( not $Command =~ /^(scheduled|daily|weekly|monthly|yearly)$/ ) {
+ affaErrorExit("Unknown command '$Command'");
+}
+
+%job = getJobConfig($jobname);
+setlog("$jobname.log");
+{ my $txt = "# Affa $VERSION #"; lg( '#' x length($txt) ); lg($txt); lg( '#' x length($txt) ) }
+lg("Starting job $jobname $Command ($job{'remoteHostName'})");
+lg( "Description: " . $job{'Description'} ) if defined $job{'Description'};
+lg("Bandwidth limit: $job{'BandwidthLimit'} KBytes/sec") if $job{'BandwidthLimit'};
+
+# check whether the job is already running
+$Command eq "scheduled"
+ and getLock($jobname)
+ and affaErrorExit( "Lock found. Another job (pid=" . getLock($jobname) . ") is still running." );
+
+setLock() if $Command eq "scheduled";
+$SIG{'TERM'} = 'SignalHandler';
+$SIG{'INT'} = 'SignalHandler';
+
+if ( $opts{'delay'} ) {
+ lg( "Delayed run. Starting at " . Date::Format::time2str( "%T", time() + $opts{'delay'} ) );
+ sleep( $opts{'delay'} );
+}
+
+if ( $opts{'RetryAfter'} ) {
+ lg( "Waiting $opts{'RetryAfter'} seconds. Continuing at "
+ . Date::Format::time2str( "%T", time() + $opts{'RetryAfter'} ) );
+ sleep( $opts{'RetryAfter'} );
+ $job{'chattyOnSuccess'}++ if not $job{'chattyOnSuccess'} and $job{'RetryNotification'} eq 'yes';
+}
+$allow_retry = 1;
+checkConnection($jobname); # and exit on error
+
+# mount root dir
+if ( $job{'AutomountDevice'} and $job{'AutomountPoint'} ) {
+###### ligne suivante modifiée umount diskusage - bug 9147
+ # mount( $job{'AutomountDevice'}, $job{'AutomountPoint'}, $job{'AutomountOptions'} );
+ mount( $job{'AutomountDevice'}, $job{'AutomountPoint'}, $job{'AutomountOptions'}, %job );
+}
+
+affaErrorExit("RootDir $job{'RootDir'} does not exist") unless -d $job{'RootDir'};
+File::Path::mkpath( "$job{'RootDir'}/$jobname", 0, 0700 ) unless -d "$job{'RootDir'}/$jobname";
+
+my $ddf = "$job{'RootDir'}/$jobname/.doneDates";
+if ( not -f $ddf ) {
+ open( DF, ">$ddf" );
+ print DF "[doneDates]\n";
+ print DF "daily=-1\n";
+ print DF "weekly=-1\n";
+ print DF "monthly=-1\n";
+ print DF "yearly=-1\n";
+ close(DF);
+}
+$job{'_doneDates'} = Config::IniFiles->new( -file => "$job{'RootDir'}/$jobname/.doneDates", -nocase => 0 );
+
+# run daily, weekly, monthly or yearly if not already done;
+if ( $Command eq "scheduled" and -f "$job{'RootDir'}/$jobname/scheduled.0/.AFFA4-REPORT" ) {
+ $0 =~ /(.*)/; # untaint
+ my @cmd = ( $1, '--run', $jobname, 'yearly' );
+ ExecCmd( @cmd, 1 ) if ( $job{'_doneDates'}->val( 'doneDates', 'yearly' ) ne $thisYear and $job{'yearlyKeep'} > 0 );
+ $cmd[3] = 'monthly';
+ ExecCmd( @cmd, 1 ) if ( $job{'_doneDates'}->val( 'doneDates', 'monthly' ) ne $thisMonth and $job{'monthlyKeep'} > 0 );
+ $cmd[3] = 'weekly';
+ ExecCmd( @cmd, 1 ) if ( $job{'_doneDates'}->val( 'doneDates', 'weekly' ) ne $thisWeek and $job{'weeklyKeep'} > 0 );
+ $cmd[3] = 'daily';
+ ExecCmd( @cmd, 1 ) if ( $job{'_doneDates'}->val( 'doneDates', 'daily' ) ne $thisDay and $job{'dailyKeep'} > 0 );
+}
+
+### hier geht's wirklich los ###
+execPreJobCommand($jobname);
+
+####################################################################################
+#### debut des modifs
+installWatchdog( $opts{'watchdog'} || 0 );
+
+if ( $job{'SMEServer'} ne 'no' ) {
+ # Here only for SME machines
+ my $prebackup = 'SME/signal-pre-backup';
+ if ( $job{'remoteHostName'} eq 'localhost' ) {
+ execJobCommand( $jobname, $prebackup );
+ }
+ else {
+ execJobCommandRemote( $jobname, $prebackup );
+ }
+}
+
+installedRPMsList(0) if $job{'SMEServer'} ne 'no' and $job{'remoteHostName'} ne 'localhost';
+#### ligne ci-dessus: suppression de "!$ESX and " entre if et $job
+#### fin modifs
+####################################################################################
+
+# reetp here we start the business end by retrieving the list of directories that need backing up
+# Note if we are not 'scheduled' we drop right through to after shiftArchives below
+
+my $linkDest = '';
+my @cmd;
+my $status = 0;
+my $rsyncOutput = '';
+
+if ( $Command eq 'scheduled' ) {
+ my $exclude = getExcludedString();
+ my $include = getIncludedString();
+ $linkDest = getLinkdest( $jobname, 0 );
+ dbg("Using link destination $linkDest") if $linkDest;
+
+ # my @cmd; moved up
+ #my $status = 0;
+ #my $rsyncOutput = '';
+
+ File::Path::mkpath( "$job{'RootDir'}/$jobname/scheduled.running",
+ 0, 0700 )
+ unless -d "$job{'RootDir'}/$jobname/scheduled.running";
+
+ if ( $job{'_rsyncd'} ) {
+
+ # e.g. Windows Server with rsyncd installed
+ # reetp pretend we didnt see this part - Windows needs Cygwin/Rysncd to work
+ # This will likely not work and may get removed
+
+ my @SourceDirs = getSourceDirs($jobname);
+ my $source = '';
+ foreach my $src (@SourceDirs) {
+ $src = "/$src" if not $src =~ /^\//;
+ $src =~ s/'/'\\''/g; # escape single quotes
+ $source
+ .= ( $job{'rsyncdUser'} ? $job{'rsyncdUser'} . '@' : '' )
+ . $job{'remoteHostName'} . "::'"
+ . $job{'rsyncdModule'}
+ . $src . "' ";
+ }
+ @cmd = (
+ $job{'_rsyncLocal'},
+ "--archive",
+ "--hard-links",
+ "--stats",
+ "--delete-during",
+ "--ignore-errors",
+ "--delete-excluded",
+ "--relative",
+ "--partial",
+ $job{'BandwidthLimit'} ? "--bwlimit=$job{'BandwidthLimit'}" : '',
+ $job{'rsync--modify-window'} > 0
+ ? "--modify-window=$job{'rsync--modify-window'}"
+ : '',
+ $job{'rsync--inplace'} ne 'no' ? "--inplace" : "",
+ $job{'rsyncTimeout'} ? "--timeout=$job{'rsyncTimeout'}" : "",
+ $job{'rsyncCompress'} eq 'yes' ? "--compress" : "",
+ "--numeric-ids",
+ ( $linkDest
+ ? "--link-dest='$job{'RootDir'}/$jobname/$linkDest'"
+ : ''
+ ),
+ $include, $exclude,
+ $job{'rsyncOptions'},
+ $source,
+ "$job{'RootDir'}/$jobname/scheduled.running/"
+ );
+ }
+ elsif ( $job{'SMEServer'} ne 'no' ) {
+
+ # SME specific
+ # reetp - remote or local? Remote should not be just '/'
+ # We fix Include/Exclude in the getSourceDir subs below
+ # (Except we don't fix the excludes yet)
+
+ #my $SourceDirs = getSourceDirsString($jobname) || '/';
+ my ( $local, $remote ) = getSourceDirsString($jobname);
+
+ # $remote is the destination - it could be local
+ my $SourceDirs = $remote;
+
+ ####################################################################################
+ #### debut des modifs: ajout du "if........." ditto V2
+
+ # escape single quotes
+ #$SourceDirs =~ s/'/'\\''/g if $job{'remoteHostName'} ne 'localhost';
+
+ #### fin des modifs
+ ####################################################################################
+
+ # reetp here is where we set up the backup command
+ # The Include/Exclude parts may be problematic UNLESS they are a local box
+ # Removed 'default' ssh options for localhost
+
+ @cmd = (
+ $job{'_rsyncLocal'},
+ "--archive",
+ "--hard-links",
+ "--stats",
+ "--delete-during",
+ "--ignore-errors",
+ "--delete-excluded",
+ "--relative",
+ "--partial",
+ $job{'BandwidthLimit'} ? "--bwlimit=$job{'BandwidthLimit'}" : '',
+ $job{'rsync--modify-window'} > 0
+ ? "--modify-window=$job{'rsync--modify-window'}"
+ : '',
+ $job{'rsync--inplace'} ne 'no' ? "--inplace" : "",
+ $job{'rsyncTimeout'} ? "--timeout=$job{'rsyncTimeout'}" : "",
+ $job{'rsyncCompress'} eq 'yes' ? "--compress" : "",
+ "--numeric-ids",
+ "--rsync-path=\"$job{'_rsyncRemote'}\"",
+ $job{'remoteHostName'} ne 'localhost'
+ ? "--rsh=\"$job{'localSSHBinary'} $job{'_sshOpts'}\""
+ : '',
+ ( $linkDest
+ ? "--link-dest='$job{'RootDir'}/$jobname/$linkDest'"
+ : ''
+ ),
+
+ # Remove old include/exclude
+ #$job{'remoteHostName'} eq 'localhost' ? "$include" : '',
+ #$job{'remoteHostName'} eq 'localhost' ? "$exclude" : '',
+ # For now just add exclude
+ $exclude,
+ $job{'rsyncOptions'},
+ "$SourceDirs",
+ "$job{'RootDir'}/$jobname/scheduled.running/"
+ );
+ ####################################################################################
+ #### debut des modifs faites dans le bas de la commande @cmd precedente
+ # beginning of the modifications made at the bottom of the previous @cmd command
+ #
+ #
+ # $job{'remoteHostName'} eq 'localhost' ? "$SourceDirs" : $job{'remoteUser'}.'@'.$job{'remoteHostName'}.":'$SourceDirs'",
+ #
+ ##### fin des modifs
+ ####################################################################################
+
+ }
+ else {
+ # Generic linux
+ my $SourceDirs = getSourceDirsString($jobname) || '/';
+
+ # my ($local, $remote) = getSourceDirsString($jobname);
+
+ @cmd = (
+ $job{'_rsyncLocal'},
+ "--archive",
+ "--hard-links",
+ "--stats",
+ "--delete-during",
+ "--ignore-errors",
+ "--delete-excluded",
+ "--relative",
+ "--partial",
+ $job{'BandwidthLimit'} ? "--bwlimit=$job{'BandwidthLimit'}" : '',
+ $job{'rsync--modify-window'} > 0
+ ? "--modify-window=$job{'rsync--modify-window'}"
+ : '',
+ $job{'rsync--inplace'} ne 'no' ? "--inplace" : "",
+ $job{'rsyncTimeout'} ? "--timeout=$job{'rsyncTimeout'}" : "",
+ $job{'rsyncCompress'} eq 'yes' ? "--compress" : "",
+ "--numeric-ids",
+ "--rsync-path=\"$job{'_rsyncRemote'}\"",
+ $job{'remoteHostName'} ne 'localhost'
+ ? "--rsh=\"$job{'localSSHBinary'} $job{'_sshOpts'}\""
+ : '',
+ ( $linkDest
+ ? "--link-dest='$job{'RootDir'}/$jobname/$linkDest'"
+ : ''
+ ),
+
+ $job{'remoteHostName'} eq 'localhost' ? "$include" : '',
+ $job{'remoteHostName'} eq 'localhost' ? "$exclude" : '',
+
+ $job{'rsyncOptions'},
+ "$SourceDirs",
+ "$job{'RootDir'}/$jobname/scheduled.running/"
+ );
+ }
+
+ #else {
+ # What if we are not 'scheduled??
+ #affaErrorExit("Backup Command not equal 'scheduled'");
+ #}
+
+ # And here is where we actually start to backup
+ lg("Running Backup $jobname rsync...");
+
+ if ( $cliDebug == 1 ) {
+
+ # reetp remove empty array keys
+ @cmd = grep { $_ ne '' } @cmd;
+ printf "ExecCMD = @cmd\n";
+ }
+
+ $status = ExecCmd( @cmd, 0 );
+ $rsyncOutput = $ExecCmdOut;
+
+ if ( $cliDebug == 1 ) {
+ printf($rsyncOutput);
+ }
+
+ # if nothing was transferred, scheduled.running does not exist
+ if ( not -d "$job{'RootDir'}/$jobname/scheduled.running" ) {
+ lg("Error: No data transferred. Check include/exclude settings.");
+ $status += 1000;
+ }
+
+ if ( $status eq '0' or $status eq '23' or $status eq '24' ) {
+
+ # write report file
+ my $reportfile
+ = "$job{'RootDir'}/$jobname/scheduled.running/.AFFA4-REPORT";
+ lg("writing $reportfile");
+ my $rpt = Config::IniFiles->new();
+ ( my $used, my $avail ) = df( $job{'RootDir'} );
+ $rpt->AddSection('Report');
+ $rpt->newval( 'Report', 'Date',
+ Date::Format::time2str( "%Y%m%d%H%M", time() ) );
+ $rpt->newval( 'Report', 'ExecutionTime', time() - $StartTime );
+
+ foreach my $s ( split( /[\n]/, $rsyncOutput ) ) {
+
+ #next if ( $s =~ /(^rsync)|(^sent)|(^total size is)|(^File list)|(^[^:]*$)/ );
+ #next if ( $s =~ /(^rsync)|(^sent)|(^total size is)|(^File list)|(?=:(?:\s|$))/ );
+ #next if ( $s =~ /(^Number)|(^Total)|(^Literal)|(^Matched)|(^File list)|(?=:(?:\s|$))/ );
+ # next - doesn't like next
+ if (( $s
+ =~ /(^Number of)|(^Total file)|(^Total transferred)|(^Literal)|(^Matched)|(^Total bytes)/
+ )
+ && ( $s =~ /(?=:(?:\s|$))/ )
+ ) {
+ my @p = split( /:/, $s );
+ ( my $key = $p[0] ) =~ s/\b(\w)/\U$1/g; # first char uppercase
+ $key =~ s/ //g;
+ ( my $val = trim( $p[1] ) ) =~ s/ .*$//;
+ #### ajout AG pour enlever les virgules générées par rsync3
+ #### Remove commas generated by Rsync 3
+ $val =~ s/,//g;
+ ##### fin des modifs AG
+ $rpt->newval( 'Report', $key, $val );
+ }
+ }
+
+ $rpt->newval( 'Report', 'RootDirFilesystemUsed', $used ); # kbytes
+ $rpt->newval( 'Report', 'RootDirFilesystemAvail', $avail ); # kbytes
+ $rpt->newval( 'Report', 'RootDirFilesystemUsage',
+ sprintf( '%.1f', $used / ( $avail + $used ) * 100 ) ); # percent
+ $rpt->newval( 'Report', 'ExitStatus', $status );
+ $rpt->newval( 'Report', 'Dedup',
+ $job{"dedup"} ne 'yes' || not $linkDest ? 'no' : 'yes' );
+ $rpt->WriteConfig($reportfile);
+
+ # save used setup
+ my $usfile
+ = "$job{'RootDir'}/$jobname/scheduled.running/.$jobname-setup.ini";
+ my $js = open( JS, ">$usfile" )
+ or lg("Error: Couldn't write $usfile");
+ if ($js) {
+ print JS "[$jobname]\n";
+ print JS "; Created on "
+ . trim( Date::Format::ctime( time() ) ) . "\n";
+ foreach my $key ( sort { lc($a) cmp lc($b) } keys %job ) {
+ next if $key =~ /^_/;
+ if ( ref $job{$key} eq 'ARRAY' ) {
+ foreach my $r ( sort @{ $job{$key} } ) {
+ print JS "$key=$r\n";
+ }
+ }
+ else {
+ print JS "$key=$job{$key}\n" if $job{$key};
+ }
+ }
+ close(JS);
+ }
+ ####################################################################################
+ #### ajout de modifs
+ compareRPMLists("$job{'RootDir'}/$jobname/scheduled.running");
+ #### fin ajout modifs
+ ####################################################################################
+
+ }
+ else {
+ affaErrorExit("rsync failed with status $status.");
+ }
+}
+
+# End of if ( $Command eq 'scheduled' ) {
+
+shiftArchives();
+
+# We should get here if ne scheduled
+if ( $Command ne 'scheduled' ) {
+ my %dd = ( 'daily' => $thisDay, 'weekly' => $thisWeek, 'monthly' => $thisMonth, 'yearly' => $thisYear );
+ $job{'_doneDates'}->setval( 'doneDates', $Command, $dd{$Command} );
+ $job{'_doneDates'}->RewriteConfig();
+}
+execPostJobCommand($jobname);
+
+####################################################################################
+#### debut des modifs
+
+if ( $job{'SMEServer'} ne 'no' ) {
+ my $postbackup = 'SME/signal-post-backup';
+ if ( $job{'remoteHostName'} eq 'localhost' ) {
+ execJobCommand( $jobname, $postbackup );
+ }
+ else {
+ execJobCommandRemote( $jobname, $postbackup );
+ }
+}
+
+#### fin des modifs
+####################################################################################
+
+deduplicate($jobname);
+DiskSpaceWarn();
+sendSuccessMesssage();
+affaExit("Completed job '$jobname $Command ($job{'remoteHostName'})'");
+
+exit 0;
+
+####################################################################################
+
+sub sanityCheckConfFiles () {
+ my @cfgfiles = getConfigFileList();
+ my $error = 0;
+ my $count = 0;
+ my $line = '';
+ foreach my $cfgFile (@cfgfiles) {
+ open( INFO, $cfgFile ) or die("Could not open file.");
+ $count = 0;
+ while ( my $line = ) {
+ if ( not( $line =~ /\r$/ | $line =~ /\r\n/ | $line =~ /\n$/ ) ) {
+ lg("Please check $cfgFile $line and add a LF or CR/LF");
+ print "Please check $cfgFile $line and add a LF or CR/LF\n";
+ $error = 1;
+ last if ++$count == 2;
+ }
+ }
+ }
+ close(INFO);
+ if ($error) {
+ print "Sanity file check failed. Exiting - see your logs";
+ affaErrorExit(
+ "Your config file MUST end with a line LF or CR/LF - check your log for details"
+ );
+ } else {
+ return;
+ }
+}
+
+
+sub getDefaultConfig() {
+ my %job = (
+ 'AutomountDevice' => '',
+ 'AutomountOptions' => '',
+ 'AutomountPoint' => '',
+ 'AutoUnmount' => '',
+ 'BandwidthLimit' => 0,
+ 'chattyOnSuccess' => 0,
+ 'ConnectionCheckTimeout' => 120,
+ 'dailyKeep' => 7,
+ 'Debug' => 'no',
+ 'dedup' => 'no',
+ 'dedupKill' => 'no',
+ 'Description' => '',
+ 'DiskSpaceWarn' => 'strict', # strict | normal | risky | none
+ '_doneDates' => 0,
+ 'EmailAddress' => ['root'], # multivalue
+ 'Exclude' => [], # multivalue
+ 'Include' => [], # multivalue
+ 'killAt' => '',
+ 'localNice' => 0,
+ 'localNiceBinary' => 'nice',
+ 'localRsyncBinary' => 'rsync',
+ 'localSSHBinary' => 'ssh',
+ '_lockfile' => '',
+ '_LockIsSet' => 0,
+ 'monthlyKeep' => 12,
+ 'NRPEtrigger' => 24,
+ 'postJobCommand' => [],
+ 'postJobCommandRemote' => [],
+ 'preJobCommand' => [],
+ 'preJobCommandRemote' => [],
+ 'RemoteAuthorizedKeysFile' => '.ssh/authorized_keys2', # relative to remoteUser Homedir
+ 'remoteHostName' => '',
+ 'remoteNice' => 0,
+ 'remoteNiceBinary' => '/bin/nice',
+ 'remoteRsyncBinary' => '/usr/bin/rsync',
+ 'remoteUser' => 'root',
+ 'resumeKilledAt' => '',
+ 'resumeAfterBoot' => 'yes',
+ 'RetryAfter' => 600,
+ 'RetryAttempts' => 4,
+ 'RetryNotification' => 'yes',
+ 'RootDir' => '/var/affa',
+ 'rsyncCompress' => 'yes',
+ '_rsyncd' => 0,
+ 'rsyncdMode' => 'no',
+ 'rsyncdModule' => 'AFFA',
+ 'rsyncdPassword' => '',
+ 'rsyncdUser' => 'affa',
+ 'rsync--inplace' => 'yes',
+ '_rsyncLocal' => '/usr/bin/rsync',
+ 'rsync--modify-window' => 0,
+ 'rsyncOptions' => '-v ',
+ '_rsyncRemote' => '/usr/bin/rsync',
+ 'rsyncTimeout' => 900,
+ 'SambaShare' => 'no',
+ 'SambaValidUser' => ['affa'], # multivalue
+ 'scheduledKeep' => 1,
+ '_sshOpts' => '',
+ 'sshPort' => 22,
+ 'status' => 'enabled',
+ 'TimeSchedule' => ['2230'], # multivalue
+ 'weeklyKeep' => 4,
+ 'yearlyKeep' => 2,
+ 'SMEServer' => 'no',
+ 'RPMCheck' => 'no',
+ 'Watchdog' => 'no',
+ );
+ ###########################################################################
+ #### ajoute 'SMEServer'=>'no', 3 lignes plus haut
+ #### ajoute 'RPMCheck'=>'no', 3 lignes plus haut
+ #### ajoute 'Watchdog'=>'no', 3 lignes plus haut
+ ###########################################################################
+
+ return %job;
+}
+
+sub getMultivalueKeys() {
+ my %multi = (
+ 'EmailAddress' => 'string',
+ 'Exclude' => 'yes',
+ 'Include' => 'yes',
+ 'SambaValidUser' => 'string',
+ 'TimeSchedule' => 'yes',
+ 'preJobCommand' => 'yes',
+ 'preJobCommandRemote' => 'yes',
+ 'postJobCommand' => 'yes',
+ 'postJobCommandRemote' => 'yes',
+ );
+ return %multi;
+}
+
+sub showDefaults() {
+ %job = getJobConfig('');
+ foreach my $key ( sort { lc($a) cmp lc($b) } keys %job ) {
+ next if $key =~ /^_/;
+ if ( ref $job{$key} eq 'ARRAY' ) {
+ foreach my $r ( sort @{ $job{$key} } ) {
+ print "$key=$r\n";
+ }
+ }
+ else {
+ print "$key=$job{$key}\n";
+ }
+ }
+}
+
+sub getJobConfig( $ ) {
+ my $jobname = shift || '';
+ my %job = getDefaultConfig();
+
+ if ( not -f $configfile ) {
+ my @cfgfiles = getConfigFileList(); # only valid ones
+ my @cmd = ( 'echo', '-n', '>', $configfile, ';', 'chmod', '400', $configfile, ';', 'cat' );
+ # mod my @cmd = ( 'echo', '-n', '>', $configfile, ';', 'chmod', '400', $configfile, ';');
+ foreach my $s (@cfgfiles) {
+ # mod push(@cmd, ('cat', $s,'>>',$configfile,';', 'echo','-n' ,'>>',$configfile, ';' ));
+ push( @cmd, '"'.$s.'"' );
+ }
+ push( @cmd, '>' );
+ push( @cmd, $configfile );
+ ExecCmd( @cmd, 0 );
+ $cfg = Config::IniFiles->new( -file => $configfile, -default => 'GlobalAffaConfig', -nocase => 0 );
+ }
+
+ my %multi = getMultivalueKeys();
+
+ # configured global Defaults
+ my @p = $cfg->Parameters('GlobalAffaConfig');
+ foreach my $k (@p) {
+ if ( $multi{$k} ) {
+ my @m = $cfg->val( $jobname, $k );
+ $job{$k} = [@m];
+ $job{"_$k"} = join( ',', @m ) if $multi{$k} eq 'string';
+ }
+ else {
+ $job{$k} = $cfg->val( $jobname, $k );
+ }
+ }
+
+ # configured Job - reetp needs a fix
+ @p = $cfg->Parameters($jobname);
+ foreach my $k (@p) {
+ if ( not defined $job{$k} ) {
+ my @val = $cfg->val( $jobname, $k );
+ my $txt = "Unknown parameter '$k=$val[0]' in configuration of job '$jobname'";
+ print "$txt\n";
+ affaExit($txt);
+ }
+ if ( $multi{$k} ) {
+ my @m = $cfg->val( $jobname, $k );
+ ######### following 1 line added by Arnaud to solve bug#9449: blank characters into file job.conf##
+ map( {
+ s/^\s+|\s+$//g;
+ $_
+ } @m );
+ $job{$k} = [@m];
+ $job{"_$k"} = join( ',', @m ) if $multi{$k} eq 'string';
+ }
+ else {
+ $job{$k} = $cfg->val( $jobname, $k );
+ lg("** Error in job config $jobname: Multivalues are not allowed for key $k") if $job{$k} =~ /\n/;
+ $job{$k} =~ s/\n.*//;
+ ######### following 1 line added by Arnaud to solve bug#9449: blank characters into file job.conf##
+ $job{$k} =~ s/^\s+|\s+$//g;
+ }
+ }
+
+ # globalStatus overides job status
+ $job{'status'} = $job{'globalStatus'} if ( ( $job{'globalStatus'} || '' ) =~ /^(enabled|disabled)$/ );
+
+ # check and set save keep settings if needed
+ $job{'scheduledKeep'} = 1 if ( $job{'scheduledKeep'} < 1 );
+ $job{'dailyKeep'} = 0 if ( $job{'dailyKeep'} < 0 );
+ $job{'weeklyKeep'} = 0 if ( $job{'weeklyKeep'} < 0 );
+ $job{'monthlyKeep'} = 0 if ( $job{'monthlyKeep'} < 0 );
+ $job{'yearlyKeep'} = 0 if ( $job{'yearlyKeep'} < 0 );
+
+ $job{'_rsyncLocal'} = $job{'localRsyncBinary'};
+ $job{'_rsyncLocal'} = "$job{'localNiceBinary'} --adjustment=$job{'localNice'} $job{'localRsyncBinary'}"
+ if $job{'localNice'};
+ $job{'_rsyncRemote'} = $job{'remoteRsyncBinary'};
+ $job{'_rsyncRemote'} = "$job{'remoteNiceBinary'} --adjustment=$job{'remoteNice'} $job{'remoteRsyncBinary'}"
+ if $job{'remoteNice'};
+ $job{'_rsyncd'} = $job{'rsyncdMode'} eq 'yes' ? 1 : 0;
+ $ENV{'RSYNC_PASSWORD'} = $job{'rsyncdPassword'};
+ $job{'rsyncdPassword'} = $job{'rsyncdPassword'} ? '' : '';
+ $job{'Debug'} = 'yes' if $opts{'debug'};
+ $job{'Archive'} = $job{'Archive'} ? $job{'Archive'} : 'scheduled.0';
+ ####################################################################################
+ #### ajout modifs
+ $sshQuiet = $job{'Debug'} eq 'yes' ? '' : '-q';
+ #### fin modifs
+ ####################################################################################
+ # get Done Dates
+ if ($jobname) {
+ # reetp add -i id_rsa_affa here
+ $job{'_sshOpts'} = "-p $job{'sshPort'} -i /root/.ssh/id_rsa_affa -o CheckHostIP=no -o StrictHostKeyChecking=no -o HostKeyAlias=$jobname -o UserKnownHostsFile=/root/.ssh/knownhosts-$jobname" . ( $job{'Debug'} ne 'yes' ? ' -q' : '' );
+ $job{'_lockfile'} = "$lockdir/$jobname";
+ }
+ return %job;
+}
+
+sub checkConfig() {
+ my $errcnt = 0;
+ my $casecnt = 0;
+ my %multi = getMultivalueKeys();
+ my %defaults = getDefaultConfig();
+ my %defaults_lc = map { lc $_ => $_ } keys %defaults;
+ foreach my $k ( keys %defaults ) {
+ $defaults_lc{ lc $k } = $k;
+ }
+ my @cfiles = getConfigFileList();
+ foreach my $f (@cfiles) {
+ my $cfg = Config::IniFiles->new( -file => $f, -nocase => 0 );
+ foreach my $s ( $cfg->Sections() ) {
+ $s =~ /([a-z0-9_\.-]*)/i;
+ print "Checking job section $s ($f)\n";
+ if ( $s ne $1 ) {
+ print "*** ERROR: Illegal characters in job name\n";
+ $errcnt++;
+ }
+ my @parms = $cfg->Parameters($s);
+ foreach my $p (@parms) {
+ my @v = $cfg->val( $s, $p );
+ my $val = $v[0];
+ if ( $p =~ /(sendStatus|globalStatus)/ ) {
+ if ( $s ne 'GlobalAffaConfig' ) {
+ print "*** ERROR: Key $p only allowed in GlobalAffaConfig section\n";
+ $errcnt++;
+ }
+ elsif ( $p eq 'globalStatus' and not $val =~ /(enabled|disabled|jobs)/ ) {
+ print "*** ERROR: Bad value: $p=$val\n";
+ $errcnt++;
+ }
+ elsif ( $p eq 'sendStatus' and not $val =~ /(daily|weekly|monthly|never)/ ) {
+ print "*** ERROR: Bad value: $p=$val\n";
+ $errcnt++;
+ }
+ next;
+ }
+ if ( $p =~ /^_/ or not defined $defaults{$p} and not defined $defaults_lc{ lc $p } ) {
+ print "*** ERROR: Unknown key: $p\n";
+ $errcnt++;
+ next;
+ }
+ if ( not defined $defaults{$p} and defined $defaults_lc{ lc $p } ) {
+ my $err = renameConfigKey( $s, $p, $defaults_lc{ lc $p } );
+ print "*** CASE ERROR: $p -> $defaults_lc{lc $p} FIXED.\n";
+ $p = $defaults_lc{ lc $p };
+ $casecnt++;
+ }
+ if ( scalar @v > 1 and not $multi{$p} ) {
+ print "*** ERROR: Multivalues are not allowed for key $p\n";
+ $errcnt++;
+ next;
+ }
+ if ( $p eq 'killAt' or $p eq 'resumeKilledAt' ) {
+ if ( not $val =~ /^\d\d\d\d$/ or $val > 2359 ) {
+ print "*** ERROR: Bad value: $p=$val\n";
+ $errcnt++;
+ }
+ }
+ if ( $p eq 'TimeSchedule' ) {
+ foreach my $t (@v) {
+ if ( not $t =~ /^\d\d\d\d$/ or $t > 2359 ) {
+ print "*** ERROR: Bad value: $p=$t\n";
+ $errcnt++;
+ }
+ }
+ }
+ if ( $p eq 'RootDir' ) {
+ if ( not -d $val ) {
+ print "*** ERROR: Directory does not exist: $p=$val\n";
+ $errcnt++;
+ }
+ }
+ if ( $p eq 'DiskSpaceWarn' ) {
+ if ( not $val =~ /^(strict|normal|risky|none)$/ ) {
+ print "*** ERROR: Bad value: $p=$val\n";
+ $errcnt++;
+ }
+ }
+ if ( $p =~ /JobCommand/ ) {
+ foreach my $s (@v) {
+ if ( not -x "/etc/affa/scripts/$s" ) {
+ print "*** ERROR: No executable script found: $p=$s\n";
+ $errcnt++;
+ }
+ }
+ }
+ }
+ $cfg = Config::IniFiles->new( -file => $f, -nocase => 0 ) if $casecnt;
+ if ( $s ne 'GlobalAffaConfig' ) {
+ if ( not $cfg->val( $s, 'remoteHostName' ) ) {
+ print "*** ERROR: Key remoteHostName is mandatory\n";
+ $errcnt++;
+ next;
+ }
+ }
+ }
+ }
+ if ( not $errcnt and not $casecnt ) {
+ print "Configuration is ok.\n";
+ }
+ else {
+ print $casecnt ? "Fixed $casecnt case errors\n" : '';
+ print $errcnt ? "Configuration has $errcnt errors\n" : '';
+ }
+}
+
+sub getJobs() {
+ my @joblist;
+ foreach my $job ( $cfg->Sections() ) {
+ next if $job eq 'GlobalAffaConfig';
+ push( @joblist, $job );
+ }
+ return @joblist;
+}
+
+sub getConfigFileList() {
+ dbg('Fetching list of all config files');
+
+ my @dirList = qw (/etc/affa/ /etc/affa/conf.d/);
+ my @ls = ();
+ my @list = ();
+
+ foreach my $dir (@dirList) {
+ if ( -d $dir ) {
+ my @cmd = (
+ 'find', "$dir", '-maxdepth 1', '-type', 'f', '-name', '"*.conf"'
+ );
+ ExecCmd( @cmd, 0 );
+ @ls = split( /[\r\n]/, $ExecCmdOut );
+ @list = (@list, @ls);
+ }
+ }
+
+ my @ret = ();
+
+ foreach my $s (@list) {
+ my $c = Config::IniFiles->new( -file => $s );
+ if ( not $c ) {
+ foreach my $e (@Config::IniFiles::errors) {
+ $e =~ s/[\r\n][\t ]*/ /g;
+ my $txt = "CONFIG ERROR: $e";
+ print "$txt\n";
+ lg($txt);
+ }
+ my $txt = "CONFIG ERROR: File '$s' ignored!";
+ print "$txt\n";
+ lg($txt);
+ }
+ else {
+ push( @ret, $s );
+ }
+ }
+ return sort @ret;
+}
+
+sub rewriteConfigVal($$$) {
+ ( my $jobname, my $key, my $newval ) = @_;
+ my $err = 1;
+ my $c = openOrgConfig($jobname);
+ if ($c) {
+ $c->setval( $jobname, $key, $newval );
+ writeConfigFile($c);
+ $err = 0;
+ }
+ return $err;
+}
+
+sub renameConfigKey($$$) {
+ ( my $jobname, my $oldkey, my $newkey ) = @_;
+ my $err = 1;
+ my $c = openOrgConfig($jobname);
+ if ($c) {
+ my @val = $c->val( $jobname, $oldkey );
+ $c->delval( $jobname, $oldkey );
+ my @nv = $c->val( $jobname, $newkey );
+ if ( scalar @nv ) {
+ push( @val, @nv );
+ }
+ $c->newval( $jobname, $newkey, @val );
+ writeConfigFile($c);
+ $err = 0;
+ }
+ return $err;
+}
+
+sub openOrgConfig($) {
+ my $jobname = shift;
+ my $cfg;
+ my @list = getConfigFileList();
+ foreach my $s (@list) {
+ $cfg = Config::IniFiles->new( -file => $s );
+ if ( $cfg->SectionExists($jobname) ) {
+ last;
+ }
+ undef $cfg;
+ }
+ return $cfg;
+}
+
+sub setLock() {
+ open( LOCK, ">$job{'_lockfile'}" ) or die "Error: Couldn't create lockfile $job{'_lockfile'}\n";
+ print LOCK "$process_id\n";
+ close(LOCK) or warn "Error: Couldn't close lockfile $job{'_lockfile'}\n";
+ $job{'_LockIsSet'} = 1;
+}
+
+sub removeLock() {
+ unlink( $job{'_lockfile'} ) if ( -f $job{'_lockfile'} && $job{'_LockIsSet'} );
+ $job{'_LockIsSet'} = 0;
+}
+
+sub getLock($) {
+ my $jobname = shift;
+ %job = getJobConfig($jobname);
+ my $lockpid = 0;
+ if ( open( LOCK, "<$job{'_lockfile'}" ) ) {
+ $lockpid = ;
+ chomp($lockpid);
+ close(LOCK);
+ }
+ if ($lockpid) {
+ if ( -f "/proc/$lockpid/stat" ) {
+ if ( open( STAT, ";
+ chomp($stat);
+ close(STAT);
+ if ( not( $stat =~ /^$lockpid \(affa\)/ ) ) {
+ $lockpid = 0;
+ unlink $job{'_lockfile'};
+ lg("Orphaned lock found and removed.");
+ }
+ }
+ }
+ else {
+ $lockpid = 0;
+ unlink $job{'_lockfile'};
+ lg("Orphaned lock found and removed.");
+ }
+ }
+ return $lockpid;
+}
+
+# returns process id if dedup is running
+sub findProcessId($$) {
+ ( my $treepid, my $pattern ) = @_;
+ my %pt;
+ my $ret = '';
+ getChildProcess( $treepid, \%pt );
+ foreach my $p ( keys %pt ) {
+ if ( $pt{$p} =~ /$pattern/ ) {
+ $ret = $p;
+ last;
+ }
+ }
+ return $ret;
+}
+
+sub getChildProcess($$) {
+ ( my $parent, my $pt ) = @_;
+ my $proc_table = Proc::ProcessTable->new();
+ foreach my $proc ( @{ $proc_table->table() } ) {
+ if ( $proc->ppid == $parent ) {
+ my $cmd = '';
+ if ( open( CMD, "pid . "/cmdline" ) ) {
+ $cmd = || '';
+ close(CMD);
+ $cmd =~ s/\0/ /g;
+ }
+ $pt->{ $proc->pid } = $cmd;
+ getChildProcess( $proc->pid, $pt );
+ }
+ }
+ return $pt;
+}
+
+sub getProcessState($) {
+ my $jobname = shift;
+ my $lockpid = getLock($jobname);
+ my $state = '';
+ if ($lockpid) {
+ my $job = getJobConfig($jobname);
+ if ( findProcessId( $lockpid, "$job{'localRsyncBinary'}.*scheduled.running" ) ) {
+ $state = "running rsync";
+ }
+ elsif ( findProcessId( $lockpid, $dedupBinary ) ) {
+ $state = "deduplicating";
+ }
+ else {
+ $state = 'waiting';
+ }
+ }
+ else {
+ my $job = getJobConfig($jobname);
+ my $rptfile = $job{'RootDir'} . "/$jobname/scheduled.0/.AFFA4-REPORT";
+ if ( -d "$job{'RootDir'}/$jobname/scheduled.running" ) {
+ $state = 'rsync interrupted';
+ }
+ elsif ( -f $rptfile ) {
+ my $rpt = Config::IniFiles->new( -file => $rptfile );
+ if ( $rpt->exists( 'Report', 'Dedup' )
+ && $rpt->val( 'Report', 'Dedup' ) eq 'yes'
+ && !$rpt->exists( 'Report', 'DedupDate' ) ) {
+ $state = 'dedup interrupted';
+ }
+ }
+ }
+ return $state;
+}
+
+sub checkConnection($) {
+ my $jobname = shift;
+ return checkConnection_silent( $jobname, 0, 0 );
+}
+
+sub checkConnection_silent($$$) {
+
+ ####################################################################################
+ #### debut modifs
+ return 0 if ( $job{'remoteHostName'} eq 'localhost' );
+
+ #### fin modifs
+ ####################################################################################
+
+ my ( $jobname, $viapi, $silent ) = @_;
+ my %job = getJobConfig($jobname);
+ my $status = 0;
+ my @cmd;
+ if ( $job{'_rsyncd'} ) {
+ lg( "Checking rsyncd connection to " . $job{'remoteHostName'} );
+ @cmd = (
+ $job{'_rsyncLocal'}, '-dq',
+ ( $job{'rsyncdUser'} ? $job{'rsyncdUser'} . '@' : '' )
+ . $job{'remoteHostName'} . "::'"
+ . $job{'rsyncdModule'} . "'"
+ );
+ not ExecCmd( @cmd, 0 )
+ or affaErrorExit( "Rsyncd connection to "
+ . $job{'remoteHostName'}
+ . " failed. Did you set the rsyncdUser, rsyncdPassword and rsyncdModule properties correctly?" );
+ }
+ else {
+ lg( "Checking SSH connection to " . $job{'remoteUser'} . '@' . $job{'remoteHostName'} );
+ @cmd = ( '/usr/bin/ssh', '-o', "ConnectTimeout=$job{'ConnectionCheckTimeout'}", '-o', 'PasswordAuthentication=no', $job{'_sshOpts'}, $job{'remoteUser'} . '@' . $job{'remoteHostName'}, 'echo OK'
+ );
+ ExecCmd( @cmd, 0 );
+ chomp($ExecCmdOut);
+ if ( $ExecCmdOut ne "OK" ) {
+ $status = -1;
+ if ( !$silent ) {
+ affaErrorExit(
+ "SSH connection to " . $job{'remoteHostName'} . " failed. Did you send the public key?" );
+ }
+ }
+ }
+ return $status;
+}
+
+####################################################################################
+#### début ajout modifs
+sub installedRPMsList($) {
+ return if $job{'SMEServer'} eq 'no' or $job{'RPMCheck'} ne 'yes';
+ my $forceLocal = shift(@_);
+
+ # requires bash shell on remote host
+ my @cmd;
+ if ( $job{'remoteHostName'} eq 'localhost' or $forceLocal ) {
+ lg("writing list of installed RPMs on localhost ($rpmlist)");
+ @cmd = ( "/sbin/e-smith/affa-rpmlist.sh", ">$rpmlist" );
+ }
+ else {
+ lg( "writing list of installed RPMs on " . $job{'remoteHostName'} . " ($rpmlist)" );
+
+ #### ligne suivante: rajouté $jobname
+ remoteCopy( $jobname, "/sbin/e-smith/affa-rpmlist.sh", "/sbin/e-smith/affa-rpmlist.sh" );
+ @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", '-o',
+ "UserKnownHostsFile=/root/.ssh/knownhosts-$jobname", $sshQuiet, $job{'remoteHostName'}, "'/sbin/e-smith/affa-rpmlist.sh>$rpmlist'"
+ );
+ }
+ # not ExecCmd( @cmd, 0 ) or affaErrorExit("writing list of installed RPMs failed.");
+ my $listStatus = ExecCmd (@cmd, 0);
+ if ($listStatus ne 0) {
+ affaErrorExit("Status = $listStatus - Error writing list of installed RPMs");
+ }
+
+}
+
+sub compareRPMLists($) {
+ return if $job{'SMEServer'} eq 'no' or $job{'remoteHostName'} eq 'localhost' or $job{'RPMCheck'} ne 'yes';
+ my $localRPMList = shift;
+ lg("Comparing installed RPMs on backup und remote host");
+ my $RPMPath = "home/e-smith/db/affa-rpmlist";
+ my %remoteRPM;
+ lg ("Reading remote RPM list Local = $localRPMList RPMPath = $RPMPath");
+ my $newRPMPath = "$localRPMList/$RPMPath";
+ lg ("New path = $newRPMPath");
+ open( RP, "$newRPMPath" ) or affaErrorExit("Couldn't open $localRPMList/$RPMPath");
+ while (