diff --git a/.Jenkinsfile b/.Jenkinsfile
new file mode 100644
index 0000000..0b3ae83
--- /dev/null
+++ b/.Jenkinsfile
@@ -0,0 +1,45 @@
+pipeline {
+ agent { label 'docker' }
+ stages {
+ stage('Build Debian package') {
+ agent {
+ docker {
+ image 'evolix/gbp:bullseye'
+ args '-u root --privileged -v /tmp:/tmp'
+ }
+ }
+ when {
+ branch 'debian'
+ }
+ steps {
+ script {
+ sh 'mk-build-deps --install --remove debian/control'
+ sh 'rm -rf source'
+ sh "gbp clone --debian-branch=$GIT_BRANCH $GIT_URL source"
+ sh 'cd source && git checkout $GIT_BRANCH && gbp buildpackage -us -uc'
+ }
+ archiveArtifacts allowEmptyArchive: true, artifacts: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,*.buildinfo,lintian.txt'
+ }
+ }
+
+ stage('Upload Debian package') {
+ when {
+ branch 'debian'
+ }
+ steps {
+ script {
+ sh 'echo Dummy line to remove once something actually happens.'
+ /* No crendentials yet
+ sh 'rsync -avP /tmp/bkctld/ droneci@pub.evolix.net:/home/droneci/bkctld/'
+ */
+ }
+ }
+ }
+ }
+ post {
+ // Clean after build
+ always {
+ cleanWs()
+ }
+ }
+}
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..cd183e5
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,46 @@
+kind: pipeline
+name: default
+
+steps:
+- name: fetch
+ image: alpine/git
+ commands:
+ - git fetch --tags
+
+- name: build debian package
+ image: evolix/gbp:bullseye
+ branches:
+ - debian
+ commands:
+ - mk-build-deps --install --remove debian/control
+ - git clean --force
+ - gbp buildpackage -us -uc
+ volumes:
+ - name: tmp
+ path: /tmp
+ when:
+ branch:
+ - debian
+
+- name: upload debian package
+ image: drillster/drone-rsync
+ settings:
+ hosts: ["pub.evolix.net"]
+ port: 22
+ user: droneci
+ key:
+ from_secret: drone_private_key
+ target: /home/droneci/bkctld/
+ source: /tmp/bkctld/
+ delete: true
+ volumes:
+ - name: tmp
+ path: /tmp
+ when:
+ branch:
+ - debian
+
+volumes:
+- name: tmp
+ host:
+ path: /tmp
diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md
index 7311efb..4065645 100644
--- a/client/CHANGELOG.md
+++ b/client/CHANGELOG.md
@@ -10,7 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
-* Use --dump-dir instead of --backup-dir to supress dump-server-state warning
+* Use --dump-dir instead of --backup-dir to suppress dump-server-state warning
+* Do not use rsync compression
+* Replace rsync option --verbose by --itemize-changes
+* Add canary to zzz_evobackup
+* update-evobackup-canary: do not use GNU date, for it to be compatible with OpenBSD
+* Add AGPL License and README
+* Script now depends on Bash
### Deprecated
diff --git a/client/LICENSE b/client/LICENSE
new file mode 100644
index 0000000..bae94e1
--- /dev/null
+++ b/client/LICENSE
@@ -0,0 +1,661 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+.
\ No newline at end of file
diff --git a/client/README.md b/client/README.md
new file mode 100644
index 0000000..d1142f6
--- /dev/null
+++ b/client/README.md
@@ -0,0 +1,3 @@
+Pour l'installation de `zzz_evobackup`, voir
+
+Pour `update-evobackup-canary`, voir
\ No newline at end of file
diff --git a/client/update-evobackup-canary b/client/update-evobackup-canary
new file mode 100644
index 0000000..868c3be
--- /dev/null
+++ b/client/update-evobackup-canary
@@ -0,0 +1,129 @@
+#!/bin/sh
+
+PROGNAME="update-evobackup-canary"
+REPOSITORY="https://gitea.evolix.org/evolix/evobackup"
+
+VERSION="22.06"
+readonly VERSION
+
+# base functions
+
+show_version() {
+ cat <,
+ Jérémy Lecour ,
+ and others.
+
+${REPOSITORY}
+
+${PROGNAME} comes with ABSOLUTELY NO WARRANTY. This is free software,
+and you are welcome to redistribute it under certain conditions.
+See the GNU General Public License v3.0 for details.
+END
+}
+show_help() {
+ cat <> "${canary_file}"
+}
+
+# parse options
+# based on https://gist.github.com/deshion/10d3cb5f88a21671e17a
+while :; do
+ case $1 in
+ -h|-\?|--help)
+ show_help
+ exit 0
+ ;;
+ -V|--version)
+ show_version
+ exit 0
+ ;;
+
+ -w|--who)
+ # with value separated by space
+ if [ -n "$2" ]; then
+ who=$2
+ shift
+ else
+ printf 'ERROR: "-w|--who" requires a non-empty option argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --who=?*)
+ # with value speparated by =
+ who=${1#*=}
+ ;;
+ --who=)
+ # without value
+ printf 'ERROR: "--who" requires a non-empty option argument.\n' >&2
+ exit 1
+ ;;
+
+ -f|--file)
+ # with value separated by space
+ if [ -n "$2" ]; then
+ canary_file=$2
+ shift
+ else
+ printf 'ERROR: "-f|--file" requires a non-empty option argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --file=?*)
+ # with value speparated by =
+ canary_file=${1#*=}
+ ;;
+ --file=)
+ # without value
+ printf 'ERROR: "--file" requires a non-empty option argument.\n' >&2
+ exit 1
+ ;;
+
+ --)
+ # End of all options.
+ shift
+ break
+ ;;
+ -?*)
+ # ignore unknown options
+ printf 'WARN: Unknown option : %s\n' "$1" >&2
+ exit 1
+ ;;
+ *)
+ # Default case: If no more options then break out of the loop.
+ break
+ ;;
+ esac
+
+ shift
+done
+
+export LC_ALL=C
+
+set -u
+
+main
diff --git a/client/zzz_evobackup b/client/zzz_evobackup
index 92b34a9..9beccfb 100755
--- a/client/zzz_evobackup
+++ b/client/zzz_evobackup
@@ -1,26 +1,24 @@
-#!/bin/sh
+#!/bin/bash
#
# Script Evobackup client
# See https://gitea.evolix.org/evolix/evobackup
#
-# Author: Gregory Colpart
-# Contributors:
-# Romain Dessort
-# Benoît Série
-# Tristan Pilat
-# Victor Laborie
-# Jérémy Lecour
+# Authors: Evolix ,
+# Gregory Colpart ,
+# Romain Dessort ,
+# Benoit Série ,
+# Tristan Pilat ,
+# Victor Laborie ,
+# Jérémy Lecour
+# and others.
#
# Licence: AGPLv3
#
# /!\ DON'T FORGET TO SET "MAIL" and "SERVERS" VARIABLES
-# Fail on unassigned variables
-set -u
-
##### Configuration ###################################################
-VERSION="22.03"
+VERSION="22.05"
# email adress for notifications
MAIL=jdoe@example.com
@@ -28,7 +26,10 @@ MAIL=jdoe@example.com
# list of hosts (hostname or IP) and SSH port for Rsync
SERVERS="node0.backup.example.com:2XXX node1.backup.example.com:2XXX"
-# Should we fallback on servers when the first is unreachable ?
+# explicit PATH
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin
+
+# Should we fallback on other servers when the first one is unreachable?
SERVERS_FALLBACK=${SERVERS_FALLBACK:-1}
# timeout (in seconds) for SSH connections
@@ -47,118 +48,18 @@ PIDFILE="/var/run/${PROGNAME}.pid"
# Customize the log path if you have multiple scripts and with separate logs
LOGFILE="/var/log/evobackup.log"
-# Enable/Disable tasks
-LOCAL_TASKS=${LOCAL_TASKS:-1}
-SYNC_TASKS=${SYNC_TASKS:-1}
-
HOSTNAME=$(hostname)
+DATE_FORMAT="%Y-%m-%d %H:%M:%S"
+
+# Enable/disable local tasks (default: enabled)
+: "${LOCAL_TASKS:=1}"
+# Enable/disable sync tasks (default: enabled)
+: "${SYNC_TASKS:=1}"
+
##### SETUP AND FUNCTIONS #############################################
-START_EPOCH=$(/bin/date +%s)
-DATE_FORMAT="%Y-%m-%d %H:%M:%S"
-
-# shellcheck disable=SC2174
-mkdir -p -m 700 ${LOCAL_BACKUP_DIR}
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin
-
-## lang = C for english outputs
-export LANGUAGE=C
-export LANG=C
-
-## Force umask
-umask 077
-
-## Initialize variable to store SSH connection errors
-SERVERS_SSH_ERRORS=""
-
-# Call test_server with "HOST:PORT" string
-# It will return with 0 if the server is reachable.
-# It will return with 1 and a message on stderr if not.
-test_server() {
- item=$1
- # split HOST and PORT from the input string
- host=$(echo "${item}" | cut -d':' -f1)
- port=$(echo "${item}" | cut -d':' -f2)
-
- # Test if the server is accepting connections
- ssh -q -o "ConnectTimeout ${SSH_CONNECT_TIMEOUT}" "${host}" -p "${port}" -t "exit"
- # shellcheck disable=SC2181
- if [ $? = 0 ]; then
- # SSH connection is OK
- return 0
- else
- # SSH connection failed
- new_error=$(printf "Failed to connect to \`%s' within %s seconds" "${item}" "${SSH_CONNECT_TIMEOUT}")
- log "${new_error}"
- SERVERS_SSH_ERRORS=$(printf "%s\\n%s" "${SERVERS_SSH_ERRORS}" "${new_error}" | sed -e '/^$/d')
-
- return 1
- fi
-}
-# Call pick_server with an optional positive integer to get the nth server in the list.
-pick_server() {
- increment=${1:-0}
- list_length=$(echo "${SERVERS}" | wc -w)
-
- if [ "${increment}" -ge "${list_length}" ]; then
- # We've reached the end of the list
- new_error="No more server available"
- log "${new_error}"
- SERVERS_SSH_ERRORS=$(printf "%s\\n%s" "${SERVERS_SSH_ERRORS}" "${new_error}" | sed -e '/^$/d')
-
- # Log errors to stderr
- printf "%s\\n" "${SERVERS_SSH_ERRORS}" >&2
- return 1
- fi
-
- # Extract the day of month, without leading 0 (which would give an octal based number)
- today=$(/bin/date +%e)
- # A salt is useful to randomize the starting point in the list
- # but stay identical each time it's called for a server (based on hostname).
- salt=$(hostname | cksum | cut -d' ' -f1)
- # Pick an integer between 0 and the length of the SERVERS list
- # It changes each day
- item=$(( (today + salt + increment) % list_length ))
- # cut starts counting fields at 1, not 0.
- field=$(( item + 1 ))
-
- echo "${SERVERS}" | cut -d' ' -f${field}
-}
-log() {
- msg="${1:-$(cat /dev/stdin)}"
- pid=$$
- printf "[%s] %s[%s]: %s\\n" \
- "$(/bin/date +"${DATE_FORMAT}")" "${PROGNAME}" "${pid}" "${msg}" \
- >> "${LOGFILE}"
-}
-
-log "START GLOBAL - VERSION=${VERSION} LOCAL_TASKS=${LOCAL_TASKS} SYNC_TASKS=${SYNC_TASKS}"
-
-## Verify other evobackup process and kill if needed
-if [ -e "${PIDFILE}" ]; then
- pid=$(cat "${PIDFILE}")
- # Does process still exist ?
- if kill -0 "${pid}" 2> /dev/null; then
- # Killing the childs of evobackup.
- for ppid in $(pgrep -P "${pid}"); do
- kill -9 "${ppid}";
- done
- # Then kill the main PID.
- kill -9 "${pid}"
- printf "%s is still running (PID %s). Process has been killed" "$0" "${pid}\\n" >&2
- else
- rm -f "${PIDFILE}"
- fi
-fi
-echo "$$" > "${PIDFILE}"
-# shellcheck disable=SC2064
-trap "rm -f ${PIDFILE}" EXIT
-
-##### LOCAL BACKUP ####################################################
-
-if [ "${LOCAL_TASKS}" = "1" ]; then
+local_tasks() {
log "START LOCAL_TASKS"
# You can comment or uncomment sections below to customize the backup
@@ -175,48 +76,90 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
# rm -rf ${LOCAL_BACKUP_DIR}/mysql
# rm -rf ${LOCAL_BACKUP_DIR}/mysqlhotcopy
# rm -rf /home/mysqldump
+ # rm -f ${LOCAL_BACKUP_DIR}/*.err ${LOCAL_BACKUP_DIR}/**/*.err
## example with global and compressed mysqldump
# mysqldump --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 \
- # --opt --all-databases --force --events --hex-blob | gzip --best > ${LOCAL_BACKUP_DIR}/mysql.bak.gz
+ # --opt --all-databases --force --events --hex-blob 2> ${LOCAL_BACKUP_DIR}/mysql.bak.err | gzip --best > ${LOCAL_BACKUP_DIR}/mysql.bak.gz
+ # last_rc=$?
+ # if [ ${last_rc} -ne 0 ]; then
+ # error "mysqldump (global compressed) returned an error ${last_rc}, check ${LOCAL_BACKUP_DIR}/mysql.bak.err"
+ # rc=101
+ # fi
## example with compressed SQL dump (with data) for each databases
# mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/
# for i in $(mysql --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 -e 'show databases' -s --skip-column-names \
# | egrep -v "^(Database|information_schema|performance_schema|sys)"); do
- # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 --events --hex-blob $i | gzip --best > ${LOCAL_BACKUP_DIR}/mysql/${i}.sql.gz
+ # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 --events --hex-blob $i 2> ${LOCAL_BACKUP_DIR}/${i}.err | gzip --best > ${LOCAL_BACKUP_DIR}/mysql/${i}.sql.gz
+ # last_rc=$?
+ # if [ ${last_rc} -ne 0 ]; then
+ # error "mysqldump (${i} compressed) returned an error ${last_rc}, check ${LOCAL_BACKUP_DIR}/${i}.err"
+ # rc=102
+ # fi
# done
## Dump all grants (requires 'percona-toolkit' package)
# mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/
- # pt-show-grants --flush --no-header > ${LOCAL_BACKUP_DIR}/mysql/all_grants.sql
+ # pt-show-grants --flush --no-header 2> ${LOCAL_BACKUP_DIR}/mysql/all_grants.err > ${LOCAL_BACKUP_DIR}/mysql/all_grants.sql
+ # last_rc=$?
+ # if [ ${last_rc} -ne 0 ]; then
+ # error "pt-show-grants returned an error ${last_rc}, check ${LOCAL_BACKUP_DIR}/mysql/all_grants.err"
+ # rc=103
+ # fi
# Dump all variables
- # mysql -A -e"SHOW GLOBAL VARIABLES;" > ${LOCAL_BACKUP_DIR}/MySQLCurrentSettings.txt
+ # mysql -A -e"SHOW GLOBAL VARIABLES;" 2> ${LOCAL_BACKUP_DIR}/MySQLCurrentSettings.err > ${LOCAL_BACKUP_DIR}/MySQLCurrentSettings.txt
+ # last_rc=$?
+ # if [ ${last_rc} -ne 0 ]; then
+ # error "mysql (variables) returned an error ${last_rc}, check ${LOCAL_BACKUP_DIR}/MySQLCurrentSettings.err"
+ # rc=104
+ # fi
## example with SQL dump (schema only, no data) for each databases
# mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/
# for i in $(mysql --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 -e 'show databases' -s --skip-column-names \
# | egrep -v "^(Database|information_schema|performance_schema|sys)"); do
- # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 --no-data --databases $i > ${LOCAL_BACKUP_DIR}/mysql/${i}.schema.sql
+ # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 --no-data --databases $i 2> ${LOCAL_BACKUP_DIR}/${i}.schema.err > ${LOCAL_BACKUP_DIR}/mysql/${i}.schema.sql
+ # last_rc=$?
+ # if [ ${last_rc} -ne 0 ]; then
+ # error "mysqldump (${i} schema) returned an error ${last_rc}, check ${LOCAL_BACKUP_DIR}/${i}.schema.err"
+ # rc=105
+ # fi
# done
## example with *one* uncompressed SQL dump for *one* database (MYBASE)
# mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/MYBASE
# chown -RL mysql ${LOCAL_BACKUP_DIR}/mysql/
# mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -Q \
- # --opt --events --hex-blob --skip-comments -T ${LOCAL_BACKUP_DIR}/mysql/MYBASE MYBASE
+ # --opt --events --hex-blob --skip-comments -T ${LOCAL_BACKUP_DIR}/mysql/MYBASE MYBASE 2> ${LOCAL_BACKUP_DIR}/mysql/MYBASE.err
+ # last_rc=$?
+ # if [ ${last_rc} -ne 0 ]; then
+ # error "mysqldump (MYBASE) returned an error ${last_rc}, check ${LOCAL_BACKUP_DIR}/mysql/MYBASE.err"
+ # rc=106
+ # fi
## example with two dumps for each table (.sql/.txt) for all databases
# for i in $(echo SHOW DATABASES | mysql --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 \
- # | egrep -v "^(Database|information_schema|performance_schema|sys)" ); \
- # do mkdir -p -m 700 /home/mysqldump/$i ; chown -RL mysql /home/mysqldump ; \
- # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 -Q --opt --events --hex-blob --skip-comments \
- # --fields-enclosed-by='\"' --fields-terminated-by=',' -T /home/mysqldump/$i $i; done
+ # | egrep -v "^(Database|information_schema|performance_schema|sys)" ); do
+ # mkdir -p -m 700 /home/mysqldump/$i ; chown -RL mysql /home/mysqldump
+ # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 -Q --opt --events --hex-blob --skip-comments \
+ # --fields-enclosed-by='\"' --fields-terminated-by=',' -T /home/mysqldump/$i $i 2> /home/mysqldump/$i.err"
+ # last_rc=$?
+ # if [ ${last_rc} -ne 0 ]; then
+ # error "mysqldump (${i} files) returned an error ${last_rc}, check /home/mysqldump/$i.err"
+ # rc=107
+ # fi
+ # done
## example with mysqlhotcopy
# mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysqlhotcopy/
- # mysqlhotcopy MYBASE ${LOCAL_BACKUP_DIR}/mysqlhotcopy/
+ # mysqlhotcopy MYBASE ${LOCAL_BACKUP_DIR}/mysqlhotcopy/ 2> ${LOCAL_BACKUP_DIR}/mysqlhotcopy/MYBASE.err
+ # last_rc=$?
+ # if [ ${last_rc} -ne 0 ]; then
+ # error "mysqlhotcopy returned an error ${last_rc}, check ${LOCAL_BACKUP_DIR}/mysqlhotcopy/MYBASE.err"
+ # rc=108
+ # fi
## example for multiples MySQL instances
# mysqladminpasswd=$(grep -m1 'password = .*' /root/.my.cnf|cut -d" " -f3)
@@ -224,7 +167,12 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
# instance=$(echo "$instance"|awk '{ print $3 }')
# if [ "$instance" != "3306" ]
# then
- # mysqldump -P $instance --opt --all-databases --hex-blob -u mysqladmin -p$mysqladminpasswd | gzip --best > ${LOCAL_BACKUP_DIR}/mysql.$instance.bak.gz
+ # mysqldump -P $instance --opt --all-databases --hex-blob -u mysqladmin -p$mysqladminpasswd 2> ${LOCAL_BACKUP_DIR}/mysql.${instance}.err | gzip --best > ${LOCAL_BACKUP_DIR}/mysql.${instance}.bak.gz
+ # last_rc=$?
+ # if [ ${last_rc} -ne 0 ]; then
+ # error "mysqldump (instance ${instance}) returned an error ${last_rc}, check ${LOCAL_BACKUP_DIR}/mysql.${instance}.err"
+ # rc=107
+ # fi
# fi
# done
@@ -289,14 +237,14 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
## Take a snapshot as a backup.
## Warning: You need to have a path.repo configured.
## See: https://wiki.evolix.org/HowtoElasticsearch#snapshots-et-sauvegardes
- # curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot.daily" -o /tmp/es_delete_snapshot.daily.log
- # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot.daily?wait_for_completion=true" -o /tmp/es_snapshot.daily.log
+ # curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot.daily" >> "${LOGFILE}"
+ # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot.daily?wait_for_completion=true" >> "${LOGFILE}"
## Clustered version here
## It basically the same thing except that you need to check that NFS is mounted
# if ss | grep ':nfs' | grep -q 'ip\.add\.res\.s1' && ss | grep ':nfs' | grep -q 'ip\.add\.res\.s2'
# then
- # curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot.daily" -o /tmp/es_delete_snapshot.daily.log
- # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot.daily?wait_for_completion=true" -o /tmp/es_snapshot.daily.log
+ # curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot.daily" >> "${LOGFILE}"
+ # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot.daily?wait_for_completion=true" >> "${LOGFILE}"
# else
# echo 'Cannot make a snapshot of elasticsearch, at least one node is not mounting the repository.'
# fi
@@ -305,12 +253,12 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
# curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/${snapshot}" | grep -v -Fx '{"acknowledged":true}'
# done
# date=$(/bin/date +%F)
- # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot_${date}?wait_for_completion=true" -o /tmp/es_snapshot_${date}.log
+ # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot_${date}?wait_for_completion=true" >> "${LOGFILE}"
## RabbitMQ
## export config
- #rabbitmqadmin export ${LOCAL_BACKUP_DIR}/rabbitmq.config >> $LOGFILE
+ #rabbitmqadmin export ${LOCAL_BACKUP_DIR}/rabbitmq.config >> "${LOGFILE}"
## MegaCli config
@@ -329,6 +277,11 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
if [ "${SYSTEM}" = "linux" ]; then
if [ -n "${dump_server_state_bin}" ]; then
${dump_server_state_bin} --all --force --dump-dir "${server_state_dir}"
+ last_rc=$?
+ if [ ${last_rc} -ne 0 ]; then
+ error "dump-server-state returned an error ${last_rc}, check ${server_state_dir}"
+ rc=1
+ fi
else
mkdir -p "${server_state_dir}"
@@ -367,7 +320,12 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
fi
else
if [ -n "${dump_server_state_bin}" ]; then
- ${dump_server_state_bin} --all --force --backup-dir "${server_state_dir}"
+ ${dump_server_state_bin} --all --force --dump-dir "${server_state_dir}"
+ last_rc=$?
+ if [ ${last_rc} -ne 0 ]; then
+ error "dump-server-state returned an error ${last_rc}, check ${server_state_dir}"
+ rc=1
+ fi
else
mkdir -p "${server_state_dir}"
@@ -399,12 +357,8 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
#getfacl -R /home > ${server_state_dir}/rights-home.txt
log "STOP LOCAL_TASKS"
-fi
-
-##### REMOTE BACKUP ###################################################
-
-
-if [ "${SYNC_TASKS}" = "1" ]; then
+}
+sync_tasks() {
n=0
server=""
if [ "${SERVERS_FALLBACK}" = "1" ]; then
@@ -436,6 +390,8 @@ if [ "${SYNC_TASKS}" = "1" ]; then
log "START SYNC_TASKS - server=${server}"
+ update-evobackup-canary --who "${PROGNAME}"
+
# /!\ DO NOT USE COMMENTS in the rsync command /!\
# It breaks the command and destroys data, simply remove (or add) lines.
@@ -444,7 +400,10 @@ if [ "${SYNC_TASKS}" = "1" ]; then
# ignore check because we want it to split the different arguments to $rep
# shellcheck disable=SC2086
- rsync -avzh --relative --stats --delete --delete-excluded --force --ignore-errors --partial \
+ rsync --archive \
+ --itemize-changes --stats --human-readable \
+ --relative --partial \
+ --delete --delete-excluded --force --ignore-errors \
--exclude "dev" \
--exclude "lost+found" \
--exclude ".nfs.*" \
@@ -494,27 +453,157 @@ if [ "${SYNC_TASKS}" = "1" ]; then
/root \
/var \
/home \
+ /zzz_evobackup_canary \
-e "${RSH_COMMAND}" \
"root@${SSH_SERVER}:/var/backup/" \
- | tail -30 >> $LOGFILE
+ | tail -30 >> "${LOGFILE}"
+
+ rsync_rc=$?
+ if [ ${rsync_rc} -ne 0 ]; then
+ error "rsync returned an error ${rsync_rc}, check ${LOGFILE}"
+ rc=201
+ fi
log "STOP SYNC_TASKS - server=${server}"
-fi
+}
-##### REPORTING #######################################################
+# Call test_server with "HOST:PORT" string
+# It will return with 0 if the server is reachable.
+# It will return with 1 and a message on stderr if not.
+test_server() {
+ item=$1
+ # split HOST and PORT from the input string
+ host=$(echo "${item}" | cut -d':' -f1)
+ port=$(echo "${item}" | cut -d':' -f2)
-STOP_EPOCH=$(/bin/date +%s)
+ # Test if the server is accepting connections
+ ssh -q -o "ConnectTimeout ${SSH_CONNECT_TIMEOUT}" "${host}" -p "${port}" -t "exit"
+ # shellcheck disable=SC2181
+ if [ $? = 0 ]; then
+ # SSH connection is OK
+ return 0
+ else
+ # SSH connection failed
+ new_error=$(printf "Failed to connect to \`%s' within %s seconds" "${item}" "${SSH_CONNECT_TIMEOUT}")
+ log "${new_error}"
+ SERVERS_SSH_ERRORS=$(printf "%s\\n%s" "${SERVERS_SSH_ERRORS}" "${new_error}" | sed -e '/^$/d')
-if [ "${SYSTEM}" = "openbsd" ]; then
- start_time=$(/bin/date -f "%s" -j "${START_EPOCH}" +"${DATE_FORMAT}")
- stop_time=$(/bin/date -f "%s" -j "${STOP_EPOCH}" +"${DATE_FORMAT}")
-else
- start_time=$(/bin/date --date="@${START_EPOCH}" +"${DATE_FORMAT}")
- stop_time=$(/bin/date --date="@${STOP_EPOCH}" +"${DATE_FORMAT}")
-fi
-duration=$(( STOP_EPOCH - START_EPOCH ))
+ return 1
+ fi
+}
+# Call pick_server with an optional positive integer to get the nth server in the list.
+pick_server() {
+ increment=${1:-0}
+ list_length=$(echo "${SERVERS}" | wc -w)
-log "STOP GLOBAL - start='${start_time}' stop='${stop_time}' duration=${duration}s"
+ if [ "${increment}" -ge "${list_length}" ]; then
+ # We've reached the end of the list
+ new_error="No more server available"
+ log "${new_error}"
+ SERVERS_SSH_ERRORS=$(printf "%s\\n%s" "${SERVERS_SSH_ERRORS}" "${new_error}" | sed -e '/^$/d')
-tail -20 "${LOGFILE}" \
- | mail -s "[info] EvoBackup - Client ${HOSTNAME}" ${MAIL}
+ # Log errors to stderr
+ printf "%s\\n" "${SERVERS_SSH_ERRORS}" >&2
+ return 1
+ fi
+
+ # Extract the day of month, without leading 0 (which would give an octal based number)
+ today=$(/bin/date +%e)
+ # A salt is useful to randomize the starting point in the list
+ # but stay identical each time it's called for a server (based on hostname).
+ salt=$(hostname | cksum | cut -d' ' -f1)
+ # Pick an integer between 0 and the length of the SERVERS list
+ # It changes each day
+ item=$(( (today + salt + increment) % list_length ))
+ # cut starts counting fields at 1, not 0.
+ field=$(( item + 1 ))
+
+ echo "${SERVERS}" | cut -d' ' -f${field}
+}
+log() {
+ msg="${1:-$(cat /dev/stdin)}"
+ pid=$$
+ printf "[%s] %s[%s]: %s\\n" \
+ "$(/bin/date +"${DATE_FORMAT}")" "${PROGNAME}" "${pid}" "${msg}" \
+ >> "${LOGFILE}"
+}
+error() {
+ msg="${1:-$(cat /dev/stdin)}"
+ pid=$$
+ printf "[%s] %s[%s]: %s\\n" \
+ "$(/bin/date +"${DATE_FORMAT}")" "${PROGNAME}" "${pid}" "${msg}" \
+ >&2
+}
+
+main() {
+ START_EPOCH=$(/bin/date +%s)
+ log "START GLOBAL - VERSION=${VERSION} LOCAL_TASKS=${LOCAL_TASKS} SYNC_TASKS=${SYNC_TASKS}"
+
+ # shellcheck disable=SC2174
+ mkdir -p -m 700 ${LOCAL_BACKUP_DIR}
+
+ ## Force umask
+ umask 077
+
+ ## Initialize variable to store SSH connection errors
+ SERVERS_SSH_ERRORS=""
+
+ ## Verify other evobackup process and kill if needed
+ if [ -e "${PIDFILE}" ]; then
+ pid=$(cat "${PIDFILE}")
+ # Does process still exist ?
+ if kill -0 "${pid}" 2> /dev/null; then
+ # Killing the childs of evobackup.
+ for ppid in $(pgrep -P "${pid}"); do
+ kill -9 "${ppid}";
+ done
+ # Then kill the main PID.
+ kill -9 "${pid}"
+ printf "%s is still running (PID %s). Process has been killed" "$0" "${pid}\\n" >&2
+ else
+ rm -f "${PIDFILE}"
+ fi
+ fi
+ echo "$$" > "${PIDFILE}"
+ # shellcheck disable=SC2064
+ trap "rm -f ${PIDFILE}" EXIT
+
+ if [ "${LOCAL_TASKS}" = "1" ]; then
+ local_tasks
+ fi
+
+ if [ "${SYNC_TASKS}" = "1" ]; then
+ sync_tasks
+ fi
+
+ STOP_EPOCH=$(/bin/date +%s)
+
+ if [ "${SYSTEM}" = "openbsd" ]; then
+ start_time=$(/bin/date -f "%s" -j "${START_EPOCH}" +"${DATE_FORMAT}")
+ stop_time=$(/bin/date -f "%s" -j "${STOP_EPOCH}" +"${DATE_FORMAT}")
+ else
+ start_time=$(/bin/date --date="@${START_EPOCH}" +"${DATE_FORMAT}")
+ stop_time=$(/bin/date --date="@${STOP_EPOCH}" +"${DATE_FORMAT}")
+ fi
+ duration=$(( STOP_EPOCH - START_EPOCH ))
+
+ log "STOP GLOBAL - start='${start_time}' stop='${stop_time}' duration=${duration}s"
+
+ tail -20 "${LOGFILE}" | mail -s "[info] EvoBackup - Client ${HOSTNAME}" ${MAIL}
+}
+
+# set all programs to C language (english)
+export LC_ALL=C
+
+# Error on unassigned variable
+set -u
+# Fail if a pipeline member returns an error (cf. https://sipb.mit.edu/doc/safe-shell/)
+set -o pipefail
+
+# Default return-code (0 == succes)
+rc=0
+
+# execute main funciton
+main
+
+exit ${rc}
diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
index 80f6568..cf3a7e4 100644
--- a/server/CHANGELOG.md
+++ b/server/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
+### Added
+
+### Changed
+
### Deprecated
### Removed
@@ -14,6 +18,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security
+## [22.06] - 2022-06-28
+
+### Added
+
+* bkctld-init: create "incs/\" directory for jails
+
+### Fixed
+
+* shell syntax error when ${btrfs_bin} variable is empty
+* read_variable + read_numerical_variable: keep the last found value only
+* Debian 8 findmnt(8) support
+
+### Security
+
## [22.04] - 2022-04-20
### Added
diff --git a/server/lib/bkctld-check-setup b/server/lib/bkctld-check-setup
index 95a020b..8bbcda9 100755
--- a/server/lib/bkctld-check-setup
+++ b/server/lib/bkctld-check-setup
@@ -16,7 +16,7 @@ output=""
# Verify backup partition is mounted and writable
-findmnt --mountpoint "${BACKUP_PARTITION}" -O rw > /dev/null
+findmnt -O rw --target "${BACKUP_PARTITION}" > /dev/null
if [ "$?" -ne 0 ]; then
nb_crit=$((nb_crit + 1))
output="${output}CRITICAL - Backup disk \`/backup' is not mounted (or read-only) !\n"
diff --git a/server/lib/bkctld-inc-lock b/server/lib/bkctld-inc-lock
index e3c704e..8b04e93 100755
--- a/server/lib/bkctld-inc-lock
+++ b/server/lib/bkctld-inc-lock
@@ -13,7 +13,7 @@ target_path="${2:?}"
lock_target() {
target="${1:?}"
btrfs_bin=$(command -v btrfs)
- if [ -z ${btrfs_bin} ]; then
+ if [ -z "${btrfs_bin}" ]; then
error "btrfs not found. Please install btrfs-progs."
fi
if is_btrfs "${target}"; then
@@ -26,7 +26,7 @@ lock_target() {
unlock_target() {
target="${1:?}"
btrfs_bin=$(command -v btrfs)
- if [ -z ${btrfs_bin} ]; then
+ if [ -z "${btrfs_bin}" ]; then
error "btrfs not found. Please install brtfs-progs."
fi
if is_btrfs "${target}"; then
diff --git a/server/lib/bkctld-init b/server/lib/bkctld-init
index 14a1000..b0862fb 100755
--- a/server/lib/bkctld-init
+++ b/server/lib/bkctld-init
@@ -12,15 +12,16 @@ if [ -z "${jail_name}" ]; then
show_help && exit 1
fi
jail_path=$(jail_path "${jail_name}")
+incs_path=$(incs_path "${jail_name}")
test -d "${jail_path}" && error "Skip jail \`${jail_name}' : it already exists"
-# Create config and jails directory
-mkdir --parents "${CONFDIR}" "${JAILDIR}"
+# Create config, jails and incs directories
+mkdir --parents "${CONFDIR}" "${JAILDIR}" "${INCDIR}"
if is_btrfs "$(dirname "${JAILDIR}")" || is_btrfs "${JAILDIR}"; then
btrfs_bin=$(command -v btrfs)
- if [ -z ${btrfs_bin} ]; then
+ if [ -z "${btrfs_bin}" ]; then
error "btrfs not found. Please install btrfs-progs."
fi
${btrfs_bin} subvolume create "${jail_path}"
@@ -28,6 +29,8 @@ else
mkdir --parents "${jail_path}"
fi
+mkdir --parents "${incs_path}"
+
setup_jail_chroot "${jail_name}"
setup_jail_config "${jail_name}"
diff --git a/server/lib/bkctld-remove b/server/lib/bkctld-remove
index f3dc6c3..382bac7 100755
--- a/server/lib/bkctld-remove
+++ b/server/lib/bkctld-remove
@@ -53,7 +53,7 @@ rm -f "${CONFDIR}/${jail_name}"
rm -rf "$(jail_config_dir "${jail_name}")"
btrfs_bin=$(command -v btrfs)
-if [ -z ${btrfs_bin} ]; then
+if [ -z "${btrfs_bin}" ]; then
error "btrfs not found. Please install btrfs-progs."
fi
diff --git a/server/lib/bkctld-rm b/server/lib/bkctld-rm
index 28caef8..00451ad 100755
--- a/server/lib/bkctld-rm
+++ b/server/lib/bkctld-rm
@@ -63,7 +63,7 @@ delete_inc_btrfs() {
inc_path=$(inc_path "${jail_name}" "${inc_name}")
btrfs_bin=$(command -v btrfs)
- if [ -z ${btrfs_bin} ]; then
+ if [ -z "${btrfs_bin}" ]; then
error "btrfs not found. Please install btrfs-progs."
fi
diff --git a/server/lib/includes b/server/lib/includes
index 3892a2b..91321a3 100755
--- a/server/lib/includes
+++ b/server/lib/includes
@@ -445,7 +445,7 @@ read_variable() {
pattern="^\s*${var_name}=.+"
- grep --extended-regexp --only-matching "${pattern}" "${file}" | cut -d= -f2
+ grep --extended-regexp --only-matching "${pattern}" "${file}" | tail -1 | cut -d= -f2
}
read_numerical_variable() {
@@ -454,5 +454,5 @@ read_numerical_variable() {
pattern="^\s*${var_name}=-?[0-9]+"
- grep --extended-regexp --only-matching "${pattern}" "${file}" | cut -d= -f2
+ grep --extended-regexp --only-matching "${pattern}" "${file}" | tail -1 | cut -d= -f2
}
diff --git a/server/test/checks.bats b/server/test/checks.bats
index bc6da3b..48c74ea 100644
--- a/server/test/checks.bats
+++ b/server/test/checks.bats
@@ -144,7 +144,7 @@ OUT
@test "Check setup WARNING if firewall rules are not sourced" {
/usr/lib/bkctld/bkctld-start ${JAILNAME}
- mkdir /etc/minifirewall.d/
+ mkdir --parents /etc/minifirewall.d/
firewall_rules_file="/etc/minifirewall.d/bkctld"
set_variable "/etc/default/bkctld" "FIREWALL_RULES" "${firewall_rules_file}"
echo "" > "${firewall_rules_file}"
@@ -159,7 +159,7 @@ OUT
@test "Check setup OK if firewall rules are sourced" {
/usr/lib/bkctld/bkctld-start ${JAILNAME}
- mkdir /etc/minifirewall.d/
+ mkdir --parents /etc/minifirewall.d/
firewall_rules_file="/etc/minifirewall.d/bkctld"
set_variable "/etc/default/bkctld" "FIREWALL_RULES" "${firewall_rules_file}"
echo "" > "${firewall_rules_file}"
diff --git a/server/test/incs.bats b/server/test/incs.bats
index 973242d..4bb615f 100644
--- a/server/test/incs.bats
+++ b/server/test/incs.bats
@@ -9,6 +9,11 @@ load test_helper
run test -e "${CONFDIR}/${JAILNAME}.d/incs_policy"
[ "${status}" -eq 0 ]
}
+@test "Inc directory after jail init" {
+ # An incs_policy file should exist
+ run test -d "${INCDIR}/${JAILNAME}"
+ [ "${status}" -eq 0 ]
+}
@test "Normal inc creation" {
/usr/lib/bkctld/bkctld-inc