diff --git a/.gitignore b/.gitignore index e5c18f6..be21643 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,2 @@ conf/sources/*/destination/* doc/old -doc/*.html -doc/*.htm -doc/*.docbook -doc/*.texi -doc/man/*.html -doc/man/*.htm -doc/man/*.texi -doc/man/*.man -.*.swp -doc/man/*.[0-9] -doc/*.xml -doc/*/*.xml -*.texi -*.fo diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 5391f4d..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,12 +0,0 @@ -stages: - - test - -unit_tests: - stage: test - script: - - make test - -shellcheck: - stage: test - script: - - make shellcheck diff --git a/COPYING b/COPYING index 94a9ed0..3912109 100644 --- a/COPYING +++ b/COPYING @@ -1,626 +1,285 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + 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 + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) 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. +this service 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. + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. 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. +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. - 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. + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. - 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. + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. 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 + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to 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 + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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. +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. - 13. Use with the GNU Affero General Public License. +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. - 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. +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. - 14. Revised Versions of this License. +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body 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 + 9. The Free Software Foundation may publish revised and/or new versions +of the 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. +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this 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. + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. - 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. + NO WARRANTY - 15. Disclaimer of Warranty. + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - 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. + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. - 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 + 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 @@ -628,15 +287,15 @@ 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 +convey 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 + 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 + the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -645,30 +304,37 @@ the "copyright" line and a pointer to where the full notice is found. 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 . + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 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: +If the program is interactive, 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'. + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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". +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. - 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 -. +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: - 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 -. + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This 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 Library General +Public License instead of this License. diff --git a/CREDITS b/CREDITS deleted file mode 100644 index aac73e2..0000000 --- a/CREDITS +++ /dev/null @@ -1,16 +0,0 @@ -Thanks go to the following people (sorted by alphabet): - -* Alexey Maximov - - for finding return-value and shell limitation bugs -* #cLinux IRC channel on irc.freenode.org - - for testing and debugging (those I mean should know ;-) -* Daniel Aubry - - for reporting many hints -* Jens-Christoph Brendel - - Added automatic backup manager (contrib/jbrendel-autobackup) -* John Lawless - - A lot of patches and some very interesting discussions. -* Markus Meier - - for finding a really simple solution for choosing the right backup to - clone from: Make it independent of the interval, simply choose the last - one created. diff --git a/Makefile b/Makefile index 789e099..d6fac7d 100644 --- a/Makefile +++ b/Makefile @@ -1,250 +1,53 @@ # -# 2006-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Initially written on Fri Jan 13 12:13:08 CET 2006 -# -# FIXME: add prefix-support? +# ccollect +# Nico Schottelius, Fri Jan 13 12:13:08 CET 2006 # INSTALL=install -CCOLLECT_SOURCE=ccollect -CCOLLECT_DEST=ccollect +CCOLLECT=ccollect.sh LN=ln -sf -ASCIIDOC=asciidoc -DOCBOOKTOTEXI=docbook2x-texi -DOCBOOKTOMAN=docbook2x-man -XSLTPROC=xsltproc -XSL=/usr/local/share/xsl/docbook/html/docbook.xsl -A2X=a2x -prefix=/usr/packages/ccollect-git -bindir=${prefix}/bin -destination=${bindir}/${CCOLLECT_DEST} - -mandest=${prefix}/man/man1 -manlink=/usr/local/man/man1 +prefix=/usr/packages/ccollect-0.2 +bindir=$(prefix)/bin +destination=$(bindir)/$(CCOLLECT) path_dir=/usr/local/bin -path_destination=${path_dir}/${CCOLLECT_DEST} -docs_archive_name=docs.tar +path_destination=$(path_dir)/$(CCOLLECT) -# -# Asciidoc will be used to generate other formats later -# -MANDOCS = doc/man/ccollect.text \ - doc/man/ccollect_add_source.text \ - doc/man/ccollect_analyse_logs.text \ - doc/man/ccollect_delete_source.text \ - doc/man/ccollect_logwrapper.text \ - doc/man/ccollect_list_intervals.text - -DOCS = ${MANDOCS} doc/ccollect.text - -# -# Doku -# -HTMLDOCS = ${DOCS:.text=.html} -DBHTMLDOCS = ${DOCS:.text=.htm} - -# texi is broken currently, don't know why xslt things complain yet -TEXIDOCS = ${DOCS:.text=.texi} -TEXIDOCS = - -# fop fails here, so disable it for now -PDFDOCS = ${DOCS:.text=.pdf} -PDFDOCS = - -MANPDOCS = ${MANDOCS:.text=.1} - -DOCBDOCS = ${DOCS:.text=.docbook} - -DOC_ALL = ${HTMLDOCS} ${DBHTMLDOCS} ${TEXIDOCS} ${MANPDOCS} ${PDFDOCS} - -TEST_LOG_FILE = /tmp/ccollect/ccollect.log +# where to publish +host=creme.schottelius.org +dir=www/org/schottelius/linux/ccollect +docdir=$(dir)/doc # # End user targets # all: - @echo "----------- ccollect make targets --------------" - @echo "documentation: generate HTMl, Texinfo and manpage" - @echo "html: only generate HTML" - @echo "info: only generate Texinfo" - @echo "man: only generate manpage{s}" - @echo "install: install ccollect to ${prefix}" - @echo "shellcheck: shellcheck ccollect script" - @echo "test: run unit tests" + @echo "Nothing to make, make install." -html: ${HTMLDOCS} -htm: ${DBHTMLDOCS} -info: ${TEXIDOCS} -man: ${MANPDOCS} -pdf: ${PDFDOCS} -documentation: ${DOC_ALL} - -install: install-link install-manlink +install: install-script install-link install-link: install-script - ${LN} ${destination} ${path_destination} + $(LN) $(destination) $(path_destination) install-script: - ${INSTALL} -D -m 0755 ${CCOLLECT_SOURCE} ${destination} - -install-man: man - ${INSTALL} -d -m 0755 ${mandest} - ${INSTALL} -D -m 0644 doc/man/*.1 ${mandest} - -install-manlink: install-man - ${INSTALL} -d -m 0755 ${manlink} - for man in ${mandest}/*; do ${LN} $$man ${manlink}; done - -# -# Tools -# -TOOLS2=ccollect_add_source -TOOLS2 += ccollect_analyse_logs - -TOOLS=ccollect_add_source \ - ccollect_analyse_logs \ - ccollect_delete_source \ - ccollect_list_intervals \ - ccollect_logwrapper \ - ccollect_list_intervals - -# Stick to posix -TOOLSMAN1 = $(TOOLS:ccollect=doc/man/ccollect) -TOOLSMAN = $(TOOLSMAN1:=.text) - -TOOLSFP = $(subst ccollect,tools/ccollect,$(TOOLS)) - -## FIXME: posix make: shell? => - -t2: - echo $(TOOLS) - $(TOOLSFP) - echo $(TOOLSMAN) - echo $(TOOLSFP) - - -# docbook gets .htm, asciidoc directly .html -%.htm: %.docbook - ${XSLTPROC} -o $@ ${XSL} $< - -%.html: %.text %.docbook - ${ASCIIDOC} -n -o $@ $< - -%.html: %.text - ${ASCIIDOC} -n -o $@ $< - -%.docbook: %.text - ${ASCIIDOC} -n -b docbook -o $@ $< - -%.texi: %.docbook - ${DOCBOOKTOTEXI} --to-stdout $< > $@ - -#%.mandocbook: %.text -# ${ASCIIDOC} -b docbook -d manpage -o $@ $< - -#%.man: %.mandocbook -# ${DOCBOOKTOMAN} --to-stdout $< > $@ - -#%.man: %.text -%.1: %.text - ${A2X} -f manpage $< - -%.pdf: %.text - ${A2X} -f pdf $< + $(INSTALL) -D -m 0755 -s $(CCOLLECT) $(destination) +documentation: + @echo "Generating HTML-documentation" + @asciidoc -n -o doc/ccollect.html doc/ccollect.text # # Developer targets # -pub: - git push +update: + @cg-update creme + +push-work: + @cg-push creme + @cg-push main publish-doc: documentation - @chmod a+r ${DOCS} ${DOC_ALL} - @tar cf ${docs_archive_name} ${DOCS} ${DOC_ALL} - @echo "Documentation files are in ${docs_archive_name}" + @chmod a+r doc/ccollect.html + @scp doc/ccollect.html doc/ccollect.text $(host):$(docdir) -# -# Distribution -# -clean: - rm -f ${DOC_ALL} - rm -f doc/man/*.[0-9] doc/man/*.xml doc/*.fo doc/man/*.fo - -distclean: clean - rm -f ${DOCBDOCS} - -# -# Be nice with the users and generate documentation for them -# -dist: distclean documentation - -/tmp/ccollect: - mkdir -p /tmp/ccollect - -shellcheck: ./ccollect - shellcheck -s sh -f gcc -x ./ccollect - -test-nico: $(CCOLLECT_SOURCE) /tmp/ccollect - cd ./conf/sources/; for s in *; do CCOLLECT_CONF=../ ../../ccollect daily "$$s"; done - touch /tmp/ccollect/$$(ls /tmp/ccollect | head -n1).ccollect-marker - CCOLLECT_CONF=./conf ./ccollect -a daily - touch /tmp/ccollect/$$(ls /tmp/ccollect | head -n1).ccollect-marker - CCOLLECT_CONF=./conf ./ccollect -a -p daily - -test-dir-source: - mkdir -p /tmp/ccollect/source - cp -R -f ./* /tmp/ccollect/source - -test-dir-destination: - mkdir -p /tmp/ccollect/backup - -test-dir-destination-chint: - mkdir -p /tmp/ccollect/backup-chint - -test-fixed-intervals: $(CCOLLECT_SOURCE) test-dir-source test-dir-destination test-dir-destination-chint - for s in ./test/conf/sources/*; do \ - CCOLLECT_CONF=./test/conf ./ccollect -l ${TEST_LOG_FILE} daily "$$(basename "$$s")"; \ - test "$$(ls -1 /tmp/ccollect/backup | wc -l)" -gt "0" || { cat ${TEST_LOG_FILE}; exit 1; }; \ - done - CCOLLECT_CONF=./test/conf ./ccollect -l ${TEST_LOG_FILE} -a -v daily - test "$$(ls -1 /tmp/ccollect/backup | wc -l)" -gt "0" || { cat ${TEST_LOG_FILE}; exit 1; } - CCOLLECT_CONF=./test/conf ./ccollect -l ${TEST_LOG_FILE} -a -p daily - test "$$(ls -1 /tmp/ccollect/backup | wc -l)" -gt "0" || { cat ${TEST_LOG_FILE}; exit 1; } - @printf "\nFixed intervals test ended successfully\n" - -test-interval-changing: $(CCOLLECT_SOURCE) test-dir-source test-dir-destination-chint - rm -rf /tmp/ccollect/backup-chint/* - test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "0" || { cat ${TEST_LOG_FILE}; exit 1; } - printf "3" > ./test/conf/sources/local-with-interval/intervals/daily - for x in 1 2 3 4 5; do CCOLLECT_CONF=./test/conf ./ccollect -l ${TEST_LOG_FILE} daily local-with-interval; done - test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "3" || { cat ${TEST_LOG_FILE}; exit 1; } - printf "5" > ./test/conf/sources/local-with-interval/intervals/daily - for x in 1 2 3 4 5 6 7; do CCOLLECT_CONF=./test/conf ./ccollect -l ${TEST_LOG_FILE} daily local-with-interval; done - test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "5" || { cat ${TEST_LOG_FILE}; exit 1; } - printf "4" > ./test/conf/sources/local-with-interval/intervals/daily - for x in 1 2 3 4 5 6; do CCOLLECT_CONF=./test/conf ./ccollect -l ${TEST_LOG_FILE} daily local-with-interval; done - test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "4" || { cat ${TEST_LOG_FILE}; exit 1; } - printf "3" > ./test/conf/sources/local-with-interval/intervals/daily - @printf "\nInterval changing test ended successfully\n" - -test: test-fixed-intervals test-interval-changing - test -f "${TEST_LOG_FILE}" - @printf "\nTests ended successfully\n" diff --git a/README b/README index 1b5341d..c0857d2 100644 --- a/README +++ b/README @@ -2,64 +2,22 @@ ccollect.sh, Nico Schottelius, 2005-12-06 -------------------------------------------------------------------------------- -ccollect backups (local or remote) data to local or remote destinations. +ccollect backups data from local or remote hosts to your local harddisk. -You can retrieve the latest version of ccollect at [0]. -ccollect was inspired by rsnapshot [1], which has some problems: - - configuration parameters have to be TAB seperated - - you can not specify per source exclude lists - - no per source pre/post execution support - - no parallel execution - - does unecessary moving of backup directories - - I didn't like the configuration at all, so I used the cconfig style [2]. - -Please use tools/report_success.sh to report success, if you are successfully -using ccollect. - -Have a look at doc/HACKING, if you plan to change ccollect. - -A small try to visualize the differences in a table: - -+---------------+-------------------------------------------------------------+ -| What? | rsnapshot | ccollect | -+---------------+-------------------------------------------------------------+ -| Configuration | tab separated, needs | plain cconfig-style | -| | parsing | | -+---------------+-------------------------------------------------------------+ -| Per source | | | -| post-/pre- | no | yes | -| execution | | | -+---------------+-------------------------------------------------------------+ -| Per source | | | -| exclude lists | no | yes | -+---------------+-------------------------------------------------------------+ -| Parallel | | | -| execution | | | -| of multiple | no | yes | -| backups | | | -+---------------+-------------------------------------------------------------+ -| Programming | perl | sh | -| language | | (posix compatible) | -+---------------+-------------------------------------------------------------+ -| Lines of code | 6772 (5353 w/o comments, | 546 (375 w/o comments, | -| (2006-10-25) | 4794 w/o empty lines) | 288 w/o empty lines) | -+---------------+-------------------------------------------------------------+ -| Lines of code | 7269 (6778 w/o comments, | 587 (397 w/o comments, | -| (2009-07-23) | 6139 w/o empty lines) | 315 w/o empty lines) | -+---------------+-------------------------------------------------------------+ -| Age | Available since 2002/2003 | Written at 2005-11-14 | -+---------------+-------------------------------------------------------------+ - -Included documentation: +You can retriev the latest version of ccollect at [0]. doc/ccollect.text Manual in text format -doc/ccollect.html Manual in xhtml (generated) +doc/ccollect.html Manual in xhtml -doc/man/ccollect.text Manpage in text format -doc/man/ccollect.man Manpage in manpage format (generated) +ccollect was inspired by rsnapshot [1], which had some problems: + - configuration parameters had to be TAB seperated + - you could not specify exclude lists differently for every source + - no per source pre/post execution support + - no parallel execution + - I didn't like the configuration at all, so I used the cconfig style [2]. --------------------------------------------------------------------------------- -[0]: ccollect: http://www.nico.schottelius.org/software/ccollect/ + +[0]: ccollect: http://linux.schottelius.org/ccollect/ [1]: rsnapshot: http://www.rsnapshot.org/ [2]: cconfig: http://nico.schotteli.us/papers/linux/cconfig/ diff --git a/TODO b/TODO deleted file mode 100644 index ce63297..0000000 --- a/TODO +++ /dev/null @@ -1,26 +0,0 @@ -Hinweis: - Zwei Quellen auf ein Ziel funktioniert nicht, da die beiden - Quellen von den unterschiedlichen Verzeichnissen linken. - -Listing: - .../* funktioniert nicht teilweise (abhängig von der Shell?) - -Isup-check: optional! - -line 318/check no_xxx => correct test? - -REMOVE ALL PCMD code - -Backup to remote can be done via ssh tunnel! - - -% remote host: Allow backup host to access our sshd - ssh -R4242:localhost:22 backupserver "ccollect interval backupremotehost" - - remove $destination (==ddir) - --------------------------------------------------------------------------------- - -Remote backups: - -ccollect_backup_to $host $remote_port $source $interval diff --git a/ccollect b/ccollect deleted file mode 100755 index 2deaa2d..0000000 --- a/ccollect +++ /dev/null @@ -1,929 +0,0 @@ -#!/bin/sh -# -# 2005-2013 Nico Schottelius (nico-ccollect at schottelius.org) -# 2016-2019 Darko Poljak (darko.poljak at gmail.com) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Initially written for SyGroup (www.sygroup.ch) -# Date: Mon Nov 14 11:45:11 CET 2005 - -# Error upon expanding unset variables: -set -u - -# -# Standard variables (stolen from cconf) -# -__mydir="${0%/*}" -__abs_mydir="$(cd "$__mydir" && pwd -P)" -__myname=${0##*/} - -# -# where to find our configuration and temporary file -# -CCOLLECT_CONF="${CCOLLECT_CONF:-/etc/ccollect}" -CSOURCES="${CCOLLECT_CONF}/sources" -CDEFAULTS="${CCOLLECT_CONF}/defaults" -CPREEXEC="${CDEFAULTS}/pre_exec" -CPOSTEXEC="${CDEFAULTS}/post_exec" -CMARKER=".ccollect-marker" - -TMP="$(mktemp "/tmp/${__myname}.XXXXXX")" -export TMP -CONTROL_PIPE="/tmp/${__myname}-control-pipe" - -VERSION="2.10" -RELEASE="2020-08-26" -HALF_VERSION="ccollect ${VERSION}" -FULL_VERSION="ccollect ${VERSION} (${RELEASE})" - -# -# CDATE: how we use it for naming of the archives -# DDATE: how the user should see it in our output (DISPLAY) -# -CDATE="date +%Y%m%d-%H%M" -DDATE="date +%Y-%m-%d-%H:%M:%S" -SDATE="date +%s" - -# -# LOCKING: use flock if available, otherwise mkdir -# Locking is done for each source so that only one instance per source -# can run. -# -# Use CCOLLECT_CONF directory for lock files. -# This directory can be set arbitrary so it is writable for user -# executing ccollect. -LOCKDIR="${CCOLLECT_CONF}" -# printf pattern: ccollect_.lock -LOCKFILE_PATTERN="ccollect_%s.lock" -LOCKFD=4 - -# -# locking functions using flock -# -lock_flock() -{ - # $1 = source to backup - # shellcheck disable=SC2059 - lockfile="${LOCKDIR}/$(printf "${LOCKFILE_PATTERN}" "$1")" - eval "exec ${LOCKFD}> '${lockfile}'" - - flock -n ${LOCKFD} && return 0 || return 1 -} - -unlock_flock() -{ - # $1 = source to backup - # shellcheck disable=SC2059 - lockfile="${LOCKDIR}/$(printf "${LOCKFILE_PATTERN}" "$1")" - eval "exec ${LOCKFD}>&-" - rm -f "${lockfile}" -} - -# -# locking functions using mkdir (mkdir is atomic) -# -lock_mkdir() -{ - # $1 = source to backup - # shellcheck disable=SC2059 - lockfile="${LOCKDIR}/$(printf "${LOCKFILE_PATTERN}" "$1")" - - mkdir "${lockfile}" && return 0 || return 1 -} - -unlock_mkdir() -{ - # $1 = source to backup - # shellcheck disable=SC2059 - lockfile="${LOCKDIR}/$(printf "${LOCKFILE_PATTERN}" "$1")" - - rmdir "${lockfile}" -} - -# -# determine locking tool: flock or mkdir -# -if command -v flock > /dev/null 2>&1 -then - lockf="lock_flock" - unlockf="unlock_flock" -else - lockf="lock_mkdir" - unlockf="unlock_mkdir" -fi - -# -# unset values -# -PARALLEL="" -MAX_JOBS="" -USE_ALL="" -LOGFILE="" -SYSLOG="" -# e - only errors, a - all output -LOGLEVEL="a" -LOGONLYERRORS="" - -# -# catch signals -# -TRAPFUNC="rm -f \"${TMP}\"" -# shellcheck disable=SC2064 -trap "${TRAPFUNC}" 1 2 15 - -# -# Functions -# - -# check if we are running interactive or non-interactive -# see: http://www.tldp.org/LDP/abs/html/intandnonint.html -_is_interactive() -{ - [ -t 0 ] || [ -p /dev/stdin ] -} - -# -# ssh-"feature": we cannot do '... read ...; ssh ...; < file', -# because ssh reads stdin! -n does not work -> does not ask for password -# Also allow deletion for files without the given suffix -# -delete_from_file() -{ - file="$1"; shift - suffix="" # It will be set, if deleting incomplete backups. - [ $# -eq 1 ] && suffix="$1" && shift - # dirs for deletion will be moved to this trash dir inside destination dir - # - for fast mv operation - trash="$(mktemp -d ".trash.XXXXXX")" - while read -r to_remove; do - mv "${to_remove}" "${trash}" || - _exit_err "Moving ${to_remove} to ${trash} failed." - set -- "$@" "${to_remove}" - if [ "${suffix}" ]; then - to_remove_no_suffix="$(echo "${to_remove}" | sed "s/$suffix\$//")" - mv "${to_remove_no_suffix}" "${trash}" || - _exit_err "Moving ${to_remove_no_suffix} to ${trash} failed." - set -- "$@" "${to_remove_no_suffix}" - fi - done < "${file}" - _techo "Removing $* in ${trash}..." - empty_dir=".empty-dir" - mkdir "${empty_dir}" || _exit_err "Empty directory ${empty_dir} cannot be created." - [ "${VVERBOSE}" ] && echo "Starting: rsync -a --delete ${empty_dir} ${trash}" - # rsync needs ending slash for directory content - rsync -a --delete "${empty_dir}/" "${trash}/" || _exit_err "Removing $* failed." - rmdir "${trash}" || _exit_err "Removing ${trash} directory failed" - rmdir "${empty_dir}" || _exit_err "Removing ${empty_dir} directory failed" - _techo "Removing $* in ${trash} finished." -} - -display_version() -{ - echo "${FULL_VERSION}" - exit 0 -} - -usage() -{ - cat << eof -${__myname}: [args] - - ccollect creates (pseudo) incremental backups - - -h, --help: Show this help screen - -a, --all: Backup all sources specified in ${CSOURCES} - -e, --errors: Log only errors - -j [max], --jobs [max] Specifies the number of jobs to run simultaneously. - If max is not specified then parallelise all jobs. - -l FILE, --logfile FILE Log to specified file - -p, --parallel: Parallelise backup processes (deprecated from 2.0) - -s, --syslog: Log to syslog with tag ccollect - -v, --verbose: Be very verbose (uses set -x) - -V, --version: Print version information - - This is version ${VERSION} released on ${RELEASE}. - - Retrieve latest ccollect at http://www.nico.schottelius.org/software/ccollect/ -eof - exit 0 -} - -# locking functions -lock() -{ - "${lockf}" "$@" || _exit_err \ - "Only one instance of ${__myname} for source \"$1\" can run at one time." -} - -unlock() -{ - "${unlockf}" "$@" -} - -# time displaying echo -# stdout version -_techo_stdout() -{ - echo "$(${DDATE}): $*" -} - -# syslog version -_techo_syslog() -{ - logger -t ccollect "$@" -} - -# specified file version -_techo_file() -{ - _techo_stdout "$@" >> "${LOGFILE}" -} - -# determine _techo version before parsing options -if _is_interactive -then - _techof="_techo_stdout" -else - _techof="_techo_syslog" -fi - -# _techo with determined _techo version -_techo() -{ - if [ "${LOGLEVEL}" = "a" ] - then - # name is exported before calling this function - # shellcheck disable=SC2154 - set -- ${name:+"[${name}]"} "$@" - "${_techof}" "$@" - fi -} - -_techo_err() -{ - _techo "Error: $*" -} - -_exit_err() -{ - _techo_err "$@" - rm -f "${TMP}" - exit 1 -} - -# -# Parse options -# -while [ "$#" -ge 1 ]; do - case "$1" in - -a|--all) - USE_ALL=1 - ;; - -p|--parallel) - _techo "Warning: -p, --parallel option is deprecated," \ - "use -j, --jobs instead." - PARALLEL=1 - MAX_JOBS="" - ;; - -j|--jobs) - PARALLEL=1 - if [ "$#" -ge 2 ] - then - case "$2" in - -*) - ;; - *) - MAX_JOBS=$2 - shift - ;; - esac - fi - ;; - -e|--errors) - LOGONLYERRORS="1" - ;; - -l|--logfile) - if [ "$#" -ge 2 ] - then - case "$2" in - -*) - _exit_err "Missing log file" - ;; - *) - LOGFILE="$2" - shift - ;; - esac - else - _exit_err "Missing log file" - fi - ;; - -s|--syslog) - SYSLOG="1" - ;; - -v|--verbose) - set -x - ;; - -V|--version) - display_version - ;; - --) - # ignore the -- itself - shift - break - ;; - -h|--help|-*) - usage - ;; - *) - break - ;; - esac - shift -done - -# determine _techo version and logging level after parsing options -if [ "${LOGFILE}" ] -then - _techof="_techo_file" - LOGLEVEL="a" -elif _is_interactive -then - if [ "${SYSLOG}" ] - then - _techof="_techo_syslog" - LOGLEVEL="a" - else - _techof="_techo_stdout" - LOGLEVEL="e" - fi -else - _techof="_techo_syslog" - LOGLEVEL="a" -fi - -if [ "${LOGFILE}" ] || [ "${SYSLOG}" ] -then - if [ "${LOGONLYERRORS}" ] - then - LOGLEVEL="e" - fi -fi - -# check that MAX_JOBS is natural number > 0 -# empty string means run all in parallel -if ! echo "${MAX_JOBS}" | grep -q -E '^[1-9][0-9]*$|^$' -then - _exit_err "Invalid max jobs value \"${MAX_JOBS}\"" -fi - -# -# Setup interval -# -if [ $# -ge 1 ]; then - export INTERVAL="$1" - shift -else - usage -fi - -# -# Check for configuraton directory -# -[ -d "${CCOLLECT_CONF}" ] || _exit_err "No configuration found in " \ - "\"${CCOLLECT_CONF}\" (is \$CCOLLECT_CONF properly set?)" - -# -# Create (portable!) source "array" -# -export no_sources=0 - -if [ "${USE_ALL}" = 1 ]; then - # - # Get sources from source configuration - # - ( cd "${CSOURCES}" && ls -1 > "${TMP}" ) || \ - _exit_err "Listing of sources failed. Aborting." - - while read -r tmp; do - eval export "source_${no_sources}=\"${tmp}\"" - no_sources=$((no_sources + 1)) - done < "${TMP}" -else - # - # Get sources from command line - # - while [ "$#" -ge 1 ]; do - eval "arg=\"\$1\"" - shift - - # arg is assigned in the eval above - # shellcheck disable=SC2154 - eval export "source_${no_sources}=\"${arg}\"" - no_sources="$((no_sources + 1))" - done -fi - -# -# Need at least ONE source to backup -# -if [ "${no_sources}" -lt 1 ]; then - usage -else - _techo "${HALF_VERSION}: Beginning backup using interval ${INTERVAL}" -fi - -# -# Look for pre-exec command (general) -# -if [ -x "${CPREEXEC}" ]; then - _techo "Executing ${CPREEXEC} ..." - "${CPREEXEC}"; ret=$? - _techo "Finished ${CPREEXEC} (return code: ${ret})." - - [ "${ret}" -eq 0 ] || _exit_err "${CPREEXEC} failed. Aborting" -fi - -################################################################################ -# -# Let's do the backup - here begins the real stuff -# - -# in PARALLEL mode: -# * create control pipe -# * determine number of jobs to start at once -if [ "${PARALLEL}" ]; then - mkfifo "${CONTROL_PIPE}" - # fd 5 is tied to control pipe - eval "exec 5<>'${CONTROL_PIPE}'" - TRAPFUNC="${TRAPFUNC}; rm -f \"${CONTROL_PIPE}\"" - # shellcheck disable=SC2064 - trap "${TRAPFUNC}" 0 1 2 15 - - # determine how much parallel jobs to prestart - if [ "${MAX_JOBS}" ] - then - if [ "${MAX_JOBS}" -le "${no_sources}" ] - then - prestart="${MAX_JOBS}" - else - prestart="${no_sources}" - fi - else - prestart=0 - fi -fi - -source_no=0 -while [ "${source_no}" -lt "${no_sources}" ]; do - # - # Get current source - # - eval export name=\"\$source_${source_no}\" - source_no=$((source_no + 1)) - - # - # Start ourself, if we want parallel execution - # - if [ "${PARALLEL}" ]; then - if [ ! "${MAX_JOBS}" ] - then - # run all in parallel - "$0" "${INTERVAL}" "${name}" & - continue - elif [ "${prestart}" -gt 0 ] - then - # run prestart child if pending - { "$0" "${INTERVAL}" "${name}"; printf '\n' >&5; } & - prestart=$((prestart - 1)) - continue - else - # each time a child finishes we get a line from the pipe - # and then launch another child - while read -r line - do - { "$0" "${INTERVAL}" "${name}"; printf '\n' >&5; } & - # get out of loop so we can contnue with main loop - # for next source - break - done <&5 - continue - fi - fi - -# -# Start subshell for easy log editing -# -( - backup="${CSOURCES}/${name}" - c_source="${backup}/source" - c_dest="${backup}/destination" - c_pre_exec="${backup}/pre_exec" - c_post_exec="${backup}/post_exec" - - # - # Stderr to stdout, so we can produce nice logs - # - exec 2>&1 - - # - # Record start of backup: internal and for the user - # - begin_s="$(${SDATE})" - _techo "Beginning to backup" - - # - # Standard configuration checks - # - if [ ! -e "${backup}" ]; then - _exit_err "Source \"${backup}\" does not exist." - fi - - # - # Configuration _must_ be a directory (cconfig style) - # - if [ ! -d "${backup}" ]; then - _exit_err "\"${backup}\" is not a cconfig-directory. Skipping." - fi - - # - # Acquire lock for source. If lock cannot be acquired, lock will exit - # with error message. - # - lock "${name}" - - # redefine trap to also unlock (rm lockfile) - TRAPFUNC="${TRAPFUNC}; unlock \"${name}\"" - # shellcheck disable=SC2064 - trap "${TRAPFUNC}" 1 2 15 - - # - # First execute pre_exec, which may generate destination or other parameters - # - if [ -x "${c_pre_exec}" ]; then - _techo "Executing ${c_pre_exec} ..." - "${c_pre_exec}"; ret="$?" - _techo "Finished ${c_pre_exec} (return code ${ret})." - - [ "${ret}" -eq 0 ] || _exit_err "${c_pre_exec} failed. Skipping." - fi - - # - # Read source configuration - # - for opt in verbose very_verbose summary exclude rsync_options \ - delete_incomplete rsync_failure_codes \ - mtime quiet_if_down ; do - if [ -f "${backup}/${opt}" ] || [ -f "${backup}/no_${opt}" ]; then - eval "c_$opt=\"${backup}/$opt\"" - else - eval "c_$opt=\"${CDEFAULTS}/$opt\"" - fi - done - - # - # Interval definition: First try source specific, fallback to default - # - c_interval="$(cat "${backup}/intervals/${INTERVAL}" 2>/dev/null)" - - if [ -z "${c_interval}" ]; then - c_interval="$(cat "${CDEFAULTS}/intervals/${INTERVAL}" 2>/dev/null)" - - if [ -z "${c_interval}" ]; then - _exit_err "No definition for interval \"${INTERVAL}\" found. Skipping." - fi - fi - - # - # Sort by ctime (default) or mtime (configuration option) - # - # variable is assigned using eval - # shellcheck disable=SC2154 - if [ -f "${c_mtime}" ] ; then - TSORT="t" - else - TSORT="tc" - fi - - # - # Source configuration checks - # - if [ ! -f "${c_source}" ]; then - _exit_err "Source description \"${c_source}\" is not a file. Skipping." - else - source=$(cat "${c_source}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Source ${c_source} is not readable. Skipping." - fi - fi - - # - # Destination is a path - # - if [ ! -f "${c_dest}" ]; then - _exit_err "Destination ${c_dest} is not a file. Skipping." - else - ddir="$(cat "${c_dest}")"; ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Destination ${c_dest} is not readable. Skipping." - fi - fi - - # - # Parameters: ccollect defaults, configuration options, user options - # - - # - # Rsync standard options (archive will be added after is-up-check) - # - set -- "$@" "--delete" "--numeric-ids" "--relative" \ - "--delete-excluded" "--sparse" - - # - # Exclude list - # - # variable is assigned using eval - # shellcheck disable=SC2154 - if [ -f "${c_exclude}" ]; then - set -- "$@" "--exclude-from=${c_exclude}" - fi - - # - # Output a summary - # - # variable is assigned using eval - # shellcheck disable=SC2154 - if [ -f "${c_summary}" ]; then - set -- "$@" "--stats" - fi - - # - # Verbosity for rsync, rm, and mkdir - # - VVERBOSE="" - # variable is assigned using eval - # shellcheck disable=SC2154 - if [ -f "${c_very_verbose}" ]; then - set -- "$@" "-vv" - VVERBOSE="-v" - elif [ -f "${c_verbose}" ]; then - set -- "$@" "-v" - fi - - # - # Extra options for rsync provided by the user - # - # variable is assigned using eval - # shellcheck disable=SC2154 - if [ -f "${c_rsync_options}" ]; then - while read -r line; do - # Trim line. - ln=$(echo "${line}" | awk '{$1=$1;print;}') - # Only if ln is non zero length string. - # - # If ln is empty then rsync '' DEST evaluates - # to transfer current directory to DEST which would - # with specific options destroy DEST content. - if [ -n "${ln}" ] - then - set -- "$@" "${ln}" - fi - done < "${c_rsync_options}" - fi - - # - # Check: source is up and accepting connections (before deleting old backups!) - # - if ! rsync "$@" "${source}" >/dev/null 2>"${TMP}" ; then - # variable is assigned using eval - # shellcheck disable=SC2154 - if [ ! -f "${c_quiet_if_down}" ]; then - cat "${TMP}" - fi - _exit_err "Source ${source} is not readable. Skipping." - fi - - # - # Add --archive for real backup (looks nice in front) - # - set -- "--archive" "$@" - - # - # Check: destination exists? - # - cd "${ddir}" || _exit_err "Cannot change to ${ddir}. Skipping." - - # - # Check incomplete backups (needs echo to remove newlines) - # - # shellcheck disable=SC2010 - ls -1 | grep "${CMARKER}\$" > "${TMP}"; ret=$? - - if [ "$ret" -eq 0 ]; then - _techo "Incomplete backups: $(cat "${TMP}")" - # variable is assigned using eval - # shellcheck disable=SC2154 - if [ -f "${c_delete_incomplete}" ]; then - delete_from_file "${TMP}" "${CMARKER}" & - fi - fi - - # - # Include current time in name, not the time when we began to remove above - # - destination_name="${INTERVAL}.$(${CDATE}).$$-${source_no}" - export destination_name - destination_dir="${ddir}/${destination_name}" - export destination_dir - - # - # Check: maximum number of backups is reached? - # - # shellcheck disable=SC2010 - count="$(ls -1 | grep -c "^${INTERVAL}\\.")" - - _techo "Existing backups: ${count} Total keeping backups: ${c_interval}" - - if [ "${count}" -ge "${c_interval}" ]; then - # Use oldest directory as new backup destination directory. - # It need not to be deleted, rsync will sync its content. - # shellcheck disable=SC2010 - oldest_bak=$(ls -${TSORT}1r | grep "^${INTERVAL}\\." | head -n 1 || \ - _exit_err "Listing oldest backup failed") - _techo "Using ${oldest_bak} for destination dir ${destination_dir}" - if mv "${oldest_bak}" "${destination_dir}"; then - # Touch dest dir so it is not sorted wrong in listings below. - ls_rm_exclude=$(basename "${destination_dir}") - - # We have something to remove only if count > interval. - remove="$((count - c_interval))" - else - _techo_err "Renaming oldest backup ${oldest_bak} to ${destination_dir} failed, removing it." - remove="$((count - c_interval + 1))" - ls_rm_exclude="" - fi - if [ "${remove}" -gt 0 ]; then - _techo "Removing ${remove} backup(s)..." - - if [ -z "${ls_rm_exclude}" ]; then - # shellcheck disable=SC2010 - ls -${TSORT}1r | grep "^${INTERVAL}\\." | head -n "${remove}" > "${TMP}" || \ - _exit_err "Listing old backups failed" - else - # shellcheck disable=SC2010 - ls -${TSORT}1r | grep -v "${ls_rm_exclude}" | grep "^${INTERVAL}\\." | head -n "${remove}" > "${TMP}" || \ - _exit_err "Listing old backups failed" - fi - - delete_from_file "${TMP}" & - fi - fi - - # - # Check for backup directory to clone from: Always clone from the latest one! - # Exclude destination_dir from listing, it can be touched reused and renamed - # oldest existing destination directory. - # - dest_dir_name=$(basename "${destination_dir}") - # shellcheck disable=SC2010 - last_dir="$(ls -${TSORT}p1 | grep '/$' | grep -v "${dest_dir_name}" | head -n 1)" || \ - _exit_err "Failed to list contents of ${ddir}." - - # - # Clone from old backup, if existing - # - if [ "${last_dir}" ]; then - set -- "$@" "--link-dest=${ddir}/${last_dir}" - _techo "Hard linking from ${last_dir}" - fi - - # - # Mark backup running and go back to original directory - # - touch "${destination_dir}${CMARKER}" - cd "${__abs_mydir}" || _exit_err "Cannot go back to ${__abs_mydir}." - - # - # the rsync part - # - _techo "Transferring files..." - rsync "$@" "${source}" "${destination_dir}"; ret=$? - _techo "Finished backup (rsync return code: $ret)." - - # - # export rsync return code, might be useful in post_exec - # - export rsync_return_code=$ret - - # - # Set modification time (mtime) to current time, if sorting by mtime is enabled - # - [ -f "$c_mtime" ] && touch "${destination_dir}" - - # - # Check if rsync exit code indicates failure. - # - fail="" - # variable is assigned using eval - # shellcheck disable=SC2154 - if [ -f "$c_rsync_failure_codes" ]; then - while read -r code ; do - if [ "$ret" = "$code" ]; then - fail=1 - fi - done <"${c_rsync_failure_codes}" - fi - - # - # Remove marking here unless rsync failed. - # - if [ -z "$fail" ]; then - rm "${destination_dir}${CMARKER}" || \ - _exit_err "Removing ${destination_dir}${CMARKER} failed." - if [ "${ret}" -ne 0 ]; then - _techo "Warning: rsync exited non-zero, the backup may be broken (see rsync errors)." - fi - else - _techo "Warning: rsync failed with return code $ret." - fi - - # - # Create symlink to newest backup - # - # shellcheck disable=SC2010 - latest_dir="$(ls -${TSORT}p1 "${ddir}" | grep '/$' | head -n 1)" || \ - _exit_err "Failed to list content of ${ddir}." - - ln -snf "${ddir}${latest_dir}" "${ddir}current" || \ - _exit_err "Failed to create 'current' symlink." - - # - # post_exec - # - if [ -x "${c_post_exec}" ]; then - _techo "Executing ${c_post_exec} ..." - "${c_post_exec}"; ret=$? - _techo "Finished ${c_post_exec}." - - if [ "${ret}" -ne 0 ]; then - _exit_err "${c_post_exec} failed." - fi - fi - - # - # Time calculation - # - end_s="$(${SDATE})" - full_seconds="$((end_s - begin_s))" - hours="$((full_seconds / 3600))" - minutes="$(((full_seconds % 3600) / 60))" - seconds="$((full_seconds % 60))" - - _techo "Backup lasted: ${hours}:${minutes}:${seconds} (h:m:s)" - - unlock "${name}" - - # wait for children (doing delete_from_file) if any still running - wait -) || exit -done - -# -# Be a good parent and wait for our children, if they are running wild parallel -# After all children are finished then remove control pipe. -# -if [ "${PARALLEL}" ]; then - _techo "Waiting for children to complete..." - wait - rm -f "${CONTROL_PIPE}" -fi - -# -# Look for post-exec command (general) -# -if [ -x "${CPOSTEXEC}" ]; then - _techo "Executing ${CPOSTEXEC} ..." - "${CPOSTEXEC}"; ret=$? - _techo "Finished ${CPOSTEXEC} (return code: ${ret})." - - if [ "${ret}" -ne 0 ]; then - _techo "${CPOSTEXEC} failed." - fi -fi - -rm -f "${TMP}" -_techo "Finished" diff --git a/ccollect.sh b/ccollect.sh new file mode 100755 index 0000000..d884594 --- /dev/null +++ b/ccollect.sh @@ -0,0 +1,413 @@ +#!/bin/sh +# Nico Schottelius +# written for SyGroup (www.sygroup.ch) +# Date: Mon Nov 14 11:45:11 CET 2005 +# Last Modified: (See ls -l or git) + +# +# where to find our configuration and temporary file +# +CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} +CSOURCES=$CCOLLECT_CONF/sources +CDEFAULTS=$CCOLLECT_CONF/defaults +CPREEXEC="$CDEFAULTS/pre_exec" +CPOSTEXEC="$CDEFAULTS/post_exec" + +TMP=$(mktemp /tmp/$(basename $0).XXXXXX) +VERSION=0.3.2 +RELEASE="2006-02-05" +HALF_VERSION="ccollect $VERSION" +FULL_VERSION="ccollect $VERSION ($RELEASE)" + +# +# unset parallel execution +# +PARALLEL="" + + +# +# catch signals +# +trap "rm -f \"$TMP\"" 1 2 15 + + +add_name() +{ + sed "s/^/\[$name\] /" +} + +# +# Tell how to use us +# +usage() +{ + echo "$(basename $0): [args] " + echo "" + echo " ccollect creates (pseudo) incremental backups" + echo "" + echo " -h, --help: Show this help screen" + echo " -p, --parallel: Parallelise backup processes" + echo " -a, --all: Backup all sources specified in $CSOURCES" + echo " -v, --verbose: Be very verbose (uses set -x)." + echo "" + echo " This is version $VERSION, released on ${RELEASE}" + echo " (the first version was written on 2005-12-05 by Nico Schottelius)." + echo "" + echo " Retrieve latest ccollect at http://linux.schottelius.org/ccollect/" + exit 0 +} + +# +# need at least intervall and one source or --all +# +if [ $# -lt 2 ]; then + usage +fi + +# +# check for configuraton directory +# +if [ ! -d "$CCOLLECT_CONF" ]; then + echo "No configuration found in \"$CCOLLECT_CONF\"" \ + " (set \$CCOLLECT_CONF corectly?)" + exit 1 +fi + +# +# Filter arguments +# +INTERVALL=$1; shift +i=1 +no_shares=0 + +while [ $i -le $# ]; do + eval arg=\$$i + + if [ "$NO_MORE_ARGS" = 1 ]; then + eval share_${no_shares}=\"$arg\" + no_shares=$(($no_shares+1)) + else + case $arg in + -a|--all) + ALL=1 + ;; + -v|--verbose) + VERBOSE=1 + ;; + -p|--parallel) + PARALLEL="1" + ;; + -h|--help) + usage + ;; + --) + NO_MORE_ARGS=1 + ;; + *) + eval share_${no_shares}=\"$arg\" + no_shares=$(($no_shares+1)) + ;; + esac + fi + + i=$(($i+1)) +done + +# +# be really really really verbose +# +if [ "$VERBOSE" = 1 ]; then + set -x +fi + +# +# Look, if we should take ALL sources +# +if [ "$ALL" = 1 ]; then + # reset everything specified before + no_shares=0 + + # + # get entries from sources + # + cwd=$(pwd) + cd "$CSOURCES"; + ls > "$TMP" + + while read tmp; do + eval share_${no_shares}=\"$tmp\" + no_shares=$(($no_shares+1)) + done < "$TMP" +fi + +# +# Need at least ONE source to backup +# +if [ "$no_shares" -lt 1 ]; then + usage +else + echo "==> $HALF_VERSION: Beginning backup using intervall $INTERVALL <==" +fi + +# +# check default configuration +# + +D_FILE_INTERVALL="$CDEFAULTS/intervalls/$INTERVALL" +D_INTERVALL=$(cat $D_FILE_INTERVALL 2>/dev/null) + +# +# Look for pre-exec command (general) +# +if [ -x "$CPREEXEC" ]; then + echo "Executing $CPREEXEC ..." + "$CPREEXEC" + echo "Finished ${CPREEXEC}." +fi + +# +# Let's do the backup +# +i=0 +while [ "$i" -lt "$no_shares" ]; do + + # + # Get current share + # + eval name=\$share_${i} + i=$(($i+1)) + + export name + + # + # start ourself, if we want parallel execution + # + if [ "$PARALLEL" ]; then + $0 "$INTERVALL" "$name" & + continue + fi + +# +# Start subshell for easy log editing +# +( + # + # Stderr to stdout, so we can produce nice logs + # + exec 2>&1 + + # + # Standard locations + # + backup="$CSOURCES/$name" + c_source="$backup/source" + c_dest="$backup/destination" + c_exclude="$backup/exclude" + c_verbose="$backup/verbose" + c_vverbose="$backup/very_verbose" + c_rsync_extra="$backup/rsync_options" + c_summary="$backup/summary" + + c_pre_exec="$backup/pre_exec" + c_post_exec="$backup/post_exec" + + begin=$(date) + begin_s=$(date +%s) + + echo "$begin Beginning to backup" + + # + # Standard configuration checks + # + if [ ! -e "$backup" ]; then + echo "Source does not exist." + exit 1 + fi + if [ ! -d "$backup" ]; then + echo "\"$name\" is not a cconfig-directory. Skipping." + exit 1 + fi + + # + # intervall definition: First try source specific, fallback to default + # + c_intervall="$(cat "$backup/intervalls/$INTERVALL" 2>/dev/null)" + + if [ -z "$c_intervall" ]; then + c_intervall=$D_INTERVALL + + if [ -z "$c_intervall" ]; then + echo "Default and source specific intervall missing. Skipping." + exit 1 + fi + fi + + # + # unset possible options + # + EXCLUDE="" + RSYNC_EXTRA="" + SUMMARY="" + VERBOSE="" + VVERBOSE="" + + # + # next configuration checks + # + if [ ! -f "$c_source" ]; then + echo "Source description $c_source is not a file. Skipping." + exit 1 + else + source=$(cat "$c_source") + if [ $? -ne 0 ]; then + echo "Skipping: Source $c_source is not readable" + exit 1 + fi + fi + + if [ ! -d "$c_dest" ]; then + echo "Destination $c_dest does not link to a directory. Skipping" + exit 1 + fi + + # + # pre_exec + # + if [ -x "$c_pre_exec" ]; then + echo "Executing $c_pre_exec ..." + $c_pre_exec + echo "Finished ${c_pre_exec}." + fi + + # exclude + if [ -f "$c_exclude" ]; then + EXCLUDE="--exclude-from=$c_exclude" + fi + + # extra options for rsync + if [ -f "$c_rsync_extra" ]; then + RSYNC_EXTRA="$(cat "$c_rsync_extra")" + fi + + # verbosity for rsync + if [ -f "$c_verbose" ]; then + VERBOSE="-v" + fi + + # Output a summary + if [ -f "$c_summary" ]; then + SUMMARY="--stats" + fi + + # MORE verbosity, includes standard verbosity + if [ -f "$c_vverbose" ]; then + VERBOSE="-v" + VVERBOSE="-v" + fi + + # + # check if maximum number of backups is reached, if so remove + # + + # the created directories are named $INTERVALL.$DA + count=$(ls -d "$c_dest/${INTERVALL}."?* 2>/dev/null | wc -l) + echo "Currently $count backup(s) exist, total keeping $c_intervall backup(s)." + + if [ "$count" -ge "$c_intervall" ]; then + substract=$(echo $c_intervall - 1 | bc) + remove=$(echo $count - $substract | bc) + echo "Removing $remove backup(s)..." + + ls -d "$c_dest/${INTERVALL}."?* | sort -n | head -n $remove > "$TMP" + while read to_remove; do + dir="$to_remove" + echo "Removing $dir ..." + rm $VVERBOSE -rf "$dir" + done < "$TMP" + fi + + # + # clone the old directory with hardlinks + # + + destination_date=$(date +%Y-%m-%d-%H:%M) + destination_dir="$c_dest/${INTERVALL}.${destination_date}.$$" + + last_dir=$(ls -d "$c_dest/${INTERVALL}."?* 2>/dev/null | sort -n | tail -n 1) + + # give some info + echo "Beginning to backup, this may take some time..." + + # only copy if a directory exists + if [ "$last_dir" ]; then + echo "Hard linking..." + cp -al $VVERBOSE "$last_dir" "$destination_dir" + else + echo "Creating $destination_dir" + mkdir $VVERBOSE "$destination_dir" + fi + + if [ $? -ne 0 ]; then + echo "Creating/cloning backup directory failed. Skipping backup." + exit 1 + fi + + # + # the rsync part + # options partly stolen from rsnapshot + # + + echo "Transferring files..." + + rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE $SUMMARY \ + --delete --numeric-ids --relative --delete-excluded \ + "$source" "$destination_dir" + + if [ "$?" -ne 0 ]; then + echo "rsync reported an error. The backup may be broken (see rsync errors)" + exit 1 + fi + + echo "$(date) Successfully finished backup" + + # + # post_exec + # + if [ -x "$c_post_exec" ]; then + echo "$(date) Executing $c_post_exec ..." + "$c_post_exec" + echo "$(date) Finished ${c_post_exec}." + fi + + end_s=$(date +%s) + + full_seconds=$(echo "$end_s - $begin_s" | bc -l) + hours=$(echo $full_seconds / 3600 | bc) + seconds=$(echo "$full_seconds - ($hours * 3600)" | bc) + minutes=$(echo $seconds / 60 | bc) + seconds=$(echo "$seconds - ($minutes * 60)" | bc) + + echo "Backup lasted: ${hours}:$minutes:$seconds (h:m:s)" + +) | add_name +done + +# +# Be a good parent and wait for our children, if they are running wild parallel +# +if [ "$PARALLEL" ]; then + echo "Waiting for child jobs to complete..." + wait +fi + +# +# Look for post-exec command (general) +# +if [ -x "$CPOSTEXEC" ]; then + echo "Executing $CPOSTEXEC ..." + "$CPOSTEXEC" + echo "Finished ${CPOSTEXEC}." +fi + +rm -f "$TMP" +echo "==> Finished $WE <==" diff --git a/conf/README b/conf/README deleted file mode 100644 index 8402c76..0000000 --- a/conf/README +++ /dev/null @@ -1,3 +0,0 @@ -This is my personal test configuration. -It can perhaps be some example for you, although it may be pretty -unsorted and highly chaotic. diff --git a/conf/defaults/intervals/daily b/conf/defaults/intervalls/daily similarity index 100% rename from conf/defaults/intervals/daily rename to conf/defaults/intervalls/daily diff --git a/conf/defaults/intervals/monthly b/conf/defaults/intervalls/monthly similarity index 100% rename from conf/defaults/intervals/monthly rename to conf/defaults/intervalls/monthly diff --git a/conf/defaults/intervals/weekly b/conf/defaults/intervalls/weekly similarity index 100% rename from conf/defaults/intervals/weekly rename to conf/defaults/intervalls/weekly diff --git a/conf/defaults/intervals/normal b/conf/defaults/intervals/normal deleted file mode 100644 index 7273c0f..0000000 --- a/conf/defaults/intervals/normal +++ /dev/null @@ -1 +0,0 @@ -25 diff --git a/conf/defaults/post_exec b/conf/defaults/post_exec index 2965574..2192fec 100755 --- a/conf/defaults/post_exec +++ b/conf/defaults/post_exec @@ -1,5 +1,5 @@ #!/bin/cat ###################################################################### -If you see this content, post_exec was executed. (general post_exec) +If you see this content, post_exec was executed. ###################################################################### diff --git a/conf/defaults/pre_exec b/conf/defaults/pre_exec index 09084a6..eb983c8 100755 --- a/conf/defaults/pre_exec +++ b/conf/defaults/pre_exec @@ -1,4 +1,3 @@ #!/bin/cat If you see this content, pre_exec was executed. -(general pre_exec, not source dependent) diff --git a/conf/defaults/sources/exclude b/conf/defaults/sources/exclude deleted file mode 100644 index ee4c926..0000000 --- a/conf/defaults/sources/exclude +++ /dev/null @@ -1 +0,0 @@ -/test diff --git a/conf/defaults/sources/source_postfix b/conf/defaults/sources/source_postfix deleted file mode 100644 index 0b5cde7..0000000 --- a/conf/defaults/sources/source_postfix +++ /dev/null @@ -1 +0,0 @@ -:/ diff --git a/conf/defaults/sources/source_prefix b/conf/defaults/sources/source_prefix deleted file mode 100644 index fc37f9d..0000000 --- a/conf/defaults/sources/source_prefix +++ /dev/null @@ -1 +0,0 @@ -root@ diff --git a/conf/defaults/verbose b/conf/defaults/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/bla blu/destination b/conf/sources/bla blu/destination new file mode 120000 index 0000000..b12e153 --- /dev/null +++ b/conf/sources/bla blu/destination @@ -0,0 +1 @@ +/home/nico/backupdir \ No newline at end of file diff --git a/conf/sources/bla blu/source b/conf/sources/bla blu/source new file mode 100644 index 0000000..597ddca --- /dev/null +++ b/conf/sources/bla blu/source @@ -0,0 +1 @@ +/home/nico/vpn diff --git a/conf/defaults/sources/verbose b/conf/sources/bla blu/verbose similarity index 100% rename from conf/defaults/sources/verbose rename to conf/sources/bla blu/verbose diff --git a/conf/sources/delete_incomplete/delete_incomplete b/conf/sources/delete_incomplete/delete_incomplete deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/delete_incomplete/destination b/conf/sources/delete_incomplete/destination deleted file mode 100644 index 8cac69d..0000000 --- a/conf/sources/delete_incomplete/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect diff --git a/conf/sources/delete_incomplete/exclude b/conf/sources/delete_incomplete/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/conf/sources/delete_incomplete/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/conf/sources/delete_incomplete/source b/conf/sources/delete_incomplete/source deleted file mode 100644 index e64611b..0000000 --- a/conf/sources/delete_incomplete/source +++ /dev/null @@ -1 +0,0 @@ -/home/users/nico/bin diff --git a/conf/defaults/sources/rsync_options b/conf/sources/fehler old mode 100644 new mode 100755 similarity index 100% rename from conf/defaults/sources/rsync_options rename to conf/sources/fehler diff --git a/conf/sources/from-remote/README b/conf/sources/from-remote/README deleted file mode 100644 index c778cfe..0000000 --- a/conf/sources/from-remote/README +++ /dev/null @@ -1 +0,0 @@ -This is based on a production example I use for my notebook. diff --git a/conf/sources/from-remote/destination b/conf/sources/from-remote/destination deleted file mode 100644 index 8cac69d..0000000 --- a/conf/sources/from-remote/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect diff --git a/conf/sources/from-remote/exclude b/conf/sources/from-remote/exclude deleted file mode 100644 index f5b5b7c..0000000 --- a/conf/sources/from-remote/exclude +++ /dev/null @@ -1 +0,0 @@ -/home/server/raid diff --git a/conf/sources/from-remote/source b/conf/sources/from-remote/source deleted file mode 100644 index 540dd91..0000000 --- a/conf/sources/from-remote/source +++ /dev/null @@ -1 +0,0 @@ -localhost:/home/users/nico/bin diff --git a/conf/sources/from-remote/summary b/conf/sources/from-remote/summary deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/from-remote/verbose b/conf/sources/from-remote/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/local-with&ersand/destination b/conf/sources/local-with&ersand/destination deleted file mode 100644 index 8cac69d..0000000 --- a/conf/sources/local-with&ersand/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect diff --git a/conf/sources/local-with&ersand/exclude b/conf/sources/local-with&ersand/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/conf/sources/local-with&ersand/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/conf/sources/local-with&ersand/source b/conf/sources/local-with&ersand/source deleted file mode 100644 index e64611b..0000000 --- a/conf/sources/local-with&ersand/source +++ /dev/null @@ -1 +0,0 @@ -/home/users/nico/bin diff --git a/conf/sources/local/destination b/conf/sources/local/destination deleted file mode 100644 index 8cac69d..0000000 --- a/conf/sources/local/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect diff --git a/conf/sources/local/exclude b/conf/sources/local/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/conf/sources/local/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/conf/sources/local/no_verbose b/conf/sources/local/no_verbose deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/local/source b/conf/sources/local/source deleted file mode 100644 index e64611b..0000000 --- a/conf/sources/local/source +++ /dev/null @@ -1 +0,0 @@ -/home/users/nico/bin diff --git a/conf/sources/source with spaces and interval/delete_incomplete b/conf/sources/source with spaces and interval/delete_incomplete deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/source with spaces and interval/destination b/conf/sources/source with spaces and interval/destination deleted file mode 100644 index 8cac69d..0000000 --- a/conf/sources/source with spaces and interval/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect diff --git a/conf/sources/source with spaces and interval/intervals/daily b/conf/sources/source with spaces and interval/intervals/daily deleted file mode 100644 index 64bb6b7..0000000 --- a/conf/sources/source with spaces and interval/intervals/daily +++ /dev/null @@ -1 +0,0 @@ -30 diff --git a/conf/sources/source with spaces and interval/source b/conf/sources/source with spaces and interval/source deleted file mode 100644 index e64611b..0000000 --- a/conf/sources/source with spaces and interval/source +++ /dev/null @@ -1 +0,0 @@ -/home/users/nico/bin diff --git a/conf/sources/source with spaces and interval/verbose b/conf/sources/source with spaces and interval/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/source-without-destination/exclude b/conf/sources/source-without-destination/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/conf/sources/source-without-destination/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/conf/sources/source-without-destination/source b/conf/sources/source-without-destination/source deleted file mode 100644 index e64611b..0000000 --- a/conf/sources/source-without-destination/source +++ /dev/null @@ -1 +0,0 @@ -/home/users/nico/bin diff --git a/conf/sources/source-without-intervall/exclude b/conf/sources/source-without-intervall/exclude new file mode 100644 index 0000000..5469661 --- /dev/null +++ b/conf/sources/source-without-intervall/exclude @@ -0,0 +1 @@ +manage diff --git a/conf/sources/source-without-intervall/source b/conf/sources/source-without-intervall/source new file mode 100644 index 0000000..a1849b9 --- /dev/null +++ b/conf/sources/source-without-intervall/source @@ -0,0 +1 @@ +nico@creme.schottelius.org:bin diff --git a/conf/sources/testsource1/destination b/conf/sources/testsource1/destination new file mode 120000 index 0000000..4d5c4a0 --- /dev/null +++ b/conf/sources/testsource1/destination @@ -0,0 +1 @@ +/home/nico/backupdir/testsource1 \ No newline at end of file diff --git a/conf/sources/source with spaces and interval/exclude b/conf/sources/testsource1/exclude similarity index 100% rename from conf/sources/source with spaces and interval/exclude rename to conf/sources/testsource1/exclude diff --git a/test/conf/defaults/intervals/weekly b/conf/sources/testsource1/intervalls/daily similarity index 100% rename from test/conf/defaults/intervals/weekly rename to conf/sources/testsource1/intervalls/daily diff --git a/conf/sources/testsource1/source b/conf/sources/testsource1/source new file mode 100644 index 0000000..f8ea6e1 --- /dev/null +++ b/conf/sources/testsource1/source @@ -0,0 +1 @@ +/home/nico/bilder diff --git a/conf/sources/testsource2/destination b/conf/sources/testsource2/destination new file mode 120000 index 0000000..b12e153 --- /dev/null +++ b/conf/sources/testsource2/destination @@ -0,0 +1 @@ +/home/nico/backupdir \ No newline at end of file diff --git a/conf/sources/testsource2/exclude b/conf/sources/testsource2/exclude new file mode 100644 index 0000000..bbdbdf1 --- /dev/null +++ b/conf/sources/testsource2/exclude @@ -0,0 +1,3 @@ +openvpn-2.0.1.tar.gz +nicht_reinnehmen +etwas mit leerzeichenli diff --git a/test/conf/defaults/intervals/daily b/conf/sources/testsource2/intervalls/daily similarity index 100% rename from test/conf/defaults/intervals/daily rename to conf/sources/testsource2/intervalls/daily diff --git a/conf/sources/testsource2/intervalls/yearly b/conf/sources/testsource2/intervalls/yearly new file mode 100644 index 0000000..209e3ef --- /dev/null +++ b/conf/sources/testsource2/intervalls/yearly @@ -0,0 +1 @@ +20 diff --git a/conf/sources/testsource2/source b/conf/sources/testsource2/source new file mode 100644 index 0000000..597ddca --- /dev/null +++ b/conf/sources/testsource2/source @@ -0,0 +1 @@ +/home/nico/vpn diff --git a/conf/sources/this_is_not_a_source b/conf/sources/this_is_not_a_source deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/very_verbose/README b/conf/sources/very_verbose/README deleted file mode 100644 index c778cfe..0000000 --- a/conf/sources/very_verbose/README +++ /dev/null @@ -1 +0,0 @@ -This is based on a production example I use for my notebook. diff --git a/conf/sources/very_verbose/destination b/conf/sources/very_verbose/destination deleted file mode 100644 index 8cac69d..0000000 --- a/conf/sources/very_verbose/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect diff --git a/conf/sources/very_verbose/exclude b/conf/sources/very_verbose/exclude deleted file mode 100644 index f5b5b7c..0000000 --- a/conf/sources/very_verbose/exclude +++ /dev/null @@ -1 +0,0 @@ -/home/server/raid diff --git a/conf/sources/very_verbose/source b/conf/sources/very_verbose/source deleted file mode 100644 index e64611b..0000000 --- a/conf/sources/very_verbose/source +++ /dev/null @@ -1 +0,0 @@ -/home/users/nico/bin diff --git a/conf/sources/very_verbose/summary b/conf/sources/very_verbose/summary deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/very_verbose/verbose b/conf/sources/very_verbose/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/very_verbose/very_verbose b/conf/sources/very_verbose/very_verbose deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/vpn/destination b/conf/sources/vpn/destination new file mode 120000 index 0000000..fdfab7b --- /dev/null +++ b/conf/sources/vpn/destination @@ -0,0 +1 @@ +/home/nico/backupdir/vpn \ No newline at end of file diff --git a/conf/sources/vpn/source b/conf/sources/vpn/source new file mode 100644 index 0000000..04b9f19 --- /dev/null +++ b/conf/sources/vpn/source @@ -0,0 +1 @@ +/home/nico/vpn/ diff --git a/conf/sources/with_exec/destination b/conf/sources/with_exec/destination deleted file mode 100644 index 8cac69d..0000000 --- a/conf/sources/with_exec/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect diff --git a/conf/sources/with_exec/destination b/conf/sources/with_exec/destination new file mode 120000 index 0000000..cad2309 --- /dev/null +++ b/conf/sources/with_exec/destination @@ -0,0 +1 @@ +/tmp \ No newline at end of file diff --git a/conf/sources/with_exec/source b/conf/sources/with_exec/source index e64611b..c76e288 100644 --- a/conf/sources/with_exec/source +++ b/conf/sources/with_exec/source @@ -1 +1 @@ -/home/users/nico/bin +/home/user/nico/oeffentlich/computer/projekte/ccollect-0.3/ diff --git a/contrib/README b/contrib/README deleted file mode 100644 index ab30b7a..0000000 --- a/contrib/README +++ /dev/null @@ -1,3 +0,0 @@ -This directory contains patches or programs contributed by others -which are either not yet integrated into ccollect or may be kept -seperated generally. diff --git a/contrib/ccollect.spec b/contrib/ccollect.spec deleted file mode 100644 index 8916b7e..0000000 --- a/contrib/ccollect.spec +++ /dev/null @@ -1,79 +0,0 @@ -Summary: (pseudo) incremental backup with different exclude lists using hardlinks and rsync -Name: ccollect -Version: 2.3 -Release: 0 -URL: http://www.nico.schottelius.org/software/ccollect -Source0: http://www.nico.schottelius.org/software/ccollect/%{name}-%{version}.tar.bz2 - -License: GPL-3 -Group: Applications/System -Vendor: Nico Schottelius -BuildRoot: %{_tmppath}/%{name}-%(id -un) -BuildArch: noarch -Requires: rsync - -%description -Ccollect backups data from local and remote hosts to your local harddisk. -Although ccollect creates full backups, it requires very less space on the backup medium, because ccollect uses hardlinks to create an initial copy of the last backup. -Only the inodes used by the hardlinks and the changed files need additional space. - -%prep -%setup -q - -%install -rm -rf $RPM_BUILD_ROOT - -#Installing main ccollect and /etc directory -%__install -d 755 %buildroot%_bindir -%__install -d 755 %buildroot%_sysconfdir/%name -%__install -m 755 ccollect %buildroot%_bindir/ - -#bin files from tools directory -for t in $(ls tools/ccollect_*) ; do - %__install -m 755 ${t} %buildroot%_bindir/ -done - -#Configuration examples and docs -%__install -d 755 %buildroot%_datadir/doc/%name-%version/examples - -%__install -m 644 README %buildroot%_datadir/doc/%name-%version -%__install -m 644 COPYING %buildroot%_datadir/doc/%name-%version -%__install -m 644 CREDITS %buildroot%_datadir/doc/%name-%version -%__install -m 644 conf/README %buildroot%_datadir/doc/%name-%version/examples -%__cp -pr conf/defaults %buildroot%_datadir/doc/%name-%version/examples/ -%__cp -pr conf/sources %buildroot%_datadir/doc/%name-%version/examples/ - -#Addition documentation and some config tools -%__install -d 755 %buildroot%_datadir/%name/tools -%__install -m 755 tools/called_from_remote_pre_exec %buildroot%_datadir/%name/tools -%__cp -pr tools/config-pre-* %buildroot%_datadir/%name/tools -%__install -m 755 tools/report_success %buildroot%_datadir/%name/tools - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%_bindir/ccollect* -%_datadir/doc/%name-%version -%_datadir/%name/tools -%docdir %_datadir/doc/%name-%version -%dir %_sysconfdir/%name - -%changelog -* Thu Aug 20 2009 Nico Schottelius 0.8 -- Introduce consistenst time sorting (John Lawless) -- Check for source connectivity before trying backup (John Lawless) -- Defensive programming patch (John Lawless) -- Some code cleanups (argument parsing, usage) (Nico Schottelius) -- Only consider directories as sources when using -a (Nico Schottelius) -- Fix general parsing problem with -a (Nico Schottelius) -- Fix potential bug when using remote_host, delete_incomplete and ssh (Nico Schottelius) -- Improve removal performance: minimised number of 'rm' calls (Nico Schottelius) -- Support sorting by mtime (John Lawless) -- Improve option handling (John Lawless) -- Add support for quiet operation for dead devices (quiet_if_down) (John Lawless) -- Add smart option parsing, including support for default values (John Lawless) -- Updated and cleaned up documentation (Nico Schottelius) -- Fixed bug "removal of current directory" in ccollect_delete_source.sh (Found by G????nter St????hr, fixed by Nico Schottelius) - diff --git a/contrib/ccollect_mgr/README b/contrib/ccollect_mgr/README deleted file mode 100644 index 63bba1a..0000000 --- a/contrib/ccollect_mgr/README +++ /dev/null @@ -1,47 +0,0 @@ -[Almost complete Copy of an e-mail from Patrick Drolet] - -Hello again, - - - -I have created a script to better manage the backups since my -upload/download ratio and my bandwidth is limited by my ISP, and my hard -disk space is also somewhat limited. The script is called -"ccollect_mgr.sh". - - - -Provides the following features - -1) Determine the interval (daily/weekly/monthly) - -a. Define when you want weekly and monthly backups. It takes care of -the rest - -2) Perform the backups using ccollect - -3) Copy the ccollect log output to the first backup of the set - -a. Keeping the detailed log of each backup is always handy! - -4) Build a periodic report and include the real amount of disk used - -a. Computes the real amount of disk used (eg: no double counting of -hard links) - -b. Shows the actual amount of data transferred - -5) Send an email if there has been errors or warnings - -6) Send a periodic email to show transfer size, real backup size, etc - -a. Weekly reports are nice.! - -[...] - -- rdu (real du), which computes the real amount of disk used (no -double/triple counting hard links), same code as in ccollect_mgr.sh. - -- S60ccollect_example, an example script to put in etc/init.d to -add ccollect_mgr to the crontab - diff --git a/contrib/ccollect_mgr/S60ccollect_example b/contrib/ccollect_mgr/S60ccollect_example deleted file mode 100644 index 08e839e..0000000 --- a/contrib/ccollect_mgr/S60ccollect_example +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# Standard Linux: put in /etc/init.d -# Busybox: put in /opt/etc/init.d - -# Add ccollect_mgr job to crontab -# Syntax reminder from crontab: -# minute 0-59 -# hour 0-23 -# day of month 1-31 -# month 1-12 (or names, see below) -# day of week 0-7 (0 or 7 is Sun, or use names) - -crontab -l | grep -v ccollect_mgr > /tmp/crontab.tmp - -# Backup every day at 1 am. -echo "00 01 * * * /usr/local/sbin/ccollect_mgr.sh -from nas@myemail.net -to me@myemail.net -server relay_or_smtp_server NAS > /usr/local/var/log/ccollect.cron &" >> /tmp/crontab.tmp - -crontab /tmp/crontab.tmp -rm /tmp/crontab.tmp - diff --git a/contrib/ccollect_mgr/ccollect_mgr.sh b/contrib/ccollect_mgr/ccollect_mgr.sh deleted file mode 100644 index fe69286..0000000 --- a/contrib/ccollect_mgr/ccollect_mgr.sh +++ /dev/null @@ -1,542 +0,0 @@ -#!/bin/sh -# -# ---------------------------------------------------------------------------- -# Last update: 2009-12-11 -# By : pdrolet (ccollect_mgr@drolet.name) -# ---------------------------------------------------------------------------- -# Job manager to the ccollect utilities -# (ccollect written by Nico Schottelius) -# -# Provides the following features -# 1) Determine the interval (daily/weekly/monthly) -# 2) Check the estimated file transfer size -# 3) Perform the backups using ccollect -# 4) Copy the ccollect log to the first backup of the set -# 5) Build a periodic report and include the real amount of disk used -# 6) Send an email if there has been errors or warnings -# 7) Send a periodic email to show transfer size, real backup size, etc -# ---------------------------------------------------------------------------- -# -# This script was written primarily to gain better visibility of backups in -# an environment where data transfer is limited and so is bandwidth -# (eg: going through an ISP). The primary target of this script were a -# DNS323 and a QNAP T209 (eg: Busybox devices and not standard Linux devices) -# but it should run on any POSIX compliant device. -# -# Note: This is one of my first script in over a decade... don't use this as a -# reference (but take a look at ccollect.sh... very well written!) -# ---------------------------------------------------------------------------- -# -# ------------------------------------------- -# TO MAKE THIS SCRIPT RUN ON A BUSYBOX DEVICE -# ------------------------------------------- -# - You may need to install Optware and the following packages: -# - findutils (to get a find utility which supports printf) -# - procps (to get a ps utility that is standard) -# - mini-sendmail (this is what I used to send emails... you could easily -# modify this to use sendmail, mutt, putmail, etc...). -# - On DNS323 only: Your Busybox is very limited. For details, see -# http://wiki.dns323.info/howto:ffp#shells. You need to redirect /bin/sh -# to the Busybox provided with ffp (Fun Plug). To do this, type: -# ln -fs /ffp/bin/sh /bin/sh -# -# -------------------------------------------------- -# TO MAKE THIS SCRIPT RUN ON A STANDARD LINUX DEVICE -# -------------------------------------------------- -# - You will need install mini_sendmail or rewrite the send_email routine. -# -# ---------------------------------------------------------------------------- - -# Send warning if the worst case data transfer will be larger than (in MB)... -warning_transfer_size=1024 -abort_transfer_size=5120 - -# Define paths and default file names -ADD_TO_PATH="/opt/bin:/opt/sbin:/usr/local/bin:/usr/local/sbin" -CCOLLECT="ccollect.sh" -CCOLLECT_CONF="/usr/local/etc/ccollect" - -PS="/opt/bin/ps" -FIND="/opt/bin/find" - -TEMP_LOG="${CCOLLECT_CONF}"/log.$$ -per_report="${CCOLLECT_CONF}/periodic_report.log" -tmp_report="/tmp/ccollect.$$" -tmp_mgr="/tmp/ccollect_mgr.$$" -tmp_email="/tmp/email.$$" - -backups_not_found="" - -# Sub routines... - -send_email() -{ - # Send a simple email using mini-sendmail. - - msg_body_file="$1" - shift - - # ------------------------------ - # Quit if we can't send an email - # ------------------------------ - if [ "${to}" == "" ] || [ "${mail_server}" == "" ]; then - echo "Missing mail server or destination email. No email sent with subject: $@" - exit 1 - fi - - echo from: "${from}" > "${tmp_email}" - echo subject: "$@" >> "${tmp_email}" - echo to: "${to}" >> "${tmp_email}" - echo cc: >> "${tmp_email}" - echo bcc: >> "${tmp_email}" - echo "" >> "${tmp_email}" - echo "" >> "${tmp_email}" - cat "${msg_body_file}" >> "${tmp_email}" - echo "" >> "${tmp_email}" - - echo "" - echo Sending email to ${to} to report the following: - echo ----------------------------------------------- - cat "${tmp_email}" - cat "${tmp_email}" | mini_sendmail -f"${from}" -s"${mail_server}" "${to}" - rm "${tmp_email}" -} - -remove_source() -{ - remove_no=$1 - eval echo Removing backup \"\$source_$1\" - - no_sources="$(( ${no_sources} - 1 ))" - while [ "${remove_no}" -lt "${no_sources}" ]; do - eval source_${remove_no}=\"\$source_$(( ${remove_no} + 1))\" - eval ddir_${remove_no}=\"\$ddir_$(( ${remove_no} + 1))\" - remove_no=$(( ${remove_no} + 1 )) - done -} - -compute_rdu() -{ - kdivider=1 - find_options="" - - while [ "$#" -ge 1 ]; do - case "$1" in - -m) - kdivider=1024 - ;; - -g) - kdivider=1048576 - ;; - *) - break - ;; - esac - shift - done - - if [ "$#" == 0 ]; then - rdu=0 - return 1 - fi - - # ------------------------------------------------------------------------------------------------------ - # Compute the real disk usage (eg: hard links do files outside the backup set don't count) - # ------------------------------------------------------------------------------------------------------ - # 1) Find selected files and list link count, inodes, file type and size - # 2) Sort (sorts on inodes since link count is constant per inode) - # 3) Merge duplicates using uniq - # (result is occurence count, link count, inode, file type and size) - # 4) Use awk to sum up the file size of each inodes when the occurence count - # and link count are the same. Use %k for size since awk's printf is 32 bits - # 5) Present the result with additional dividers based on command line parameters - # - - rdu=$(( ( `"${FIND}" "$@" -printf '%n %i %y %k \n' \ - | sort -n \ - | uniq -c \ - | awk '{ if (( $1 == $2 ) || ($4 == "d")) { sum += $5; } } END { printf "%u\n",(sum); }'` \ - + ${kdivider} - 1 ) / ${kdivider} )) -} - -check_running_backups() -{ - # Check if a backup is already ongoing. If so, skip and send email - # Don't use the ccollect marker as this is no indication if it is still running - - source_no=0 - while [ "${source_no}" -lt "${no_sources}" ]; do - eval backup=\"\$source_${source_no}\" - - PID=$$ - "${PS}" -e -o pid,ppid,args 2> /dev/null \ - | grep -v -e grep -e "${PID}.*ccollect.*${backup}" \ - | grep "ccollect.*${backup}" > "${tmp_mgr}" 2> /dev/null - running_proc=`cat "${tmp_mgr}" | wc -l` - - if [ ${running_proc} -gt 0 ]; then - # Remove backup from list - running_backups="${running_backups}${backup} " - - echo "Process already running:" - cat "${tmp_mgr}" - - remove_source ${source_no} - else - source_no=$(( ${source_no} + 1 )) - fi - rm "${tmp_mgr}" - done - - if [ "${running_backups}" != "" ]; then - echo "skipping ccollect backups already running: ${running_backups}" | tee "${tmp_report}" - send_email "${tmp_report}" "WARNING - skipping ccollect backups already running: ${running_backups}" - rm "${tmp_report}" - fi -} - -find_interval() -{ - # ---------------------------------------------------- - # Find interval for ccollect backup. - # optional parameters: - # - Day of the week to do weekly backups - # - Do monthly instead of weekly on the Nth week - # ---------------------------------------------------- - - weekly_backup="$1" - monthly_backup="$2" - - weekday=`date "+%w"` - if [ ${weekday} -eq ${weekly_backup} ]; then - dom=`date "+%e"` - weeknum=$(( ( ${dom} / 7 ) + 1 )) - if [ "${weeknum}" -eq "${monthly_backup}" ]; then - interval=monthly - else - interval=weekly - fi - else - interval=daily - fi -} - -precheck_transfer_size() -{ - # Check the estimated (worst case) transfer size and send email if larger than certain size - # Abort backup if total transfer is larger than maximum limit (ex: an error somewhere - # requires to do full backup and not incremental, which could blow the quota with ISP) - # - # Be nice and add error checking one day... - - source_no=0 - while [ "${source_no}" -lt "${no_sources}" ]; do - eval backup=\"\$source_${source_no}\" - eval ddir=\"\$ddir_${source_no}\" - - last_dir="$(ls -tcp1 "${ddir}" | grep '/$' | head -n 1)" - sdir="$(cat "${CCOLLECT_CONF}"/sources/"${backup}"/source)"; ret="$?" - if [ -f "${CCOLLECT_CONF}"/sources/"${backup}"/exclude ]; then - exclude="--exclude-from=${CCOLLECT_CONF}/sources/${backup}/exclude"; - else - exclude="" - fi - rsync_options="" - if [ -f "${CCOLLECT_CONF}"/sources/"${backup}"/rsync_options ]; then - while read line; do - rsync_options="${rsync_options} ${line}" - done < ${CCOLLECT_CONF}/sources/${backup}/rsync_options - fi - - rsync -n -a --delete --stats ${rsync_options} "${exclude}" "${sdir}" "${ddir}/${last_dir}" > "${tmp_report}" - - tx_rx=`cat "${tmp_report}" | grep "Total transferred file size" | \ - awk '{ { tx += $5 } } END { printf "%u",(((tx)+1024*1024-1)/1024/1024); }'` - total_xfer=$(( ${total_xfer} + ${tx_rx} )) - - source_no=$(( ${source_no} + 1 )) - done - - echo "Transfer estimation for${ccollect_backups}: ${total_xfer} MB" - - if [ ${total_xfer} -gt ${abort_transfer_size} ]; then - # -------------------------------------------------- - # Send an error if transfer is larger than max limit - # -------------------------------------------------- - # Useful to detect potential issues when there is transfer quota (ex: with ISP) - - echo "Data transfer larger than ${abort_transfer_size} MB is expected for${ccollect_backups}" >> "${tmp_report}" - echo "** BACKUP ABORTED **" >> "${tmp_report}" - - send_email "${tmp_report}" "ERROR: aborted ccollect for${ccollect_backups} -- Estimated Tx+Rx: ${total_xfer} MB" - rm "${tmp_report}" - exit 1 - elif [ ${total_xfer} -gt ${warning_transfer_size} ]; then - # -------------------------------------------------- - # Send a warning if transfer is expected to be large - # -------------------------------------------------- - # Useful to detect potential issues when there is transfer quota (ex: with ISP) - - echo "Data transfer larger than ${warning_transfer_size} MB is expected for${ccollect_backups}" > "${tmp_report}" - - send_email "${tmp_report}" "WARNING ccollect for${ccollect_backups} -- Estimated Tx+Rx: ${total_xfer} MB" - rm "${tmp_report}" - fi -} - -build_backup_dir_list() -{ - source_no=0 - while [ "${source_no}" -lt "${no_sources}" ]; do - eval backup=\"\$source_${source_no}\" - eval ddir=\"\$ddir_${source_no}\" - - backup_dir="`cat "${TEMP_LOG}" \ - | grep "\[${backup}\] .*: Creating.* ${ddir}" \ - | head -n 1 \ - | sed 's/[^\/]*\//\//; s/ \.\.\.//'`" - - if [ ! -d "${backup_dir}" ]; then - backups_not_found="${backups_not_found}\"${backup}\" " - echo -n "Backup directory for \"${backup}\" not found. " - remove_source "${source_no}" - else - eval export backup_dir_list_${source_no}="${backup_dir}" -# eval echo Backup Dir List: \"\$backup_dir_list_${source_no}\" - source_no=$(( ${source_no} + 1 )) - fi - done -} - -move_log() -{ - if [ "${no_sources}" -gt 0 ]; then - eval log_file=\"\$backup_dir_list_1\"/ccollect.log - mv "${TEMP_LOG}" "${log_file}" - echo New Log Location: "${log_file}" - else - echo "WARNING: none of the backup set have been created" - log_file="${TEMP_LOG}" - fi -} - -send_report() -{ - # Analyze log for periodic report and for error status report - cat "${log_file}" | ccollect_analyse_logs.sh iwe > "${tmp_report}" - - # ------------------------- - # Build the periodic report - # ------------------------- - # Compute the total number of MB sent and received for all the backup sets - tx_rx=`cat "${tmp_report}" | \ - grep 'sent [[:digit:]]* bytes received [0-9]* bytes' | \ - awk '{ { tx += $3 } { rx += $6} } END \ - { printf "%u",(((tx+rx)+(1024*1024)-1)/1024/1024); }'` - current_date=`date +'20%y/%m/%d %Hh%M -- '` - - # ------------------------------------------ - # Get the real disk usage for the backup set - # ------------------------------------------ - total_rdu=0 - source_no=0 - while [ "${source_no}" -lt "${no_sources}" ]; do - eval backup_dir=\"\$backup_dir_list_${source_no}\" - compute_rdu -m "${backup_dir}" - total_rdu=$(( ${total_rdu} + ${rdu} )) - source_no=$(( ${source_no} + 1 )) - done - - # --------------------------------------------------------- - # Get the disk usage for all backups of each backup sets... - # ** BE PATIENT!!! ** - # --------------------------------------------------------- - historical_rdu=0 - source_no=0 - while [ "${source_no}" -lt "${no_sources}" ]; do - eval backup_dir=\"\$ddir_${source_no}\" - compute_rdu -m "${backup_dir}" - historical_rdu=$(( ${historical_rdu} + ${rdu} )) - source_no=$(( ${source_no} + 1 )) - done - - historical_rdu=$(( (${historical_rdu}+1023) / 1024 )) - - if [ "${no_sources}" -gt 0 ]; then - ccollect_backups="" - else - ccollect_backups="(none performed) " - fi - - source_no=0 - while [ "${source_no}" -lt "${no_sources}" ]; do - eval backup=\"\$source_${source_no}\" - ccollect_backups="${ccollect_backups}\"${backup}\" " - source_no=$(( ${source_no} + 1 )) - done - - echo ${current_date} Tx+Rx: ${tx_rx} MB -- \ - Disk Usage: ${total_rdu} MB -- \ - Backup set \(${interval}\):${ccollect_backups} -- \ - Historical backups usage: ${historical_rdu} GB >> "${per_report}" - echo "Total Data Transfer: ${tx_rx} MB -- Total Disk Usage: ${total_rdu} MB -- Total Historical backups usage: ${historical_rdu} GB" - - # ---------------------------------------- - # Send a status email if there is an error - # ---------------------------------------- - ccollect_we=`cat "${log_file}" | ccollect_analyse_logs.sh we | wc -l` - if [ ${ccollect_we} -ge 1 ]; then - send_email "${tmp_report}" "ERROR ccollect for${ccollect_backups} -- Tx+Rx: ${tx_rx} MB" - fi - - # -------------------- - # Send periodic report - # -------------------- - if [ ${report_interval} == ${interval} ] || [ ${interval} == "monthly" ]; then - - # Make reporting atomic to handle concurrent ccollect_mgr instances - mv "${per_report}" "${per_report}".$$ - cat "${per_report}".$$ >> "${per_report}".history - - # Calculate total amount of bytes sent and received - tx_rx=`cat "${per_report}".$$ | \ - awk '{ { transfer += $5 } } END \ - { printf "%u",(transfer); }'` - - # Send email - send_email "${per_report}.$$" "${report_interval} ccollect status for${ccollect_backups} -- Tx+Rx: ${tx_rx} MB" - rm "${per_report}.$$" - fi - - rm "${tmp_report}" -} - -# ------------------------------------------------ -# Add to PATH in case we're launching from crontab -# ------------------------------------------------ - -PATH="${ADD_TO_PATH}:${PATH}" - -# -------------- -# Default Values -# -------------- - -# Set on which interval status emails are sent (daily, weekly, monthly) -report_interval=weekly - -# Set day of the week for weekly backups. Default is Monday -# 0=Sun, 1=Mon, 2=Tue, 3=Wed, 4=Thu, 5=Fri, 6=Sat -weekly_backup=1 - -# Set the monthly backup interval. Default is 4th Monday of every month -monthly_backup=4 - -# --------------------------------- -# Parse command line -# --------------------------------- - -show_help=0 -export no_sources=0 - -while [ "$#" -ge 1 ]; do - case "$1" in - -help) - show_help=1 - ;; - -from) - from="$2" - shift - ;; - -to) - to="$2" - shift - ;; - -server|mail_server) - mail_server="$2" - shift - ;; - -weekly) - weekly_backup="$2" - shift - ;; - -monthly) - monthly_backup="$2" - shift - ;; - -warning_size) - warning_transfer_size="$2" - shift - ;; - -abort_size) - abort_transfer_size="$2" - shift - ;; - -report) - report_interval="$2" - shift - ;; - -*) - ccollect_options="${ccollect_options}$1 " - ;; - daily|weekly|monthly) - ;; - *) - eval backup=\"\$1\" - ddir="$(cat "${CCOLLECT_CONF}"/sources/"${backup}"/destination)"; ret="$?" - if [ "${ret}" -ne 0 ]; then - echo "Destination ${CCOLLECT_CONF}/sources/${backup}/destination is not readable... Skipping." - else - ccollect_backups="${ccollect_backups} \"$1\"" - eval export source_${no_sources}=\"\$1\" - eval export ddir_${no_sources}="${ddir}" -# eval echo Adding source \"\$source_${no_sources}\" -- \"\$ddir_${no_sources}\" - no_sources="$(( ${no_sources} + 1 ))" - fi - ;; - esac - shift -done - -if [ "${no_sources}" -lt 1 ] || [ ${show_help} -eq 1 ]; then - echo "" - echo "$0: Syntax" - echo " -help This help" - echo " -from From email address (ex.: -from nas@home.com)" - echo " -to Send email to this address (ex.: -to me@home.com)" - echo " -server SMTP server used for sending emails" - echo " -weekly Define wich day of the week is the weekly backup" - echo " Default is ${weekly_backup}. Sunday = 0, Saturday = 6" - echo " -monthly Define on which week # is the monthly backup" - echo " Default is ${monthly_backup}. Value = 1 to 5" - echo " -report Frequency of report email (daily, weekly or monthly)" - echo " Default is ${report_interval}" - echo " -warning_size Send a warning email if the transfer size exceed this" - echo " Default is ${warning_transfer_size} MB" - echo " -abort_size Abort and send an error email if the transfer size exceed this" - echo " Default is ${abort_transfer_size} MB" - echo "" - echo " other parameters are transfered to ccollect" - echo "" - exit 0 -fi - -#echo Backup sets:"${ccollect_backups}" -check_running_backups - -if [ "${no_sources}" -lt 1 ]; then - echo "No backup sets are reachable" - exit 1 -fi - -find_interval ${weekly_backup} ${monthly_backup} -echo Interval: ${interval} - -precheck_transfer_size - -"${CCOLLECT}" ${ccollect_options} ${interval} ${ccollect_backups} | tee "${TEMP_LOG}" - -build_backup_dir_list -move_log - -send_report - diff --git a/contrib/ccollect_mgr/rdu b/contrib/ccollect_mgr/rdu deleted file mode 100644 index aa5ffe4..0000000 --- a/contrib/ccollect_mgr/rdu +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# -# ------------------------------------------------------------- -# Get the real disk usage for a group of selected files -# -# This script counts the size of the files and directories -# listed, but exclude files that have hard links referenced outside -# the list. -# -# The undelying objective of this script is to report the -# real amount of disk used for backup solutions that are heavily -# using hard links to save disk space on identical files (I use -# ccollect, but this likely works with rsnapshot) -# ------------------------------------------------------------- -# 20091002 - initial release - pdrolet (rdu@drolet.name) - -# -------------------- -# Parse options -# -------------------- -# Known problem: -# - Command line cannot get a directory with a space in it -# -kdivider=1 -find_options="" -while [ "$#" -ge 1 ]; do - case "$1" in - -m) - kdivider=1024 - ;; - -g) - kdivider=1048576 - ;; - -h|--help) - echo - echo $0: \ \[options below and any \"find\" options\] - echo \ \ -m: result in mega bytes \(rounded up\) - echo \ \ -g: result in giga bytes \(rounded up\) - echo \ \ -h: this help - echo - exit 0 - ;; - *) - find_options="${find_options} $1" - ;; - esac - shift -done - -# ------------------------------------------------------------------------------------------------------ -# Compute the size -# ------------------------------------------------------------------------------------------------------ -# 1) Find selected files and list link count, inodes, file type and size -# 2) Sort (sorts on inodes since link count is constant per inode) -# 3) Merge duplicates using uniq -# (result is occurence count, link count, inode, file type and size) -# 4) Use awk to sum up the file size of each inodes when the occurence count -# and link count are the same. Use %k for size since awk's printf is 32 bits -# 5) Present the result with additional dividers based on command line parameters -# -echo $((( `find ${find_options} -printf '%n %i %y %k \n' \ - | sort -n \ - | uniq -c \ - | awk '{ if (( $1 == $2 ) || ($4 == "d")) { sum += $5; } } END { printf "%u\n",(sum); }'` \ - + ${kdivider} -1 ) / ${kdivider} )) - diff --git a/contrib/exclude_lists/debian b/contrib/exclude_lists/debian deleted file mode 100644 index 5f43d88..0000000 --- a/contrib/exclude_lists/debian +++ /dev/null @@ -1 +0,0 @@ -/var/cache/apt/archives/* diff --git a/contrib/jbrendel-autobackup/backup.sh b/contrib/jbrendel-autobackup/backup.sh deleted file mode 100644 index ea21635..0000000 --- a/contrib/jbrendel-autobackup/backup.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -function mkbackup { - find /etc/ccollect/logwrapper/destination -type f -atime +2 -exec sudo rm {} \; - /home/jcb/bm.pl & -} - -mkdir -p /media/backupdisk -grep backupdisk /etc/mtab &> /dev/null - -if [ $? == 0 ] -then - mkbackup -else - mount /media/backupdisk - if [ $? == 0 ] - then - mkbackup - else - echo "Error mounting backup disk" - fi -fi diff --git a/contrib/jbrendel-autobackup/bm.pl b/contrib/jbrendel-autobackup/bm.pl deleted file mode 100644 index 3a3da84..0000000 --- a/contrib/jbrendel-autobackup/bm.pl +++ /dev/null @@ -1,242 +0,0 @@ -#!/usr/bin/perl - -############################### -# -# Jens-Christoph Brendel, 2009 -# licensed under GPL3 NO WARRANTY -# -############################### - -use Date::Calc qw(:all); -use strict; -use warnings; - -# -#!!!!!!!!!!!!!!!!! you need to customize these settings !!!!!!!!!!!!!!!!!!!! -# -my $backupdir = "/media/backupdisk"; -my $logwrapper = "/home/jcb/ccollect/tools/ccollect_logwrapper.sh"; - -#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -# +------------------------------------------------------------------------+ -# | | -# | V A R I A B L E S | -# | | -# +------------------------------------------------------------------------+ -# - -# get the current date -# -my ($sek, $min, $hour, $day, $month, $year) = localtime(); - -my $curr_year = $year + 1900; -my $curr_month = $month +1; -my ($curr_week,$cur_year) = Week_of_Year($curr_year,$curr_month,$day); - -# initialize some variables -# -my %most_recent_daily = ( - 'age' => 9999, - 'file' => '' -); - -my %most_recent_weekly = ( - 'age' => 9999, - 'file' => '' -); - -my %most_recent_monthly = ( - 'age' => 9999, - 'file' => '' -); - -# prepare the output formatting -# -#--------------------------------------------------------------------------- -my ($msg1, $msg2, $msg3, $msg4); - -format = - @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< - $msg1 - @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<< - $msg2, $msg3 - - @|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| - $msg4 -. - -my @months = (' ','January', 'February', 'March', 'April', - 'May', 'June', 'July', 'August', - 'September', 'October', 'November', - 'December'); - -# +------------------------------------------------------------------------+ -# | | -# | P r o c e d u r e s | -# | | -# +------------------------------------------------------------------------+ -# - -# PURPOSE: extract the date from the file name -# PARAMETER VALUE: file name -# RETURN VALUE: pointer of a hash containing year, month, day -# -sub decodeDate { - my $file = shift; - $file =~ /^(daily|weekly|monthly)\.(\d+)-.*/; - my %date = ( - 'y' => substr($2,0,4), - 'm' => substr($2,4,2), - 'd' => substr($2,6,2) - ); - return \%date; -} - -# PURPOSE: calculate the file age in days -# PARAMETER VALUE: name of a ccollect backup file -# RETURN VALUE: age in days -# -sub AgeInDays { - my $file = shift; - my $date=decodeDate($file); - my $ageindays = Delta_Days($$date{'y'}, $$date{'m'}, $$date{'d'}, $curr_year, $curr_month, $day); - return $ageindays; -} - -# PURPOSE: calculate the file age in number of weeks -# PARAMETER VALUE: name of a ccollect backup file -# RETURN VALUE: age in weeks -# -sub AgeInWeeks { - my($y,$m,$d); - - my $file = shift; - my $date = decodeDate($file); - my ($weeknr,$yr) = Week_of_Year($$date{'y'}, $$date{'m'}, $$date{'d'}); - my $ageinweeks = $curr_week - $weeknr; - return $ageinweeks; -} - -# PURPOSE: calculate the file age in number of months -# PARAMETER VALUE: name of a ccollect backup file -# RETURN VALUE: age in months -# -sub AgeInMonths { - my $ageinmonths; - my $ageinmonths; - my $file = shift; - my $date = decodeDate($file); - if ($curr_year == $$date{'y'}) { - $ageinmonths = $curr_month - $$date{'m'}; - } else { - $ageinmonths = $curr_month + (12-$$date{'m'}) + ($curr_year-$$date{'y'}-1)*12; - } - return $ageinmonths; -} - -# +------------------------------------------------------------------------+ -# | | -# | M A I N | -# | | -# +------------------------------------------------------------------------+ -# - -# -# find the most recent daily, weekly and monthly backup file -# - -opendir(DIRH, $backupdir) or die "Can't open $backupdir \n"; - -my @files = readdir(DIRH); - -die "Zielverzeichnis leer \n" if ( $#files <= 1 ); - -foreach my $file (@files) { - - next if $file eq "." or $file eq ".."; - - SWITCH: { - if ($file =~ /^daily/) { - my $curr_age=AgeInDays($file); - if ($curr_age<$most_recent_daily{'age'}) { - $most_recent_daily{'age'} =$curr_age; - $most_recent_daily{'file'}= $file; - } - last SWITCH; - } - - if ($file =~ /^weekly/) { - my $curr_week_age = AgeInWeeks($file); - if ($curr_week_age<$most_recent_weekly{'age'}) { - $most_recent_weekly{'age'} =$curr_week_age; - $most_recent_weekly{'file'}=$file; - } - last SWITCH; - } - - if ($file =~ /^monthly/) { - my $curr_month_age=AgeInMonths($file); - if ($curr_month_age < $most_recent_monthly{'age'}) { - $most_recent_monthly{'age'} =$curr_month_age; - $most_recent_monthly{'file'}=$file; - } - last SWITCH; - } - print "\n\n unknown file $file \n\n"; - } -} - -printf("\nBackup Manager started: %02u.%02u. %u, week %02u\n\n", $day, $curr_month, $curr_year, $curr_week); - -# -# compare the most recent daily, weekly and monthly backup file -# and decide if it's necessary to start a new backup process in -# each category -# - -if ($most_recent_monthly{'age'} == 0) { - $msg1="The most recent monthly backup"; - $msg2="$most_recent_monthly{'file'} from $months[$curr_month - $most_recent_monthly{'age'}]"; - $msg3="is still valid."; - $msg4=""; - write; -} else { - $msg1="The most recent monthly backup"; - $msg2="$most_recent_monthly{'file'} from $months[$curr_month - $most_recent_monthly{'age'}]"; - $msg3="is out-dated."; - $msg4="Starting new monthly backup."; - write; - exec "sudo $logwrapper monthly FULL"; - exit; -} - -if ($most_recent_weekly{'age'} == 0) { - $msg1="The most recent weekly backup"; - $msg2="$most_recent_weekly{'file'} from week nr: $curr_week-$most_recent_weekly{'age'}"; - $msg3="is still valid."; - $msg4=""; - write; -} else { - $msg1="The most recent weekly backup"; - $msg2="$most_recent_weekly{'file'} from week nr: $curr_week-$most_recent_weekly{'age'}"; - $msg3="is out-dated."; - $msg4="Starting new weekly backup."; - write; - exec "sudo $logwrapper weekly FULL"; - exit; -} - -if ($most_recent_daily{'age'} == 0 ) { - $msg1=" The most recent daily backup"; - $msg2="$most_recent_daily{'file'}"; - $msg3="is still valid."; - $msg4=""; - write; -} else { - $msg1="The most recent daily backup"; - $msg2="$most_recent_daily{'file'}"; - $msg3="is out-dated."; - $msg4="Starting new daily backup."; - write; - exec "sudo $logwrapper daily FULL"; diff --git a/contrib/jbrendel-autobackup/correction_1 b/contrib/jbrendel-autobackup/correction_1 deleted file mode 100644 index 4fec440..0000000 --- a/contrib/jbrendel-autobackup/correction_1 +++ /dev/null @@ -1,3 +0,0 @@ -- Zeile 126/127 (my $ageinmonths;) ist doppelt, einmal streichen. -- in die allerletzte Zeile gehört eine schließende geschweifte Klammer -"}", die irgendwo verlorengegangen ist. diff --git a/contrib/jlawless-2009-06-03/README_g-i.txt b/contrib/jlawless-2009-06-03/README_g-i.txt deleted file mode 100644 index b782d63..0000000 --- a/contrib/jlawless-2009-06-03/README_g-i.txt +++ /dev/null @@ -1,15 +0,0 @@ -Hello Nico, - - I have attached three more patches for ccollect. Each patch -has comments explaining its motivation. - - All of these patches work-for-me (but I continue to test -them). I would be interested in your opinion on, for example, the -general approach used in i.patch which changes the way options are -handled. I think it is a big improvement. If, however, you wanted -the code to go in a different direction, let me know before we -diverge too far. - -Regards, - -John diff --git a/contrib/jlawless-2009-06-03/ccollect-f.sh b/contrib/jlawless-2009-06-03/ccollect-f.sh deleted file mode 100755 index 5c8952e..0000000 --- a/contrib/jlawless-2009-06-03/ccollect-f.sh +++ /dev/null @@ -1,683 +0,0 @@ -#!/bin/sh -# -# 2005-2009 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Initially written for SyGroup (www.sygroup.ch) -# Date: Mon Nov 14 11:45:11 CET 2005 - -# -# Standard variables (stolen from cconf) -# -__pwd="$(pwd -P)" -__mydir="${0%/*}"; __abs_mydir="$(cd "$__mydir" && pwd -P)" -__myname=${0##*/}; __abs_myname="$__abs_mydir/$__myname" - -# -# where to find our configuration and temporary file -# -CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} -CSOURCES=${CCOLLECT_CONF}/sources -CDEFAULTS=${CCOLLECT_CONF}/defaults -CPREEXEC="${CDEFAULTS}/pre_exec" -CPOSTEXEC="${CDEFAULTS}/post_exec" - -TMP=$(mktemp "/tmp/${__myname}.XXXXXX") -VERSION=0.7.1 -RELEASE="2009-02-02" -HALF_VERSION="ccollect ${VERSION}" -FULL_VERSION="ccollect ${VERSION} (${RELEASE})" - -#TSORT="tc" ; NEWER="cnewer" -TSORT="t" ; NEWER="newer" - -# -# CDATE: how we use it for naming of the archives -# DDATE: how the user should see it in our output (DISPLAY) -# -CDATE="date +%Y%m%d-%H%M" -DDATE="date +%Y-%m-%d-%H:%M:%S" - -# -# unset parallel execution -# -PARALLEL="" - -# -# catch signals -# -trap "rm -f \"${TMP}\"" 1 2 15 - -# -# Functions -# - -# time displaying echo -_techo() -{ - echo "$(${DDATE}): $@" -} - -# exit on error -_exit_err() -{ - _techo "$@" - rm -f "${TMP}" - exit 1 -} - -add_name() -{ - awk "{ print \"[${name}] \" \$0 }" -} - -pcmd() -{ - if [ "$remote_host" ]; then - ssh "$remote_host" "$@" - else - "$@" - fi -} - -# -# Version -# -display_version() -{ - echo "${FULL_VERSION}" - exit 0 -} - -# -# Tell how to use us -# -usage() -{ - echo "${__myname}: [args] " - echo "" - echo " ccollect creates (pseudo) incremental backups" - echo "" - echo " -h, --help: Show this help screen" - echo " -p, --parallel: Parallelise backup processes" - echo " -a, --all: Backup all sources specified in ${CSOURCES}" - echo " -v, --verbose: Be very verbose (uses set -x)" - echo " -V, --version: Print version information" - echo "" - echo " This is version ${VERSION}, released on ${RELEASE}" - echo " (the first version was written on 2005-12-05 by Nico Schottelius)." - echo "" - echo " Retrieve latest ccollect at http://unix.schottelius.org/ccollect/" - exit 0 -} - -# -# Select interval if AUTO -# -# For this to work nicely, you have to choose interval names that sort nicely -# such as int1, int2, int3 or a_daily, b_weekly, c_monthly, etc. -# -auto_interval() -{ - if [ -d "${backup}/intervals" -a -n "$(ls "${backup}/intervals" 2>/dev/null)" ] ; then - intervals_dir="${backup}/intervals" - elif [ -d "${CDEFAULTS}/intervals" -a -n "$(ls "${CDEFAULTS}/intervals" 2>/dev/null)" ] ; then - intervals_dir="${CDEFAULTS}/intervals" - else - _exit_err "No intervals are defined. Skipping." - fi - echo intervals_dir=${intervals_dir} - - trial_interval="$(ls -1r "${intervals_dir}/" | head -n 1)" || \ - _exit_err "Failed to list contents of ${intervals_dir}/." - _techo "Considering interval ${trial_interval}" - most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${trial_interval}.*/$" | head -n 1)" || \ - _exit_err "Failed to list contents of ${ddir}/." - _techo " Most recent ${trial_interval}: '${most_recent}'" - if [ -n "${most_recent}" ]; then - no_intervals="$(ls -1 "${intervals_dir}/" | wc -l)" - n=1 - while [ "${n}" -le "${no_intervals}" ]; do - trial_interval="$(ls -p1 "${intervals_dir}/" | tail -n+${n} | head -n 1)" - _techo "Considering interval '${trial_interval}'" - c_interval="$(cat "${intervals_dir}/${trial_interval}" 2>/dev/null)" - m=$((${n}+1)) - set -- "${ddir}" -maxdepth 1 - while [ "${m}" -le "${no_intervals}" ]; do - interval_m="$(ls -1 "${intervals_dir}/" | tail -n+${m} | head -n 1)" - most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${interval_m}\..*/$" | head -n 1)" - _techo " Most recent ${interval_m}: '${most_recent}'" - if [ -n "${most_recent}" ] ; then - set -- "$@" -$NEWER "${ddir}/${most_recent}" - fi - m=$((${m}+1)) - done - count=$(pcmd find "$@" -iname "${trial_interval}*" | wc -l) - _techo " Found $count more recent backups of ${trial_interval} (limit: ${c_interval})" - if [ "$count" -lt "${c_interval}" ] ; then - break - fi - n=$((${n}+1)) - done - fi - export INTERVAL="${trial_interval}" - D_FILE_INTERVAL="${intervals_dir}/${INTERVAL}" - D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null) -} - -# -# need at least interval and one source or --all -# -if [ $# -lt 2 ]; then - if [ "$1" = "-V" -o "$1" = "--version" ]; then - display_version - else - usage - fi -fi - -# -# check for configuraton directory -# -[ -d "${CCOLLECT_CONF}" ] || _exit_err "No configuration found in " \ - "\"${CCOLLECT_CONF}\" (is \$CCOLLECT_CONF properly set?)" - -# -# Filter arguments -# -export INTERVAL="$1"; shift -i=1 -no_sources=0 - -# -# Create source "array" -# -while [ "$#" -ge 1 ]; do - eval arg=\"\$1\"; shift - - if [ "${NO_MORE_ARGS}" = 1 ]; then - eval source_${no_sources}=\"${arg}\" - no_sources=$((${no_sources}+1)) - - # make variable available for subscripts - eval export source_${no_sources} - else - case "${arg}" in - -a|--all) - ALL=1 - ;; - -v|--verbose) - VERBOSE=1 - ;; - -p|--parallel) - PARALLEL=1 - ;; - -h|--help) - usage - ;; - --) - NO_MORE_ARGS=1 - ;; - *) - eval source_${no_sources}=\"$arg\" - no_sources=$(($no_sources+1)) - ;; - esac - fi - - i=$(($i+1)) -done - -# also export number of sources -export no_sources - -# -# be really, really, really verbose -# -if [ "${VERBOSE}" = 1 ]; then - set -x -fi - -# -# Look, if we should take ALL sources -# -if [ "${ALL}" = 1 ]; then - # reset everything specified before - no_sources=0 - - # - # get entries from sources - # - cwd=$(pwd -P) - ( cd "${CSOURCES}" && ls > "${TMP}" ); ret=$? - - [ "${ret}" -eq 0 ] || _exit_err "Listing of sources failed. Aborting." - - while read tmp; do - eval source_${no_sources}=\"${tmp}\" - no_sources=$((${no_sources}+1)) - done < "${TMP}" -fi - -# -# Need at least ONE source to backup -# -if [ "${no_sources}" -lt 1 ]; then - usage -else - _techo "${HALF_VERSION}: Beginning backup using interval ${INTERVAL}" -fi - -# -# Look for pre-exec command (general) -# -if [ -x "${CPREEXEC}" ]; then - _techo "Executing ${CPREEXEC} ..." - "${CPREEXEC}"; ret=$? - _techo "Finished ${CPREEXEC} (return code: ${ret})." - - [ "${ret}" -eq 0 ] || _exit_err "${CPREEXEC} failed. Aborting" -fi - -# -# check default configuration -# - -D_FILE_INTERVAL="${CDEFAULTS}/intervals/${INTERVAL}" -D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null) - - -# -# Let's do the backup -# -i=0 -while [ "${i}" -lt "${no_sources}" ]; do - - # - # Get current source - # - eval name=\"\$source_${i}\" - i=$((${i}+1)) - - export name - - # - # start ourself, if we want parallel execution - # - if [ "${PARALLEL}" ]; then - "$0" "${INTERVAL}" "${name}" & - continue - fi - -# -# Start subshell for easy log editing -# -( - # - # Stderr to stdout, so we can produce nice logs - # - exec 2>&1 - - # - # Configuration - # - backup="${CSOURCES}/${name}" - c_source="${backup}/source" - c_dest="${backup}/destination" - c_exclude="${backup}/exclude" - c_verbose="${backup}/verbose" - c_vverbose="${backup}/very_verbose" - c_rsync_extra="${backup}/rsync_options" - c_summary="${backup}/summary" - c_pre_exec="${backup}/pre_exec" - c_post_exec="${backup}/post_exec" - f_incomplete="delete_incomplete" - c_incomplete="${backup}/${f_incomplete}" - c_remote_host="${backup}/remote_host" - - # - # Marking backups: If we abort it's not removed => Backup is broken - # - c_marker=".ccollect-marker" - - # - # Times - # - begin_s=$(date +%s) - - # - # unset possible options - # - EXCLUDE="" - RSYNC_EXTRA="" - SUMMARY="" - VERBOSE="" - VVERBOSE="" - DELETE_INCOMPLETE="" - - _techo "Beginning to backup" - - # - # Standard configuration checks - # - if [ ! -e "${backup}" ]; then - _exit_err "Source does not exist." - fi - - # - # configuration _must_ be a directory - # - if [ ! -d "${backup}" ]; then - _exit_err "\"${name}\" is not a cconfig-directory. Skipping." - fi - - # - # first execute pre_exec, which may generate destination or other - # parameters - # - if [ -x "${c_pre_exec}" ]; then - _techo "Executing ${c_pre_exec} ..." - "${c_pre_exec}"; ret="$?" - _techo "Finished ${c_pre_exec} (return code ${ret})." - - if [ "${ret}" -ne 0 ]; then - _exit_err "${c_pre_exec} failed. Skipping." - fi - fi - - # - # Destination is a path - # - if [ ! -f "${c_dest}" ]; then - _exit_err "Destination ${c_dest} is not a file. Skipping." - else - ddir=$(cat "${c_dest}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Destination ${c_dest} is not readable. Skipping." - fi - fi - - # - # interval definition: First try source specific, fallback to default - # - if [ ${INTERVAL} = "AUTO" ] ; then - auto_interval - _techo "Selected interval: '$INTERVAL'" - fi - c_interval="$(cat "${backup}/intervals/${INTERVAL}" 2>/dev/null)" - - if [ -z "${c_interval}" ]; then - c_interval="${D_INTERVAL}" - - if [ -z "${c_interval}" ]; then - _exit_err "No definition for interval \"${INTERVAL}\" found. Skipping." - fi - fi - - # - # Source checks - # - if [ ! -f "${c_source}" ]; then - _exit_err "Source description \"${c_source}\" is not a file. Skipping." - else - source=$(cat "${c_source}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Source ${c_source} is not readable. Skipping." - fi - fi - # Verify source is up and accepting connections before deleting any old backups - rsync "$source" >/dev/null || _exit_err "Source ${source} is not readable. Skipping." - - # - # do we backup to a remote host? then set pre-cmd - # - if [ -f "${c_remote_host}" ]; then - # adjust ls and co - remote_host=$(cat "${c_remote_host}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Remote host file ${c_remote_host} exists, but is not readable. Skipping." - fi - destination="${remote_host}:${ddir}" - else - remote_host="" - destination="${ddir}" - fi - export remote_host - - # - # check for existence / use real name - # - ( pcmd cd "$ddir" ) || _exit_err "Cannot change to ${ddir}. Skipping." - - - # - # Check whether to delete incomplete backups - # - if [ -f "${c_incomplete}" -o -f "${CDEFAULTS}/${f_incomplete}" ]; then - DELETE_INCOMPLETE="yes" - fi - - # NEW method as of 0.6: - # - insert ccollect default parameters - # - insert options - # - insert user options - - # - # rsync standard options - # - - set -- "$@" "--archive" "--delete" "--numeric-ids" "--relative" \ - "--delete-excluded" "--sparse" - - # - # exclude list - # - if [ -f "${c_exclude}" ]; then - set -- "$@" "--exclude-from=${c_exclude}" - fi - - # - # Output a summary - # - if [ -f "${c_summary}" ]; then - set -- "$@" "--stats" - fi - - # - # Verbosity for rsync - # - if [ -f "${c_vverbose}" ]; then - set -- "$@" "-vv" - elif [ -f "${c_verbose}" ]; then - set -- "$@" "-v" - fi - - # - # extra options for rsync provided by the user - # - if [ -f "${c_rsync_extra}" ]; then - while read line; do - set -- "$@" "$line" - done < "${c_rsync_extra}" - fi - - # - # Check for incomplete backups - # - pcmd ls -1 "$ddir/${INTERVAL}"*".${c_marker}" > "${TMP}" 2>/dev/null - - i=0 - while read incomplete; do - eval incomplete_$i=\"$(echo ${incomplete} | sed "s/\\.${c_marker}\$//")\" - i=$(($i+1)) - done < "${TMP}" - - j=0 - while [ "$j" -lt "$i" ]; do - eval realincomplete=\"\$incomplete_$j\" - _techo "Incomplete backup: ${realincomplete}" - if [ "${DELETE_INCOMPLETE}" = "yes" ]; then - _techo "Deleting ${realincomplete} ..." - pcmd rm $VVERBOSE -rf "${ddir}/${realincomplete}" || \ - _exit_err "Removing ${realincomplete} failed." - fi - j=$(($j+1)) - done - - # - # check if maximum number of backups is reached, if so remove - # use grep and ls -p so we only look at directories - # - count="$(pcmd ls -p1 "${ddir}" | grep "^${INTERVAL}\..*/\$" | wc -l \ - | sed 's/^ *//g')" || _exit_err "Counting backups failed" - - _techo "Existing backups: ${count} Total keeping backups: ${c_interval}" - - if [ "${count}" -ge "${c_interval}" ]; then - substract=$((${c_interval} - 1)) - remove=$((${count} - ${substract})) - _techo "Removing ${remove} backup(s)..." - - pcmd ls -${TSORT}p1r "$ddir" | grep "^${INTERVAL}\..*/\$" | \ - head -n "${remove}" > "${TMP}" || \ - _exit_err "Listing old backups failed" - - i=0 - while read to_remove; do - eval remove_$i=\"${to_remove}\" - i=$(($i+1)) - done < "${TMP}" - - j=0 - while [ "$j" -lt "$i" ]; do - eval to_remove=\"\$remove_$j\" - _techo "Removing ${to_remove} ..." - pcmd rm ${VVERBOSE} -rf "${ddir}/${to_remove}" || \ - _exit_err "Removing ${to_remove} failed." - j=$(($j+1)) - done - fi - - - # - # Check for backup directory to clone from: Always clone from the latest one! - # - # Depending on your file system, you may want to sort on: - # 1. mtime (modification time) with TSORT=t, or - # 2. ctime (last change time, usually) with TSORT=tc - last_dir="$(pcmd ls -${TSORT}p1 "${ddir}" | grep '/$' | head -n 1)" || \ - _exit_err "Failed to list contents of ${ddir}." - - # - # clone from old backup, if existing - # - if [ "${last_dir}" ]; then - set -- "$@" "--link-dest=${ddir}/${last_dir}" - _techo "Hard linking from ${last_dir}" - fi - - - # set time when we really begin to backup, not when we began to remove above - destination_date=$(${CDATE}) - destination_dir="${ddir}/${INTERVAL}.${destination_date}.$$" - destination_full="${destination}/${INTERVAL}.${destination_date}.$$" - - # give some info - _techo "Beginning to backup, this may take some time..." - - _techo "Creating ${destination_dir} ..." - pcmd mkdir ${VVERBOSE} "${destination_dir}" || \ - _exit_err "Creating ${destination_dir} failed. Skipping." - - # - # added marking in 0.6 (and remove it, if successful later) - # - pcmd touch "${destination_dir}.${c_marker}" - - # - # the rsync part - # - _techo "Transferring files..." - rsync "$@" "${source}" "${destination_full}"; ret=$? - # Correct the modification time: - pcmd touch "${destination_dir}" - - # - # remove marking here - # - if [ "$ret" -ne 12 ] ; then - pcmd rm "${destination_dir}.${c_marker}" || \ - _exit_err "Removing ${destination_dir}/${c_marker} failed." - fi - - _techo "Finished backup (rsync return code: $ret)." - if [ "${ret}" -ne 0 ]; then - _techo "Warning: rsync exited non-zero, the backup may be broken (see rsync errors)." - fi - - # - # post_exec - # - if [ -x "${c_post_exec}" ]; then - _techo "Executing ${c_post_exec} ..." - "${c_post_exec}"; ret=$? - _techo "Finished ${c_post_exec}." - - if [ ${ret} -ne 0 ]; then - _exit_err "${c_post_exec} failed." - fi - fi - - # Calculation - end_s=$(date +%s) - - full_seconds=$((${end_s} - ${begin_s})) - hours=$((${full_seconds} / 3600)) - seconds=$((${full_seconds} - (${hours} * 3600))) - minutes=$((${seconds} / 60)) - seconds=$((${seconds} - (${minutes} * 60))) - - _techo "Backup lasted: ${hours}:${minutes}:${seconds} (h:m:s)" - -) | add_name -done - -# -# Be a good parent and wait for our children, if they are running wild parallel -# -if [ "${PARALLEL}" ]; then - _techo "Waiting for children to complete..." - wait -fi - -# -# Look for post-exec command (general) -# -if [ -x "${CPOSTEXEC}" ]; then - _techo "Executing ${CPOSTEXEC} ..." - "${CPOSTEXEC}"; ret=$? - _techo "Finished ${CPOSTEXEC} (return code: ${ret})." - - if [ ${ret} -ne 0 ]; then - _techo "${CPOSTEXEC} failed." - fi -fi - -rm -f "${TMP}" -_techo "Finished ${WE}" - -# vim: set shiftwidth=3 tabstop=3 expandtab : diff --git a/contrib/jlawless-2009-06-03/ccollect-i.sh b/contrib/jlawless-2009-06-03/ccollect-i.sh deleted file mode 100755 index 58fab09..0000000 --- a/contrib/jlawless-2009-06-03/ccollect-i.sh +++ /dev/null @@ -1,663 +0,0 @@ -#!/bin/sh -# -# 2005-2009 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Initially written for SyGroup (www.sygroup.ch) -# Date: Mon Nov 14 11:45:11 CET 2005 - -# -# Standard variables (stolen from cconf) -# -__pwd="$(pwd -P)" -__mydir="${0%/*}"; __abs_mydir="$(cd "$__mydir" && pwd -P)" -__myname=${0##*/}; __abs_myname="$__abs_mydir/$__myname" - -# -# where to find our configuration and temporary file -# -CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} -CSOURCES=${CCOLLECT_CONF}/sources -CDEFAULTS=${CCOLLECT_CONF}/defaults -CPREEXEC="${CDEFAULTS}/pre_exec" -CPOSTEXEC="${CDEFAULTS}/post_exec" - -TMP=$(mktemp "/tmp/${__myname}.XXXXXX") -VERSION=0.7.1 -RELEASE="2009-02-02" -HALF_VERSION="ccollect ${VERSION}" -FULL_VERSION="ccollect ${VERSION} (${RELEASE})" - -#TSORT="tc" ; NEWER="cnewer" -TSORT="t" ; NEWER="newer" - -# -# CDATE: how we use it for naming of the archives -# DDATE: how the user should see it in our output (DISPLAY) -# -CDATE="date +%Y%m%d-%H%M" -DDATE="date +%Y-%m-%d-%H:%M:%S" - -# -# unset parallel execution -# -PARALLEL="" - -# -# catch signals -# -trap "rm -f \"${TMP}\"" 1 2 15 - -# -# Functions -# - -# time displaying echo -_techo() -{ - echo "$(${DDATE}): $@" -} - -# exit on error -_exit_err() -{ - _techo "$@" - rm -f "${TMP}" - exit 1 -} - -add_name() -{ - awk "{ print \"[${name}] \" \$0 }" -} - -pcmd() -{ - if [ "$remote_host" ]; then - ssh "$remote_host" "$@" - else - "$@" - fi -} - -# -# Version -# -display_version() -{ - echo "${FULL_VERSION}" - exit 0 -} - -# -# Tell how to use us -# -usage() -{ - echo "${__myname}: [args] " - echo "" - echo " ccollect creates (pseudo) incremental backups" - echo "" - echo " -h, --help: Show this help screen" - echo " -p, --parallel: Parallelise backup processes" - echo " -a, --all: Backup all sources specified in ${CSOURCES}" - echo " -v, --verbose: Be very verbose (uses set -x)" - echo " -V, --version: Print version information" - echo "" - echo " This is version ${VERSION}, released on ${RELEASE}" - echo " (the first version was written on 2005-12-05 by Nico Schottelius)." - echo "" - echo " Retrieve latest ccollect at http://unix.schottelius.org/ccollect/" - exit 0 -} - -# -# Select interval if AUTO -# -# For this to work nicely, you have to choose interval names that sort nicely -# such as int1, int2, int3 or a_daily, b_weekly, c_monthly, etc. -# -auto_interval() -{ - if [ -d "${backup}/intervals" -a -n "$(ls "${backup}/intervals" 2>/dev/null)" ] ; then - intervals_dir="${backup}/intervals" - elif [ -d "${CDEFAULTS}/intervals" -a -n "$(ls "${CDEFAULTS}/intervals" 2>/dev/null)" ] ; then - intervals_dir="${CDEFAULTS}/intervals" - else - _exit_err "No intervals are defined. Skipping." - fi - echo intervals_dir=${intervals_dir} - - trial_interval="$(ls -1r "${intervals_dir}/" | head -n 1)" || \ - _exit_err "Failed to list contents of ${intervals_dir}/." - _techo "Considering interval ${trial_interval}" - most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${trial_interval}.*/$" | head -n 1)" || \ - _exit_err "Failed to list contents of ${ddir}/." - _techo " Most recent ${trial_interval}: '${most_recent}'" - if [ -n "${most_recent}" ]; then - no_intervals="$(ls -1 "${intervals_dir}/" | wc -l)" - n=1 - while [ "${n}" -le "${no_intervals}" ]; do - trial_interval="$(ls -p1 "${intervals_dir}/" | tail -n+${n} | head -n 1)" - _techo "Considering interval '${trial_interval}'" - c_interval="$(cat "${intervals_dir}/${trial_interval}" 2>/dev/null)" - m=$((${n}+1)) - set -- "${ddir}" -maxdepth 1 - while [ "${m}" -le "${no_intervals}" ]; do - interval_m="$(ls -1 "${intervals_dir}/" | tail -n+${m} | head -n 1)" - most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${interval_m}\..*/$" | head -n 1)" - _techo " Most recent ${interval_m}: '${most_recent}'" - if [ -n "${most_recent}" ] ; then - set -- "$@" -$NEWER "${ddir}/${most_recent}" - fi - m=$((${m}+1)) - done - count=$(pcmd find "$@" -iname "${trial_interval}*" | wc -l) - _techo " Found $count more recent backups of ${trial_interval} (limit: ${c_interval})" - if [ "$count" -lt "${c_interval}" ] ; then - break - fi - n=$((${n}+1)) - done - fi - export INTERVAL="${trial_interval}" - D_FILE_INTERVAL="${intervals_dir}/${INTERVAL}" - D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null) -} - -# -# need at least interval and one source or --all -# -if [ $# -lt 2 ]; then - if [ "$1" = "-V" -o "$1" = "--version" ]; then - display_version - else - usage - fi -fi - -# -# check for configuraton directory -# -[ -d "${CCOLLECT_CONF}" ] || _exit_err "No configuration found in " \ - "\"${CCOLLECT_CONF}\" (is \$CCOLLECT_CONF properly set?)" - -# -# Filter arguments -# -export INTERVAL="$1"; shift -i=1 -no_sources=0 - -# -# Create source "array" -# -while [ "$#" -ge 1 ]; do - eval arg=\"\$1\"; shift - - if [ "${NO_MORE_ARGS}" = 1 ]; then - eval source_${no_sources}=\"${arg}\" - no_sources=$((${no_sources}+1)) - - # make variable available for subscripts - eval export source_${no_sources} - else - case "${arg}" in - -a|--all) - ALL=1 - ;; - -v|--verbose) - VERBOSE=1 - ;; - -p|--parallel) - PARALLEL=1 - ;; - -h|--help) - usage - ;; - --) - NO_MORE_ARGS=1 - ;; - *) - eval source_${no_sources}=\"$arg\" - no_sources=$(($no_sources+1)) - ;; - esac - fi - - i=$(($i+1)) -done - -# also export number of sources -export no_sources - -# -# be really, really, really verbose -# -if [ "${VERBOSE}" = 1 ]; then - set -x -fi - -# -# Look, if we should take ALL sources -# -if [ "${ALL}" = 1 ]; then - # reset everything specified before - no_sources=0 - - # - # get entries from sources - # - cwd=$(pwd -P) - ( cd "${CSOURCES}" && ls > "${TMP}" ); ret=$? - - [ "${ret}" -eq 0 ] || _exit_err "Listing of sources failed. Aborting." - - while read tmp; do - eval source_${no_sources}=\"${tmp}\" - no_sources=$((${no_sources}+1)) - done < "${TMP}" -fi - -# -# Need at least ONE source to backup -# -if [ "${no_sources}" -lt 1 ]; then - usage -else - _techo "${HALF_VERSION}: Beginning backup using interval ${INTERVAL}" -fi - -# -# Look for pre-exec command (general) -# -if [ -x "${CPREEXEC}" ]; then - _techo "Executing ${CPREEXEC} ..." - "${CPREEXEC}"; ret=$? - _techo "Finished ${CPREEXEC} (return code: ${ret})." - - [ "${ret}" -eq 0 ] || _exit_err "${CPREEXEC} failed. Aborting" -fi - -# -# check default configuration -# - -D_FILE_INTERVAL="${CDEFAULTS}/intervals/${INTERVAL}" -D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null) - - -# -# Let's do the backup -# -i=0 -while [ "${i}" -lt "${no_sources}" ]; do - - # - # Get current source - # - eval name=\"\$source_${i}\" - i=$((${i}+1)) - - export name - - # - # start ourself, if we want parallel execution - # - if [ "${PARALLEL}" ]; then - "$0" "${INTERVAL}" "${name}" & - continue - fi - -# -# Start subshell for easy log editing -# -( - # - # Stderr to stdout, so we can produce nice logs - # - exec 2>&1 - - # - # Configuration - # - backup="${CSOURCES}/${name}" - c_source="${backup}/source" - c_dest="${backup}/destination" - c_pre_exec="${backup}/pre_exec" - c_post_exec="${backup}/post_exec" - for opt in exclude verbose very_verbose rsync_options summary delete_incomplete remote_host ; do - if [ -f "${backup}/$opt" -o -f "${backup}/no_$opt" ]; then - eval c_$opt=\"${backup}/$opt\" - else - eval c_$opt=\"${CDEFAULTS}/$opt\" - fi - done - - # - # Marking backups: If we abort it's not removed => Backup is broken - # - c_marker=".ccollect-marker" - - # - # Times - # - begin_s=$(date +%s) - - # - # unset possible options - # - VERBOSE="" - VVERBOSE="" - - _techo "Beginning to backup" - - # - # Standard configuration checks - # - if [ ! -e "${backup}" ]; then - _exit_err "Source does not exist." - fi - - # - # configuration _must_ be a directory - # - if [ ! -d "${backup}" ]; then - _exit_err "\"${name}\" is not a cconfig-directory. Skipping." - fi - - # - # first execute pre_exec, which may generate destination or other - # parameters - # - if [ -x "${c_pre_exec}" ]; then - _techo "Executing ${c_pre_exec} ..." - "${c_pre_exec}"; ret="$?" - _techo "Finished ${c_pre_exec} (return code ${ret})." - - if [ "${ret}" -ne 0 ]; then - _exit_err "${c_pre_exec} failed. Skipping." - fi - fi - - # - # Destination is a path - # - if [ ! -f "${c_dest}" ]; then - _exit_err "Destination ${c_dest} is not a file. Skipping." - else - ddir=$(cat "${c_dest}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Destination ${c_dest} is not readable. Skipping." - fi - fi - - # - # interval definition: First try source specific, fallback to default - # - if [ "${INTERVAL}" = "AUTO" ] ; then - auto_interval - _techo "Selected interval: '$INTERVAL'" - fi - c_interval="$(cat "${backup}/intervals/${INTERVAL}" 2>/dev/null)" - - if [ -z "${c_interval}" ]; then - c_interval="${D_INTERVAL}" - - if [ -z "${c_interval}" ]; then - _exit_err "No definition for interval \"${INTERVAL}\" found. Skipping." - fi - fi - - # - # Source checks - # - if [ ! -f "${c_source}" ]; then - _exit_err "Source description \"${c_source}\" is not a file. Skipping." - else - source=$(cat "${c_source}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Source ${c_source} is not readable. Skipping." - fi - fi - # Verify source is up and accepting connections before deleting any old backups - rsync "$source" >/dev/null || _exit_err "Source ${source} is not readable. Skipping." - - # - # do we backup to a remote host? then set pre-cmd - # - if [ -f "${c_remote_host}" ]; then - # adjust ls and co - remote_host=$(cat "${c_remote_host}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Remote host file ${c_remote_host} exists, but is not readable. Skipping." - fi - destination="${remote_host}:${ddir}" - else - remote_host="" - destination="${ddir}" - fi - export remote_host - - # - # check for existence / use real name - # - ( pcmd cd "$ddir" ) || _exit_err "Cannot change to ${ddir}. Skipping." - - - # NEW method as of 0.6: - # - insert ccollect default parameters - # - insert options - # - insert user options - - # - # rsync standard options - # - - set -- "$@" "--archive" "--delete" "--numeric-ids" "--relative" \ - "--delete-excluded" "--sparse" - - # - # exclude list - # - if [ -f "${c_exclude}" ]; then - set -- "$@" "--exclude-from=${c_exclude}" - fi - - # - # Output a summary - # - if [ -f "${c_summary}" ]; then - set -- "$@" "--stats" - fi - - # - # Verbosity for rsync - # - if [ -f "${c_very_verbose}" ]; then - set -- "$@" "-vv" - elif [ -f "${c_verbose}" ]; then - set -- "$@" "-v" - fi - - # - # extra options for rsync provided by the user - # - if [ -f "${c_rsync_options}" ]; then - while read line; do - set -- "$@" "$line" - done < "${c_rsync_options}" - fi - - # - # Check for incomplete backups - # - pcmd ls -1 "$ddir/${INTERVAL}"*".${c_marker}" 2>/dev/null | while read marker; do - incomplete="$(echo ${marker} | sed "s/\\.${c_marker}\$//")" - _techo "Incomplete backup: ${incomplete}" - if [ -f "${c_delete_incomplete}" ]; then - _techo "Deleting ${incomplete} ..." - pcmd rm $VVERBOSE -rf "${incomplete}" || \ - _exit_err "Removing ${incomplete} failed." - pcmd rm $VVERBOSE -f "${marker}" || \ - _exit_err "Removing ${marker} failed." - fi - done - - # - # check if maximum number of backups is reached, if so remove - # use grep and ls -p so we only look at directories - # - count="$(pcmd ls -p1 "${ddir}" | grep "^${INTERVAL}\..*/\$" | wc -l \ - | sed 's/^ *//g')" || _exit_err "Counting backups failed" - - _techo "Existing backups: ${count} Total keeping backups: ${c_interval}" - - if [ "${count}" -ge "${c_interval}" ]; then - substract=$((${c_interval} - 1)) - remove=$((${count} - ${substract})) - _techo "Removing ${remove} backup(s)..." - - pcmd ls -${TSORT}p1r "$ddir" | grep "^${INTERVAL}\..*/\$" | \ - head -n "${remove}" > "${TMP}" || \ - _exit_err "Listing old backups failed" - - i=0 - while read to_remove; do - eval remove_$i=\"${to_remove}\" - i=$(($i+1)) - done < "${TMP}" - - j=0 - while [ "$j" -lt "$i" ]; do - eval to_remove=\"\$remove_$j\" - _techo "Removing ${to_remove} ..." - pcmd rm ${VVERBOSE} -rf "${ddir}/${to_remove}" || \ - _exit_err "Removing ${to_remove} failed." - j=$(($j+1)) - done - fi - - - # - # Check for backup directory to clone from: Always clone from the latest one! - # - # Depending on your file system, you may want to sort on: - # 1. mtime (modification time) with TSORT=t, or - # 2. ctime (last change time, usually) with TSORT=tc - last_dir="$(pcmd ls -${TSORT}p1 "${ddir}" | grep '/$' | head -n 1)" || \ - _exit_err "Failed to list contents of ${ddir}." - - # - # clone from old backup, if existing - # - if [ "${last_dir}" ]; then - set -- "$@" "--link-dest=${ddir}/${last_dir}" - _techo "Hard linking from ${last_dir}" - fi - - - # set time when we really begin to backup, not when we began to remove above - destination_date=$(${CDATE}) - destination_dir="${ddir}/${INTERVAL}.${destination_date}.$$" - destination_full="${destination}/${INTERVAL}.${destination_date}.$$" - - # give some info - _techo "Beginning to backup, this may take some time..." - - _techo "Creating ${destination_dir} ..." - pcmd mkdir ${VVERBOSE} "${destination_dir}" || \ - _exit_err "Creating ${destination_dir} failed. Skipping." - - # - # added marking in 0.6 (and remove it, if successful later) - # - pcmd touch "${destination_dir}.${c_marker}" - - # - # the rsync part - # - _techo "Transferring files..." - rsync "$@" "${source}" "${destination_full}"; ret=$? - # Correct the modification time: - pcmd touch "${destination_dir}" - - # - # remove marking here - # - if [ "$ret" -ne 12 ] ; then - pcmd rm "${destination_dir}.${c_marker}" || \ - _exit_err "Removing ${destination_dir}/${c_marker} failed." - fi - - _techo "Finished backup (rsync return code: $ret)." - if [ "${ret}" -ne 0 ]; then - _techo "Warning: rsync exited non-zero, the backup may be broken (see rsync errors)." - fi - - # - # post_exec - # - if [ -x "${c_post_exec}" ]; then - _techo "Executing ${c_post_exec} ..." - "${c_post_exec}"; ret=$? - _techo "Finished ${c_post_exec}." - - if [ ${ret} -ne 0 ]; then - _exit_err "${c_post_exec} failed." - fi - fi - - # Calculation - end_s=$(date +%s) - - full_seconds=$((${end_s} - ${begin_s})) - hours=$((${full_seconds} / 3600)) - seconds=$((${full_seconds} - (${hours} * 3600))) - minutes=$((${seconds} / 60)) - seconds=$((${seconds} - (${minutes} * 60))) - - _techo "Backup lasted: ${hours}:${minutes}:${seconds} (h:m:s)" - -) | add_name -done - -# -# Be a good parent and wait for our children, if they are running wild parallel -# -if [ "${PARALLEL}" ]; then - _techo "Waiting for children to complete..." - wait -fi - -# -# Look for post-exec command (general) -# -if [ -x "${CPOSTEXEC}" ]; then - _techo "Executing ${CPOSTEXEC} ..." - "${CPOSTEXEC}"; ret=$? - _techo "Finished ${CPOSTEXEC} (return code: ${ret})." - - if [ ${ret} -ne 0 ]; then - _techo "${CPOSTEXEC} failed." - fi -fi - -rm -f "${TMP}" -_techo "Finished ${WE}" - -# vim: set shiftwidth=3 tabstop=3 expandtab : diff --git a/contrib/jlawless-2009-06-03/g.patch b/contrib/jlawless-2009-06-03/g.patch deleted file mode 100644 index 0c9a73e..0000000 --- a/contrib/jlawless-2009-06-03/g.patch +++ /dev/null @@ -1,74 +0,0 @@ -# I found that ccollect was not deleting incomplete backups despite the -# delete_incomplete option being specified. I traced the problem to: -# -# < pcmd rm $VVERBOSE -rf "${ddir}/${realincomplete}" || \ -# -# which, at least on all the systems I tested, should read: -# -# > pcmd rm $VVERBOSE -rf "${realincomplete}" || \ -# -# Also, the marker file is not deleted. I didn't see any reason to keep -# those files around (what do you think?), so I deleted them also: -# -# > pcmd rm $VVERBOSE -rf "${ddir}/${realincomplete}" || \ -# > _exit_err "Removing ${realincomplete} failed." -# -# As long as I was messing with the delete incomplete code and therefore need -# to test it, I took the liberty of simplifying it. The v0.7.1 code uses -# multiple loops with multiple loop counters and creates many variables. I -# simplified that to a single loop: -# -# > pcmd ls -1 "$ddir/${INTERVAL}"*".${c_marker}" 2>/dev/null | while read marker; do -# > incomplete="$(echo ${marker} | sed "s/\\.${c_marker}\$//")" -# > _techo "Incomplete backup: ${incomplete}" -# > if [ "${DELETE_INCOMPLETE}" = "yes" ]; then -# > _techo "Deleting ${incomplete} ..." -# > pcmd rm $VVERBOSE -rf "${incomplete}" || \ -# > _exit_err "Removing ${incomplete} failed." -# > pcmd rm $VVERBOSE -f "${marker}" || \ -# > _exit_err "Removing ${marker} failed." -# > fi -# > done -# -# The final code (a) fixes the delete bug, (b) also deletes the marker, and -# (c) is eight lines shorter than the original. -# ---- ccollect-f.sh 2009-05-12 12:49:28.000000000 -0700 -+++ ccollect-g.sh 2009-06-03 14:32:03.000000000 -0700 -@@ -516,28 +516,20 @@ - fi - - # - # Check for incomplete backups - # -- pcmd ls -1 "$ddir/${INTERVAL}"*".${c_marker}" > "${TMP}" 2>/dev/null -- -- i=0 -- while read incomplete; do -- eval incomplete_$i=\"$(echo ${incomplete} | sed "s/\\.${c_marker}\$//")\" -- i=$(($i+1)) -- done < "${TMP}" -- -- j=0 -- while [ "$j" -lt "$i" ]; do -- eval realincomplete=\"\$incomplete_$j\" -- _techo "Incomplete backup: ${realincomplete}" -+ pcmd ls -1 "$ddir/${INTERVAL}"*".${c_marker}" 2>/dev/null | while read marker; do -+ incomplete="$(echo ${marker} | sed "s/\\.${c_marker}\$//")" -+ _techo "Incomplete backup: ${incomplete}" - if [ "${DELETE_INCOMPLETE}" = "yes" ]; then -- _techo "Deleting ${realincomplete} ..." -- pcmd rm $VVERBOSE -rf "${ddir}/${realincomplete}" || \ -- _exit_err "Removing ${realincomplete} failed." -+ _techo "Deleting ${incomplete} ..." -+ pcmd rm $VVERBOSE -rf "${incomplete}" || \ -+ _exit_err "Removing ${incomplete} failed." -+ pcmd rm $VVERBOSE -f "${marker}" || \ -+ _exit_err "Removing ${marker} failed." - fi -- j=$(($j+1)) - done - - # - # check if maximum number of backups is reached, if so remove - # use grep and ls -p so we only look at directories diff --git a/contrib/jlawless-2009-06-03/h.patch b/contrib/jlawless-2009-06-03/h.patch deleted file mode 100644 index b850b73..0000000 --- a/contrib/jlawless-2009-06-03/h.patch +++ /dev/null @@ -1,18 +0,0 @@ -# A line in my f.patch was missing needed quotation marks. -# This fixes that. -# ---- ccollect-g.sh 2009-06-03 14:32:03.000000000 -0700 -+++ ccollect-h.sh 2009-06-03 14:32:19.000000000 -0700 -@@ -412,11 +412,11 @@ - fi - - # - # interval definition: First try source specific, fallback to default - # -- if [ ${INTERVAL} = "AUTO" ] ; then -+ if [ "${INTERVAL}" = "AUTO" ] ; then - auto_interval - _techo "Selected interval: '$INTERVAL'" - fi - c_interval="$(cat "${backup}/intervals/${INTERVAL}" 2>/dev/null)" - diff --git a/contrib/jlawless-2009-06-03/i.patch b/contrib/jlawless-2009-06-03/i.patch deleted file mode 100644 index e8edbaf..0000000 --- a/contrib/jlawless-2009-06-03/i.patch +++ /dev/null @@ -1,134 +0,0 @@ -# I have many sources that use the same options so I put those -# options in the defaults directory. I found that ccollect was -# ignoring most of them. I thought that this was a bug so I wrote -# some code to correct this: -# -# > for opt in exclude verbose very_verbose rsync_options summary delete_incomplete remote_host ; do -# > if [ -f "${backup}/$opt" -o -f "${backup}/no_$opt" ]; then -# > eval c_$opt=\"${backup}/$opt\" -# > else -# > eval c_$opt=\"${CDEFAULTS}/$opt\" -# > fi -# > done -# -# This also adds a new feature: if some option, say verbose, is -# specified in the defaults directory, it can be turned off for -# particular sources by specifying no_verbose as a source option. -# -# A side effect of this approach is that it forces script variable -# names to be consistent with option file names. Thus, there are -# several changes such as: -# -# < if [ -f "${c_rsync_extra}" ]; then -# > if [ -f "${c_rsync_options}" ]; then -# -# and -# -# < if [ -f "${c_vverbose}" ]; then -# > if [ -f "${c_very_verbose}" ]; then -# -# After correcting the bug and adding the "no_" feature, the code is -# 12 lines shorter. -# ---- ccollect-h.sh 2009-06-01 15:59:11.000000000 -0700 -+++ ccollect-i.sh 2009-06-03 14:27:58.000000000 -0700 -@@ -336,20 +336,19 @@ - # Configuration - # - backup="${CSOURCES}/${name}" - c_source="${backup}/source" - c_dest="${backup}/destination" -- c_exclude="${backup}/exclude" -- c_verbose="${backup}/verbose" -- c_vverbose="${backup}/very_verbose" -- c_rsync_extra="${backup}/rsync_options" -- c_summary="${backup}/summary" - c_pre_exec="${backup}/pre_exec" - c_post_exec="${backup}/post_exec" -- f_incomplete="delete_incomplete" -- c_incomplete="${backup}/${f_incomplete}" -- c_remote_host="${backup}/remote_host" -+ for opt in exclude verbose very_verbose rsync_options summary delete_incomplete remote_host ; do -+ if [ -f "${backup}/$opt" -o -f "${backup}/no_$opt" ]; then -+ eval c_$opt=\"${backup}/$opt\" -+ else -+ eval c_$opt=\"${CDEFAULTS}/$opt\" -+ fi -+ done - - # - # Marking backups: If we abort it's not removed => Backup is broken - # - c_marker=".ccollect-marker" -@@ -360,16 +359,12 @@ - begin_s=$(date +%s) - - # - # unset possible options - # -- EXCLUDE="" -- RSYNC_EXTRA="" -- SUMMARY="" - VERBOSE="" - VVERBOSE="" -- DELETE_INCOMPLETE="" - - _techo "Beginning to backup" - - # - # Standard configuration checks -@@ -462,17 +457,10 @@ - # check for existence / use real name - # - ( pcmd cd "$ddir" ) || _exit_err "Cannot change to ${ddir}. Skipping." - - -- # -- # Check whether to delete incomplete backups -- # -- if [ -f "${c_incomplete}" -o -f "${CDEFAULTS}/${f_incomplete}" ]; then -- DELETE_INCOMPLETE="yes" -- fi -- - # NEW method as of 0.6: - # - insert ccollect default parameters - # - insert options - # - insert user options - -@@ -498,32 +486,32 @@ - fi - - # - # Verbosity for rsync - # -- if [ -f "${c_vverbose}" ]; then -+ if [ -f "${c_very_verbose}" ]; then - set -- "$@" "-vv" - elif [ -f "${c_verbose}" ]; then - set -- "$@" "-v" - fi - - # - # extra options for rsync provided by the user - # -- if [ -f "${c_rsync_extra}" ]; then -+ if [ -f "${c_rsync_options}" ]; then - while read line; do - set -- "$@" "$line" -- done < "${c_rsync_extra}" -+ done < "${c_rsync_options}" - fi - - # - # Check for incomplete backups - # - pcmd ls -1 "$ddir/${INTERVAL}"*".${c_marker}" 2>/dev/null | while read marker; do - incomplete="$(echo ${marker} | sed "s/\\.${c_marker}\$//")" - _techo "Incomplete backup: ${incomplete}" -- if [ "${DELETE_INCOMPLETE}" = "yes" ]; then -+ if [ -f "${c_delete_incomplete}" ]; then - _techo "Deleting ${incomplete} ..." - pcmd rm $VVERBOSE -rf "${incomplete}" || \ - _exit_err "Removing ${incomplete} failed." - pcmd rm $VVERBOSE -f "${marker}" || \ - _exit_err "Removing ${marker} failed." diff --git a/contrib/jlawless-2009-06-03/old/README_a-f.txt b/contrib/jlawless-2009-06-03/old/README_a-f.txt deleted file mode 100644 index e3bfe57..0000000 --- a/contrib/jlawless-2009-06-03/old/README_a-f.txt +++ /dev/null @@ -1,296 +0,0 @@ -Dear Nico Schottelius, - - I have started using ccollect and I very much like its design: -it is elegant and effective. - - In the process of getting ccollect setup and running, I made -five changes, including one major new feature, that I hope you will -find useful. - - First, I added the following before any old backup gets deleted: - -> # Verify source is up and accepting connections before deleting any old backups -> rsync "$source" >/dev/null || _exit_err "Source ${source} is not readable. Skipping." - -I think that this quick test is a much better than, say, pinging -the source in a pre-exec script: this tests not only that the -source is up and connected to the net, it also verifies (1) that -ssh is up and accepting our key (if we are using ssh), and (2) that -the source directory is mounted (if it needs to be mounted) and -readable. - - Second, I found ccollect's use of ctime problematic. After -copying an old backup over to my ccollect destination, I adjusted -mtime and atime where needed using touch, e.g.: - -touch -d"28 Apr 2009 3:00" destination/daily.01 - -However, as far as I know, there is no way to correct a bad ctime. -I ran into this issue repeatedly while adjusting my backup -configuration. (For example, "cp -a" preserves mtime but not -ctime. Even worse, "cp -al old new" also changes ctime on old.) - - Another potential problem with ctime is that it is file-system -dependent: I have read that Windows sets ctime to create-time not -last change-time. - - However, It is simple to give a new backup the correct mtime. -After the rsync step, I added the command: - -553a616,617 -> # Correct the modification time: -> pcmd touch "${destination_dir}" - -Even if ccollect continues to use ctime for sorting, I see no -reason not to have the backup directory have the correct mtime. - - To allow the rest of the code to use either ctime or mtime, I -added definitions: - -44a45,47 -> #TSORT="tc" ; NEWER="cnewer" -> TSORT="t" ; NEWER="newer" - -(It would be better if this choice was user-configurable because -those with existing backup directories should continue to use ctime -until the mtimes of their directories are correct. The correction -would happen passively over time as new backups created using the -above touch command and the old ones are deleted.) - -With these definitions, the proper link-dest directory can then be -found using this minor change (and comment update): - -516,519c579,582 -< # Use ls -1c instead of -1t, because last modification maybe the same on all -< # and metadate update (-c) is updated by rsync locally. -< # -< last_dir="$(pcmd ls -tcp1 "${ddir}" | grep '/$' | head -n 1)" || \ ---- -> # Depending on your file system, you may want to sort on: -> # 1. mtime (modification time) with TSORT=t, or -> # 2. ctime (last change time, usually) with TSORT=tc -> last_dir="$(pcmd ls -${TSORT}p1 "${ddir}" | grep '/$' | head -n 1)" || \ - - Thirdly, after I copied my old backups over to my ccollect -destination directory, I found that ccollect would delete a -recent backup not an old backup! My problem was that, unknown to -me, the algorithm to find the oldest backup (for deletion) was -inconsistent with that used to find the newest (for link-dest). I -suggest that these two should be consistent. Because time-sorting -seemed more consistent with the ccollect documentation, I suggest: - -492,493c555,556 -< pcmd ls -p1 "$ddir" | grep "^${INTERVAL}\..*/\$" | \ -< sort -n | head -n "${remove}" > "${TMP}" || \ ---- -> pcmd ls -${TSORT}p1r "$ddir" | grep "^${INTERVAL}\..*/\$" | \ -> head -n "${remove}" > "${TMP}" || \ - - Fourthly, in my experience, rsync error code 12 means complete -failure, usually because the source refuses the ssh connection. -So, I left the marker in that case: - -558,559c622,625 -< pcmd rm "${destination_dir}.${c_marker}" || \ -< _exit_err "Removing ${destination_dir}/${c_marker} failed." ---- -> if [ "$ret" -ne 12 ] ; then -> pcmd rm "${destination_dir}.${c_marker}" || \ -> _exit_err "Removing ${destination_dir}/${c_marker} failed." -> fi - -(A better solution might allow a user-configurable list of error -codes that are treated the same as a fail.) - - Fifth, because I was frustrated by the problems of having a -cron-job decide which interval to backup, I added a major new -feature: the modified ccollect can now automatically select an -interval to use for backup. - - Cron-job controlled backup works well if all machines are up and -running all the time and nothing ever goes wrong. I have, however, -some machines that are occasionally turned off, or that are mobile -and only sometimes connected to local net. For these machines, the -use of cron-jobs to select intervals can be a disaster. - - There are several ways one could automatically choose an -appropriate interval. The method I show below has the advantage -that it works with existing ccollect configuration files. The only -requirement is that interval names be chosen to sort nicely (under -ls). For example, I currently use: - -$ ls -1 intervals -a_daily -b_weekly -c_monthly -d_quarterly -e_yearly -$ cat intervals/* -6 -3 -2 -3 -30 - -A simpler example would be: - -$ ls -1 intervals -int1 -int2 -int3 -$ cat intervals/* -2 -3 -4 - -The algorithm works as follows: - - If no backup exists for the least frequent interval (int3 in the - simpler example), then use that interval. Otherwise, use the - most frequent interval (int1) unless there are "$(cat - intervals/int1)" int1 backups more recent than any int2 or int3 - backup, in which case select int2 unless there are "$(cat - intervals/int2)" int2 backups more recent than any int3 backups - in which case choose int3. - -This algorithm works well cycling through all the backups for my -always connected machines as well as for my usually connected -machines, and rarely connected machines. (For a rarely connected -machine, interval names like "b_weekly" lose their English meaning -but it still does a reasonable job of rotating through the -intervals.) - - In addition to being more robust, the automatic interval -selection means that crontab is greatly simplified: only one line -is needed. I use: - -30 3 * * * ccollect.sh AUTO host1 host2 host3 | tee -a /var/log/ccollect-full.log | ccollect_analyse_logs.sh iwe - - Some users might prefer a calendar-driven algorithm such as: do -a yearly backup the first time a machine is connected during a new -year; do a monthly backup the first that a machine is connected -during a month; etc. This, however, would require a change to the -ccollect configuration files. So, I didn't pursue the idea any -further. - - The code checks to see if the user specified the interval as -AUTO. If so, the auto_interval function is called to select the -interval: - -347a417,420 -> if [ ${INTERVAL} = "AUTO" ] ; then -> auto_interval -> _techo "Selected interval: '$INTERVAL'" -> fi - -The code for auto_interval is as follows (note that it allows 'more -recent' to be defined by either ctime or mtime as per the TSORT -variable): - -125a129,182 -> # Select interval if AUTO -> # -> # For this to work nicely, you have to choose interval names that sort nicely -> # such as int1, int2, int3 or a_daily, b_weekly, c_monthly, etc. -> # -> auto_interval() -> { -> if [ -d "${backup}/intervals" -a -n "$(ls "${backup}/intervals" 2>/dev/null)" ] ; then -> intervals_dir="${backup}/intervals" -> elif [ -d "${CDEFAULTS}/intervals" -a -n "$(ls "${CDEFAULTS}/intervals" 2>/dev/null)" ] ; then -> intervals_dir="${CDEFAULTS}/intervals" -> else -> _exit_err "No intervals are defined. Skipping." -> fi -> echo intervals_dir=${intervals_dir} -> -> trial_interval="$(ls -1r "${intervals_dir}/" | head -n 1)" || \ -> _exit_err "Failed to list contents of ${intervals_dir}/." -> _techo "Considering interval ${trial_interval}" -> most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${trial_interval}.*/$" | head -n 1)" || \ -> _exit_err "Failed to list contents of ${ddir}/." -> _techo " Most recent ${trial_interval}: '${most_recent}'" -> if [ -n "${most_recent}" ]; then -> no_intervals="$(ls -1 "${intervals_dir}/" | wc -l)" -> n=1 -> while [ "${n}" -le "${no_intervals}" ]; do -> trial_interval="$(ls -p1 "${intervals_dir}/" | tail -n+${n} | head -n 1)" -> _techo "Considering interval '${trial_interval}'" -> c_interval="$(cat "${intervals_dir}/${trial_interval}" 2>/dev/null)" -> m=$((${n}+1)) -> set -- "${ddir}" -maxdepth 1 -> while [ "${m}" -le "${no_intervals}" ]; do -> interval_m="$(ls -1 "${intervals_dir}/" | tail -n+${m} | head -n 1)" -> most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${interval_m}\..*/$" | head -n 1)" -> _techo " Most recent ${interval_m}: '${most_recent}'" -> if [ -n "${most_recent}" ] ; then -> set -- "$@" -$NEWER "${ddir}/${most_recent}" -> fi -> m=$((${m}+1)) -> done -> count=$(pcmd find "$@" -iname "${trial_interval}*" | wc -l) -> _techo " Found $count more recent backups of ${trial_interval} (limit: ${c_interval})" -> if [ "$count" -lt "${c_interval}" ] ; then -> break -> fi -> n=$((${n}+1)) -> done -> fi -> export INTERVAL="${trial_interval}" -> D_FILE_INTERVAL="${intervals_dir}/${INTERVAL}" -> D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null) -> } -> -> # - -While I consider the auto_interval code to be developmental, I have -been using it for my nightly backups and it works for me. - - One last change: For auto_interval to work, it needs "ddir" to -be defined first. Consequently, I had to move the following code -so it gets run before auto_interval is called: - -369,380c442,443 -< -< # -< # Destination is a path -< # -< if [ ! -f "${c_dest}" ]; then -< _exit_err "Destination ${c_dest} is not a file. Skipping." -< else -< ddir=$(cat "${c_dest}"); ret="$?" -< if [ "${ret}" -ne 0 ]; then -< _exit_err "Destination ${c_dest} is not readable. Skipping." -< fi -< fi -345a403,414 -> # Destination is a path -> # -> if [ ! -f "${c_dest}" ]; then -> _exit_err "Destination ${c_dest} is not a file. Skipping." -> else -> ddir=$(cat "${c_dest}"); ret="$?" -> if [ "${ret}" -ne 0 ]; then -> _exit_err "Destination ${c_dest} is not readable. Skipping." -> fi -> fi -> -> # - - I have some other ideas but this is all I have implemented at -the moment. Files are attached. - - Thanks again for developing ccollect and let me know what you -think. - -Regards, - -John - --- - John L. Lawless, Ph.D. - Redwood Scientific, Inc. - 1005 Terra Nova Blvd - Pacifica, CA 94044-4300 - 1-650-738-8083 - diff --git a/contrib/jlawless-2009-06-03/old/a.patch b/contrib/jlawless-2009-06-03/old/a.patch deleted file mode 100644 index bf4b662..0000000 --- a/contrib/jlawless-2009-06-03/old/a.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ccollect-0.7.1.sh 2009-02-02 03:39:42.000000000 -0800 -+++ ccollect-0.7.1-a.sh 2009-05-24 21:30:38.000000000 -0700 -@@ -364,10 +364,12 @@ - source=$(cat "${c_source}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Source ${c_source} is not readable. Skipping." - fi - fi -+ # Verify source is up and accepting connections before deleting any old backups -+ rsync "$source" >/dev/null || _exit_err "Source ${source} is not readable. Skipping." - - # - # Destination is a path - # - if [ ! -f "${c_dest}" ]; then diff --git a/contrib/jlawless-2009-06-03/old/b.patch b/contrib/jlawless-2009-06-03/old/b.patch deleted file mode 100644 index c0266d2..0000000 --- a/contrib/jlawless-2009-06-03/old/b.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ccollect-0.7.1-a.sh 2009-05-24 21:30:38.000000000 -0700 -+++ ccollect-0.7.1-b.sh 2009-05-24 21:32:00.000000000 -0700 -@@ -551,10 +551,12 @@ - # the rsync part - # - - _techo "Transferring files..." - rsync "$@" "${source}" "${destination_full}"; ret=$? -+ # Correct the modification time: -+ pcmd touch "${destination_dir}" - - # - # remove marking here - # - pcmd rm "${destination_dir}.${c_marker}" || \ diff --git a/contrib/jlawless-2009-06-03/old/c.patch b/contrib/jlawless-2009-06-03/old/c.patch deleted file mode 100644 index 7b5f9a8..0000000 --- a/contrib/jlawless-2009-06-03/old/c.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ccollect-0.7.1-b.sh 2009-05-24 21:32:00.000000000 -0700 -+++ ccollect-0.7.1-c.sh 2009-05-24 21:39:43.000000000 -0700 -@@ -40,10 +40,13 @@ - VERSION=0.7.1 - RELEASE="2009-02-02" - HALF_VERSION="ccollect ${VERSION}" - FULL_VERSION="ccollect ${VERSION} (${RELEASE})" - -+#TSORT="tc" ; NEWER="cnewer" -+TSORT="t" ; NEWER="newer" -+ - # - # CDATE: how we use it for naming of the archives - # DDATE: how the user should see it in our output (DISPLAY) - # - CDATE="date +%Y%m%d-%H%M" -@@ -513,14 +516,14 @@ - - - # - # Check for backup directory to clone from: Always clone from the latest one! - # -- # Use ls -1c instead of -1t, because last modification maybe the same on all -- # and metadate update (-c) is updated by rsync locally. -- # -- last_dir="$(pcmd ls -tcp1 "${ddir}" | grep '/$' | head -n 1)" || \ -+ # Depending on your file system, you may want to sort on: -+ # 1. mtime (modification time) with TSORT=t, or -+ # 2. ctime (last change time, usually) with TSORT=tc -+ last_dir="$(pcmd ls -${TSORT}p1 "${ddir}" | grep '/$' | head -n 1)" || \ - _exit_err "Failed to list contents of ${ddir}." - - # - # clone from old backup, if existing - # diff --git a/contrib/jlawless-2009-06-03/old/ccollect-0.7.1.sh b/contrib/jlawless-2009-06-03/old/ccollect-0.7.1.sh deleted file mode 100755 index e14dcfc..0000000 --- a/contrib/jlawless-2009-06-03/old/ccollect-0.7.1.sh +++ /dev/null @@ -1,615 +0,0 @@ -#!/bin/sh -# -# 2005-2009 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Initially written for SyGroup (www.sygroup.ch) -# Date: Mon Nov 14 11:45:11 CET 2005 - -# -# Standard variables (stolen from cconf) -# -__pwd="$(pwd -P)" -__mydir="${0%/*}"; __abs_mydir="$(cd "$__mydir" && pwd -P)" -__myname=${0##*/}; __abs_myname="$__abs_mydir/$__myname" - -# -# where to find our configuration and temporary file -# -CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} -CSOURCES=${CCOLLECT_CONF}/sources -CDEFAULTS=${CCOLLECT_CONF}/defaults -CPREEXEC="${CDEFAULTS}/pre_exec" -CPOSTEXEC="${CDEFAULTS}/post_exec" - -TMP=$(mktemp "/tmp/${__myname}.XXXXXX") -VERSION=0.7.1 -RELEASE="2009-02-02" -HALF_VERSION="ccollect ${VERSION}" -FULL_VERSION="ccollect ${VERSION} (${RELEASE})" - -# -# CDATE: how we use it for naming of the archives -# DDATE: how the user should see it in our output (DISPLAY) -# -CDATE="date +%Y%m%d-%H%M" -DDATE="date +%Y-%m-%d-%H:%M:%S" - -# -# unset parallel execution -# -PARALLEL="" - -# -# catch signals -# -trap "rm -f \"${TMP}\"" 1 2 15 - -# -# Functions -# - -# time displaying echo -_techo() -{ - echo "$(${DDATE}): $@" -} - -# exit on error -_exit_err() -{ - _techo "$@" - rm -f "${TMP}" - exit 1 -} - -add_name() -{ - awk "{ print \"[${name}] \" \$0 }" -} - -pcmd() -{ - if [ "$remote_host" ]; then - ssh "$remote_host" "$@" - else - "$@" - fi -} - -# -# Version -# -display_version() -{ - echo "${FULL_VERSION}" - exit 0 -} - -# -# Tell how to use us -# -usage() -{ - echo "${__myname}: [args] " - echo "" - echo " ccollect creates (pseudo) incremental backups" - echo "" - echo " -h, --help: Show this help screen" - echo " -p, --parallel: Parallelise backup processes" - echo " -a, --all: Backup all sources specified in ${CSOURCES}" - echo " -v, --verbose: Be very verbose (uses set -x)" - echo " -V, --version: Print version information" - echo "" - echo " This is version ${VERSION}, released on ${RELEASE}" - echo " (the first version was written on 2005-12-05 by Nico Schottelius)." - echo "" - echo " Retrieve latest ccollect at http://unix.schottelius.org/ccollect/" - exit 0 -} - -# -# need at least interval and one source or --all -# -if [ $# -lt 2 ]; then - if [ "$1" = "-V" -o "$1" = "--version" ]; then - display_version - else - usage - fi -fi - -# -# check for configuraton directory -# -[ -d "${CCOLLECT_CONF}" ] || _exit_err "No configuration found in " \ - "\"${CCOLLECT_CONF}\" (is \$CCOLLECT_CONF properly set?)" - -# -# Filter arguments -# -export INTERVAL="$1"; shift -i=1 -no_sources=0 - -# -# Create source "array" -# -while [ "$#" -ge 1 ]; do - eval arg=\"\$1\"; shift - - if [ "${NO_MORE_ARGS}" = 1 ]; then - eval source_${no_sources}=\"${arg}\" - no_sources=$((${no_sources}+1)) - - # make variable available for subscripts - eval export source_${no_sources} - else - case "${arg}" in - -a|--all) - ALL=1 - ;; - -v|--verbose) - VERBOSE=1 - ;; - -p|--parallel) - PARALLEL=1 - ;; - -h|--help) - usage - ;; - --) - NO_MORE_ARGS=1 - ;; - *) - eval source_${no_sources}=\"$arg\" - no_sources=$(($no_sources+1)) - ;; - esac - fi - - i=$(($i+1)) -done - -# also export number of sources -export no_sources - -# -# be really, really, really verbose -# -if [ "${VERBOSE}" = 1 ]; then - set -x -fi - -# -# Look, if we should take ALL sources -# -if [ "${ALL}" = 1 ]; then - # reset everything specified before - no_sources=0 - - # - # get entries from sources - # - cwd=$(pwd -P) - ( cd "${CSOURCES}" && ls > "${TMP}" ); ret=$? - - [ "${ret}" -eq 0 ] || _exit_err "Listing of sources failed. Aborting." - - while read tmp; do - eval source_${no_sources}=\"${tmp}\" - no_sources=$((${no_sources}+1)) - done < "${TMP}" -fi - -# -# Need at least ONE source to backup -# -if [ "${no_sources}" -lt 1 ]; then - usage -else - _techo "${HALF_VERSION}: Beginning backup using interval ${INTERVAL}" -fi - -# -# Look for pre-exec command (general) -# -if [ -x "${CPREEXEC}" ]; then - _techo "Executing ${CPREEXEC} ..." - "${CPREEXEC}"; ret=$? - _techo "Finished ${CPREEXEC} (return code: ${ret})." - - [ "${ret}" -eq 0 ] || _exit_err "${CPREEXEC} failed. Aborting" -fi - -# -# check default configuration -# - -D_FILE_INTERVAL="${CDEFAULTS}/intervals/${INTERVAL}" -D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null) - - -# -# Let's do the backup -# -i=0 -while [ "${i}" -lt "${no_sources}" ]; do - - # - # Get current source - # - eval name=\"\$source_${i}\" - i=$((${i}+1)) - - export name - - # - # start ourself, if we want parallel execution - # - if [ "${PARALLEL}" ]; then - "$0" "${INTERVAL}" "${name}" & - continue - fi - -# -# Start subshell for easy log editing -# -( - # - # Stderr to stdout, so we can produce nice logs - # - exec 2>&1 - - # - # Configuration - # - backup="${CSOURCES}/${name}" - c_source="${backup}/source" - c_dest="${backup}/destination" - c_exclude="${backup}/exclude" - c_verbose="${backup}/verbose" - c_vverbose="${backup}/very_verbose" - c_rsync_extra="${backup}/rsync_options" - c_summary="${backup}/summary" - c_pre_exec="${backup}/pre_exec" - c_post_exec="${backup}/post_exec" - f_incomplete="delete_incomplete" - c_incomplete="${backup}/${f_incomplete}" - c_remote_host="${backup}/remote_host" - - # - # Marking backups: If we abort it's not removed => Backup is broken - # - c_marker=".ccollect-marker" - - # - # Times - # - begin_s=$(date +%s) - - # - # unset possible options - # - EXCLUDE="" - RSYNC_EXTRA="" - SUMMARY="" - VERBOSE="" - VVERBOSE="" - DELETE_INCOMPLETE="" - - _techo "Beginning to backup" - - # - # Standard configuration checks - # - if [ ! -e "${backup}" ]; then - _exit_err "Source does not exist." - fi - - # - # configuration _must_ be a directory - # - if [ ! -d "${backup}" ]; then - _exit_err "\"${name}\" is not a cconfig-directory. Skipping." - fi - - # - # first execute pre_exec, which may generate destination or other - # parameters - # - if [ -x "${c_pre_exec}" ]; then - _techo "Executing ${c_pre_exec} ..." - "${c_pre_exec}"; ret="$?" - _techo "Finished ${c_pre_exec} (return code ${ret})." - - if [ "${ret}" -ne 0 ]; then - _exit_err "${c_pre_exec} failed. Skipping." - fi - fi - - # - # interval definition: First try source specific, fallback to default - # - c_interval="$(cat "${backup}/intervals/${INTERVAL}" 2>/dev/null)" - - if [ -z "${c_interval}" ]; then - c_interval="${D_INTERVAL}" - - if [ -z "${c_interval}" ]; then - _exit_err "No definition for interval \"${INTERVAL}\" found. Skipping." - fi - fi - - # - # Source checks - # - if [ ! -f "${c_source}" ]; then - _exit_err "Source description \"${c_source}\" is not a file. Skipping." - else - source=$(cat "${c_source}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Source ${c_source} is not readable. Skipping." - fi - fi - - # - # Destination is a path - # - if [ ! -f "${c_dest}" ]; then - _exit_err "Destination ${c_dest} is not a file. Skipping." - else - ddir=$(cat "${c_dest}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Destination ${c_dest} is not readable. Skipping." - fi - fi - - # - # do we backup to a remote host? then set pre-cmd - # - if [ -f "${c_remote_host}" ]; then - # adjust ls and co - remote_host=$(cat "${c_remote_host}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Remote host file ${c_remote_host} exists, but is not readable. Skipping." - fi - destination="${remote_host}:${ddir}" - else - remote_host="" - destination="${ddir}" - fi - export remote_host - - # - # check for existence / use real name - # - ( pcmd cd "$ddir" ) || _exit_err "Cannot change to ${ddir}. Skipping." - - - # - # Check whether to delete incomplete backups - # - if [ -f "${c_incomplete}" -o -f "${CDEFAULTS}/${f_incomplete}" ]; then - DELETE_INCOMPLETE="yes" - fi - - # NEW method as of 0.6: - # - insert ccollect default parameters - # - insert options - # - insert user options - - # - # rsync standard options - # - - set -- "$@" "--archive" "--delete" "--numeric-ids" "--relative" \ - "--delete-excluded" "--sparse" - - # - # exclude list - # - if [ -f "${c_exclude}" ]; then - set -- "$@" "--exclude-from=${c_exclude}" - fi - - # - # Output a summary - # - if [ -f "${c_summary}" ]; then - set -- "$@" "--stats" - fi - - # - # Verbosity for rsync - # - if [ -f "${c_vverbose}" ]; then - set -- "$@" "-vv" - elif [ -f "${c_verbose}" ]; then - set -- "$@" "-v" - fi - - # - # extra options for rsync provided by the user - # - if [ -f "${c_rsync_extra}" ]; then - while read line; do - set -- "$@" "$line" - done < "${c_rsync_extra}" - fi - - # - # Check for incomplete backups - # - pcmd ls -1 "$ddir/${INTERVAL}"*".${c_marker}" > "${TMP}" 2>/dev/null - - i=0 - while read incomplete; do - eval incomplete_$i=\"$(echo ${incomplete} | sed "s/\\.${c_marker}\$//")\" - i=$(($i+1)) - done < "${TMP}" - - j=0 - while [ "$j" -lt "$i" ]; do - eval realincomplete=\"\$incomplete_$j\" - _techo "Incomplete backup: ${realincomplete}" - if [ "${DELETE_INCOMPLETE}" = "yes" ]; then - _techo "Deleting ${realincomplete} ..." - pcmd rm $VVERBOSE -rf "${ddir}/${realincomplete}" || \ - _exit_err "Removing ${realincomplete} failed." - fi - j=$(($j+1)) - done - - # - # check if maximum number of backups is reached, if so remove - # use grep and ls -p so we only look at directories - # - count="$(pcmd ls -p1 "${ddir}" | grep "^${INTERVAL}\..*/\$" | wc -l \ - | sed 's/^ *//g')" || _exit_err "Counting backups failed" - - _techo "Existing backups: ${count} Total keeping backups: ${c_interval}" - - if [ "${count}" -ge "${c_interval}" ]; then - substract=$((${c_interval} - 1)) - remove=$((${count} - ${substract})) - _techo "Removing ${remove} backup(s)..." - - pcmd ls -p1 "$ddir" | grep "^${INTERVAL}\..*/\$" | \ - sort -n | head -n "${remove}" > "${TMP}" || \ - _exit_err "Listing old backups failed" - - i=0 - while read to_remove; do - eval remove_$i=\"${to_remove}\" - i=$(($i+1)) - done < "${TMP}" - - j=0 - while [ "$j" -lt "$i" ]; do - eval to_remove=\"\$remove_$j\" - _techo "Removing ${to_remove} ..." - pcmd rm ${VVERBOSE} -rf "${ddir}/${to_remove}" || \ - _exit_err "Removing ${to_remove} failed." - j=$(($j+1)) - done - fi - - - # - # Check for backup directory to clone from: Always clone from the latest one! - # - # Use ls -1c instead of -1t, because last modification maybe the same on all - # and metadate update (-c) is updated by rsync locally. - # - last_dir="$(pcmd ls -tcp1 "${ddir}" | grep '/$' | head -n 1)" || \ - _exit_err "Failed to list contents of ${ddir}." - - # - # clone from old backup, if existing - # - if [ "${last_dir}" ]; then - set -- "$@" "--link-dest=${ddir}/${last_dir}" - _techo "Hard linking from ${last_dir}" - fi - - - # set time when we really begin to backup, not when we began to remove above - destination_date=$(${CDATE}) - destination_dir="${ddir}/${INTERVAL}.${destination_date}.$$" - destination_full="${destination}/${INTERVAL}.${destination_date}.$$" - - # give some info - _techo "Beginning to backup, this may take some time..." - - _techo "Creating ${destination_dir} ..." - pcmd mkdir ${VVERBOSE} "${destination_dir}" || \ - _exit_err "Creating ${destination_dir} failed. Skipping." - - # - # added marking in 0.6 (and remove it, if successful later) - # - pcmd touch "${destination_dir}.${c_marker}" - - # - # the rsync part - # - - _techo "Transferring files..." - rsync "$@" "${source}" "${destination_full}"; ret=$? - - # - # remove marking here - # - pcmd rm "${destination_dir}.${c_marker}" || \ - _exit_err "Removing ${destination_dir}/${c_marker} failed." - - _techo "Finished backup (rsync return code: $ret)." - if [ "${ret}" -ne 0 ]; then - _techo "Warning: rsync exited non-zero, the backup may be broken (see rsync errors)." - fi - - # - # post_exec - # - if [ -x "${c_post_exec}" ]; then - _techo "Executing ${c_post_exec} ..." - "${c_post_exec}"; ret=$? - _techo "Finished ${c_post_exec}." - - if [ ${ret} -ne 0 ]; then - _exit_err "${c_post_exec} failed." - fi - fi - - # Calculation - end_s=$(date +%s) - - full_seconds=$((${end_s} - ${begin_s})) - hours=$((${full_seconds} / 3600)) - seconds=$((${full_seconds} - (${hours} * 3600))) - minutes=$((${seconds} / 60)) - seconds=$((${seconds} - (${minutes} * 60))) - - _techo "Backup lasted: ${hours}:${minutes}:${seconds} (h:m:s)" - -) | add_name -done - -# -# Be a good parent and wait for our children, if they are running wild parallel -# -if [ "${PARALLEL}" ]; then - _techo "Waiting for children to complete..." - wait -fi - -# -# Look for post-exec command (general) -# -if [ -x "${CPOSTEXEC}" ]; then - _techo "Executing ${CPOSTEXEC} ..." - "${CPOSTEXEC}"; ret=$? - _techo "Finished ${CPOSTEXEC} (return code: ${ret})." - - if [ ${ret} -ne 0 ]; then - _techo "${CPOSTEXEC} failed." - fi -fi - -rm -f "${TMP}" -_techo "Finished ${WE}" diff --git a/contrib/jlawless-2009-06-03/old/ccollect-f.sh b/contrib/jlawless-2009-06-03/old/ccollect-f.sh deleted file mode 100755 index 5c8952e..0000000 --- a/contrib/jlawless-2009-06-03/old/ccollect-f.sh +++ /dev/null @@ -1,683 +0,0 @@ -#!/bin/sh -# -# 2005-2009 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Initially written for SyGroup (www.sygroup.ch) -# Date: Mon Nov 14 11:45:11 CET 2005 - -# -# Standard variables (stolen from cconf) -# -__pwd="$(pwd -P)" -__mydir="${0%/*}"; __abs_mydir="$(cd "$__mydir" && pwd -P)" -__myname=${0##*/}; __abs_myname="$__abs_mydir/$__myname" - -# -# where to find our configuration and temporary file -# -CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} -CSOURCES=${CCOLLECT_CONF}/sources -CDEFAULTS=${CCOLLECT_CONF}/defaults -CPREEXEC="${CDEFAULTS}/pre_exec" -CPOSTEXEC="${CDEFAULTS}/post_exec" - -TMP=$(mktemp "/tmp/${__myname}.XXXXXX") -VERSION=0.7.1 -RELEASE="2009-02-02" -HALF_VERSION="ccollect ${VERSION}" -FULL_VERSION="ccollect ${VERSION} (${RELEASE})" - -#TSORT="tc" ; NEWER="cnewer" -TSORT="t" ; NEWER="newer" - -# -# CDATE: how we use it for naming of the archives -# DDATE: how the user should see it in our output (DISPLAY) -# -CDATE="date +%Y%m%d-%H%M" -DDATE="date +%Y-%m-%d-%H:%M:%S" - -# -# unset parallel execution -# -PARALLEL="" - -# -# catch signals -# -trap "rm -f \"${TMP}\"" 1 2 15 - -# -# Functions -# - -# time displaying echo -_techo() -{ - echo "$(${DDATE}): $@" -} - -# exit on error -_exit_err() -{ - _techo "$@" - rm -f "${TMP}" - exit 1 -} - -add_name() -{ - awk "{ print \"[${name}] \" \$0 }" -} - -pcmd() -{ - if [ "$remote_host" ]; then - ssh "$remote_host" "$@" - else - "$@" - fi -} - -# -# Version -# -display_version() -{ - echo "${FULL_VERSION}" - exit 0 -} - -# -# Tell how to use us -# -usage() -{ - echo "${__myname}: [args] " - echo "" - echo " ccollect creates (pseudo) incremental backups" - echo "" - echo " -h, --help: Show this help screen" - echo " -p, --parallel: Parallelise backup processes" - echo " -a, --all: Backup all sources specified in ${CSOURCES}" - echo " -v, --verbose: Be very verbose (uses set -x)" - echo " -V, --version: Print version information" - echo "" - echo " This is version ${VERSION}, released on ${RELEASE}" - echo " (the first version was written on 2005-12-05 by Nico Schottelius)." - echo "" - echo " Retrieve latest ccollect at http://unix.schottelius.org/ccollect/" - exit 0 -} - -# -# Select interval if AUTO -# -# For this to work nicely, you have to choose interval names that sort nicely -# such as int1, int2, int3 or a_daily, b_weekly, c_monthly, etc. -# -auto_interval() -{ - if [ -d "${backup}/intervals" -a -n "$(ls "${backup}/intervals" 2>/dev/null)" ] ; then - intervals_dir="${backup}/intervals" - elif [ -d "${CDEFAULTS}/intervals" -a -n "$(ls "${CDEFAULTS}/intervals" 2>/dev/null)" ] ; then - intervals_dir="${CDEFAULTS}/intervals" - else - _exit_err "No intervals are defined. Skipping." - fi - echo intervals_dir=${intervals_dir} - - trial_interval="$(ls -1r "${intervals_dir}/" | head -n 1)" || \ - _exit_err "Failed to list contents of ${intervals_dir}/." - _techo "Considering interval ${trial_interval}" - most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${trial_interval}.*/$" | head -n 1)" || \ - _exit_err "Failed to list contents of ${ddir}/." - _techo " Most recent ${trial_interval}: '${most_recent}'" - if [ -n "${most_recent}" ]; then - no_intervals="$(ls -1 "${intervals_dir}/" | wc -l)" - n=1 - while [ "${n}" -le "${no_intervals}" ]; do - trial_interval="$(ls -p1 "${intervals_dir}/" | tail -n+${n} | head -n 1)" - _techo "Considering interval '${trial_interval}'" - c_interval="$(cat "${intervals_dir}/${trial_interval}" 2>/dev/null)" - m=$((${n}+1)) - set -- "${ddir}" -maxdepth 1 - while [ "${m}" -le "${no_intervals}" ]; do - interval_m="$(ls -1 "${intervals_dir}/" | tail -n+${m} | head -n 1)" - most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${interval_m}\..*/$" | head -n 1)" - _techo " Most recent ${interval_m}: '${most_recent}'" - if [ -n "${most_recent}" ] ; then - set -- "$@" -$NEWER "${ddir}/${most_recent}" - fi - m=$((${m}+1)) - done - count=$(pcmd find "$@" -iname "${trial_interval}*" | wc -l) - _techo " Found $count more recent backups of ${trial_interval} (limit: ${c_interval})" - if [ "$count" -lt "${c_interval}" ] ; then - break - fi - n=$((${n}+1)) - done - fi - export INTERVAL="${trial_interval}" - D_FILE_INTERVAL="${intervals_dir}/${INTERVAL}" - D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null) -} - -# -# need at least interval and one source or --all -# -if [ $# -lt 2 ]; then - if [ "$1" = "-V" -o "$1" = "--version" ]; then - display_version - else - usage - fi -fi - -# -# check for configuraton directory -# -[ -d "${CCOLLECT_CONF}" ] || _exit_err "No configuration found in " \ - "\"${CCOLLECT_CONF}\" (is \$CCOLLECT_CONF properly set?)" - -# -# Filter arguments -# -export INTERVAL="$1"; shift -i=1 -no_sources=0 - -# -# Create source "array" -# -while [ "$#" -ge 1 ]; do - eval arg=\"\$1\"; shift - - if [ "${NO_MORE_ARGS}" = 1 ]; then - eval source_${no_sources}=\"${arg}\" - no_sources=$((${no_sources}+1)) - - # make variable available for subscripts - eval export source_${no_sources} - else - case "${arg}" in - -a|--all) - ALL=1 - ;; - -v|--verbose) - VERBOSE=1 - ;; - -p|--parallel) - PARALLEL=1 - ;; - -h|--help) - usage - ;; - --) - NO_MORE_ARGS=1 - ;; - *) - eval source_${no_sources}=\"$arg\" - no_sources=$(($no_sources+1)) - ;; - esac - fi - - i=$(($i+1)) -done - -# also export number of sources -export no_sources - -# -# be really, really, really verbose -# -if [ "${VERBOSE}" = 1 ]; then - set -x -fi - -# -# Look, if we should take ALL sources -# -if [ "${ALL}" = 1 ]; then - # reset everything specified before - no_sources=0 - - # - # get entries from sources - # - cwd=$(pwd -P) - ( cd "${CSOURCES}" && ls > "${TMP}" ); ret=$? - - [ "${ret}" -eq 0 ] || _exit_err "Listing of sources failed. Aborting." - - while read tmp; do - eval source_${no_sources}=\"${tmp}\" - no_sources=$((${no_sources}+1)) - done < "${TMP}" -fi - -# -# Need at least ONE source to backup -# -if [ "${no_sources}" -lt 1 ]; then - usage -else - _techo "${HALF_VERSION}: Beginning backup using interval ${INTERVAL}" -fi - -# -# Look for pre-exec command (general) -# -if [ -x "${CPREEXEC}" ]; then - _techo "Executing ${CPREEXEC} ..." - "${CPREEXEC}"; ret=$? - _techo "Finished ${CPREEXEC} (return code: ${ret})." - - [ "${ret}" -eq 0 ] || _exit_err "${CPREEXEC} failed. Aborting" -fi - -# -# check default configuration -# - -D_FILE_INTERVAL="${CDEFAULTS}/intervals/${INTERVAL}" -D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null) - - -# -# Let's do the backup -# -i=0 -while [ "${i}" -lt "${no_sources}" ]; do - - # - # Get current source - # - eval name=\"\$source_${i}\" - i=$((${i}+1)) - - export name - - # - # start ourself, if we want parallel execution - # - if [ "${PARALLEL}" ]; then - "$0" "${INTERVAL}" "${name}" & - continue - fi - -# -# Start subshell for easy log editing -# -( - # - # Stderr to stdout, so we can produce nice logs - # - exec 2>&1 - - # - # Configuration - # - backup="${CSOURCES}/${name}" - c_source="${backup}/source" - c_dest="${backup}/destination" - c_exclude="${backup}/exclude" - c_verbose="${backup}/verbose" - c_vverbose="${backup}/very_verbose" - c_rsync_extra="${backup}/rsync_options" - c_summary="${backup}/summary" - c_pre_exec="${backup}/pre_exec" - c_post_exec="${backup}/post_exec" - f_incomplete="delete_incomplete" - c_incomplete="${backup}/${f_incomplete}" - c_remote_host="${backup}/remote_host" - - # - # Marking backups: If we abort it's not removed => Backup is broken - # - c_marker=".ccollect-marker" - - # - # Times - # - begin_s=$(date +%s) - - # - # unset possible options - # - EXCLUDE="" - RSYNC_EXTRA="" - SUMMARY="" - VERBOSE="" - VVERBOSE="" - DELETE_INCOMPLETE="" - - _techo "Beginning to backup" - - # - # Standard configuration checks - # - if [ ! -e "${backup}" ]; then - _exit_err "Source does not exist." - fi - - # - # configuration _must_ be a directory - # - if [ ! -d "${backup}" ]; then - _exit_err "\"${name}\" is not a cconfig-directory. Skipping." - fi - - # - # first execute pre_exec, which may generate destination or other - # parameters - # - if [ -x "${c_pre_exec}" ]; then - _techo "Executing ${c_pre_exec} ..." - "${c_pre_exec}"; ret="$?" - _techo "Finished ${c_pre_exec} (return code ${ret})." - - if [ "${ret}" -ne 0 ]; then - _exit_err "${c_pre_exec} failed. Skipping." - fi - fi - - # - # Destination is a path - # - if [ ! -f "${c_dest}" ]; then - _exit_err "Destination ${c_dest} is not a file. Skipping." - else - ddir=$(cat "${c_dest}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Destination ${c_dest} is not readable. Skipping." - fi - fi - - # - # interval definition: First try source specific, fallback to default - # - if [ ${INTERVAL} = "AUTO" ] ; then - auto_interval - _techo "Selected interval: '$INTERVAL'" - fi - c_interval="$(cat "${backup}/intervals/${INTERVAL}" 2>/dev/null)" - - if [ -z "${c_interval}" ]; then - c_interval="${D_INTERVAL}" - - if [ -z "${c_interval}" ]; then - _exit_err "No definition for interval \"${INTERVAL}\" found. Skipping." - fi - fi - - # - # Source checks - # - if [ ! -f "${c_source}" ]; then - _exit_err "Source description \"${c_source}\" is not a file. Skipping." - else - source=$(cat "${c_source}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Source ${c_source} is not readable. Skipping." - fi - fi - # Verify source is up and accepting connections before deleting any old backups - rsync "$source" >/dev/null || _exit_err "Source ${source} is not readable. Skipping." - - # - # do we backup to a remote host? then set pre-cmd - # - if [ -f "${c_remote_host}" ]; then - # adjust ls and co - remote_host=$(cat "${c_remote_host}"); ret="$?" - if [ "${ret}" -ne 0 ]; then - _exit_err "Remote host file ${c_remote_host} exists, but is not readable. Skipping." - fi - destination="${remote_host}:${ddir}" - else - remote_host="" - destination="${ddir}" - fi - export remote_host - - # - # check for existence / use real name - # - ( pcmd cd "$ddir" ) || _exit_err "Cannot change to ${ddir}. Skipping." - - - # - # Check whether to delete incomplete backups - # - if [ -f "${c_incomplete}" -o -f "${CDEFAULTS}/${f_incomplete}" ]; then - DELETE_INCOMPLETE="yes" - fi - - # NEW method as of 0.6: - # - insert ccollect default parameters - # - insert options - # - insert user options - - # - # rsync standard options - # - - set -- "$@" "--archive" "--delete" "--numeric-ids" "--relative" \ - "--delete-excluded" "--sparse" - - # - # exclude list - # - if [ -f "${c_exclude}" ]; then - set -- "$@" "--exclude-from=${c_exclude}" - fi - - # - # Output a summary - # - if [ -f "${c_summary}" ]; then - set -- "$@" "--stats" - fi - - # - # Verbosity for rsync - # - if [ -f "${c_vverbose}" ]; then - set -- "$@" "-vv" - elif [ -f "${c_verbose}" ]; then - set -- "$@" "-v" - fi - - # - # extra options for rsync provided by the user - # - if [ -f "${c_rsync_extra}" ]; then - while read line; do - set -- "$@" "$line" - done < "${c_rsync_extra}" - fi - - # - # Check for incomplete backups - # - pcmd ls -1 "$ddir/${INTERVAL}"*".${c_marker}" > "${TMP}" 2>/dev/null - - i=0 - while read incomplete; do - eval incomplete_$i=\"$(echo ${incomplete} | sed "s/\\.${c_marker}\$//")\" - i=$(($i+1)) - done < "${TMP}" - - j=0 - while [ "$j" -lt "$i" ]; do - eval realincomplete=\"\$incomplete_$j\" - _techo "Incomplete backup: ${realincomplete}" - if [ "${DELETE_INCOMPLETE}" = "yes" ]; then - _techo "Deleting ${realincomplete} ..." - pcmd rm $VVERBOSE -rf "${ddir}/${realincomplete}" || \ - _exit_err "Removing ${realincomplete} failed." - fi - j=$(($j+1)) - done - - # - # check if maximum number of backups is reached, if so remove - # use grep and ls -p so we only look at directories - # - count="$(pcmd ls -p1 "${ddir}" | grep "^${INTERVAL}\..*/\$" | wc -l \ - | sed 's/^ *//g')" || _exit_err "Counting backups failed" - - _techo "Existing backups: ${count} Total keeping backups: ${c_interval}" - - if [ "${count}" -ge "${c_interval}" ]; then - substract=$((${c_interval} - 1)) - remove=$((${count} - ${substract})) - _techo "Removing ${remove} backup(s)..." - - pcmd ls -${TSORT}p1r "$ddir" | grep "^${INTERVAL}\..*/\$" | \ - head -n "${remove}" > "${TMP}" || \ - _exit_err "Listing old backups failed" - - i=0 - while read to_remove; do - eval remove_$i=\"${to_remove}\" - i=$(($i+1)) - done < "${TMP}" - - j=0 - while [ "$j" -lt "$i" ]; do - eval to_remove=\"\$remove_$j\" - _techo "Removing ${to_remove} ..." - pcmd rm ${VVERBOSE} -rf "${ddir}/${to_remove}" || \ - _exit_err "Removing ${to_remove} failed." - j=$(($j+1)) - done - fi - - - # - # Check for backup directory to clone from: Always clone from the latest one! - # - # Depending on your file system, you may want to sort on: - # 1. mtime (modification time) with TSORT=t, or - # 2. ctime (last change time, usually) with TSORT=tc - last_dir="$(pcmd ls -${TSORT}p1 "${ddir}" | grep '/$' | head -n 1)" || \ - _exit_err "Failed to list contents of ${ddir}." - - # - # clone from old backup, if existing - # - if [ "${last_dir}" ]; then - set -- "$@" "--link-dest=${ddir}/${last_dir}" - _techo "Hard linking from ${last_dir}" - fi - - - # set time when we really begin to backup, not when we began to remove above - destination_date=$(${CDATE}) - destination_dir="${ddir}/${INTERVAL}.${destination_date}.$$" - destination_full="${destination}/${INTERVAL}.${destination_date}.$$" - - # give some info - _techo "Beginning to backup, this may take some time..." - - _techo "Creating ${destination_dir} ..." - pcmd mkdir ${VVERBOSE} "${destination_dir}" || \ - _exit_err "Creating ${destination_dir} failed. Skipping." - - # - # added marking in 0.6 (and remove it, if successful later) - # - pcmd touch "${destination_dir}.${c_marker}" - - # - # the rsync part - # - _techo "Transferring files..." - rsync "$@" "${source}" "${destination_full}"; ret=$? - # Correct the modification time: - pcmd touch "${destination_dir}" - - # - # remove marking here - # - if [ "$ret" -ne 12 ] ; then - pcmd rm "${destination_dir}.${c_marker}" || \ - _exit_err "Removing ${destination_dir}/${c_marker} failed." - fi - - _techo "Finished backup (rsync return code: $ret)." - if [ "${ret}" -ne 0 ]; then - _techo "Warning: rsync exited non-zero, the backup may be broken (see rsync errors)." - fi - - # - # post_exec - # - if [ -x "${c_post_exec}" ]; then - _techo "Executing ${c_post_exec} ..." - "${c_post_exec}"; ret=$? - _techo "Finished ${c_post_exec}." - - if [ ${ret} -ne 0 ]; then - _exit_err "${c_post_exec} failed." - fi - fi - - # Calculation - end_s=$(date +%s) - - full_seconds=$((${end_s} - ${begin_s})) - hours=$((${full_seconds} / 3600)) - seconds=$((${full_seconds} - (${hours} * 3600))) - minutes=$((${seconds} / 60)) - seconds=$((${seconds} - (${minutes} * 60))) - - _techo "Backup lasted: ${hours}:${minutes}:${seconds} (h:m:s)" - -) | add_name -done - -# -# Be a good parent and wait for our children, if they are running wild parallel -# -if [ "${PARALLEL}" ]; then - _techo "Waiting for children to complete..." - wait -fi - -# -# Look for post-exec command (general) -# -if [ -x "${CPOSTEXEC}" ]; then - _techo "Executing ${CPOSTEXEC} ..." - "${CPOSTEXEC}"; ret=$? - _techo "Finished ${CPOSTEXEC} (return code: ${ret})." - - if [ ${ret} -ne 0 ]; then - _techo "${CPOSTEXEC} failed." - fi -fi - -rm -f "${TMP}" -_techo "Finished ${WE}" - -# vim: set shiftwidth=3 tabstop=3 expandtab : diff --git a/contrib/jlawless-2009-06-03/old/d.patch b/contrib/jlawless-2009-06-03/old/d.patch deleted file mode 100644 index 7fae410..0000000 --- a/contrib/jlawless-2009-06-03/old/d.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ccollect-0.7.1-c.sh 2009-05-24 21:39:43.000000000 -0700 -+++ ccollect-0.7.1-d.sh 2009-05-24 21:47:09.000000000 -0700 -@@ -492,12 +492,12 @@ - if [ "${count}" -ge "${c_interval}" ]; then - substract=$((${c_interval} - 1)) - remove=$((${count} - ${substract})) - _techo "Removing ${remove} backup(s)..." - -- pcmd ls -p1 "$ddir" | grep "^${INTERVAL}\..*/\$" | \ -- sort -n | head -n "${remove}" > "${TMP}" || \ -+ pcmd ls -${TSORT}p1r "$ddir" | grep "^${INTERVAL}\..*/\$" | \ -+ head -n "${remove}" > "${TMP}" || \ - _exit_err "Listing old backups failed" - - i=0 - while read to_remove; do - eval remove_$i=\"${to_remove}\" diff --git a/contrib/jlawless-2009-06-03/old/e.patch b/contrib/jlawless-2009-06-03/old/e.patch deleted file mode 100644 index d277c06..0000000 --- a/contrib/jlawless-2009-06-03/old/e.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ccollect-0.7.1-d.sh 2009-05-24 21:47:09.000000000 -0700 -+++ ccollect-0.7.1-e.sh 2009-05-24 22:18:16.000000000 -0700 -@@ -560,12 +560,14 @@ - pcmd touch "${destination_dir}" - - # - # remove marking here - # -- pcmd rm "${destination_dir}.${c_marker}" || \ -- _exit_err "Removing ${destination_dir}/${c_marker} failed." -+ if [ "$ret" -ne 12 ] ; then -+ pcmd rm "${destination_dir}.${c_marker}" || \ -+ _exit_err "Removing ${destination_dir}/${c_marker} failed." -+ fi - - _techo "Finished backup (rsync return code: $ret)." - if [ "${ret}" -ne 0 ]; then - _techo "Warning: rsync exited non-zero, the backup may be broken (see rsync errors)." - fi diff --git a/contrib/jlawless-2009-06-03/old/f.patch b/contrib/jlawless-2009-06-03/old/f.patch deleted file mode 100644 index 3bedf34..0000000 --- a/contrib/jlawless-2009-06-03/old/f.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- ccollect-0.7.1-e.sh 2009-05-24 22:18:16.000000000 -0700 -+++ ccollect-0.7.1-f.sh 2009-05-24 22:19:50.000000000 -0700 -@@ -124,10 +124,64 @@ - echo " Retrieve latest ccollect at http://unix.schottelius.org/ccollect/" - exit 0 - } - - # -+# Select interval if AUTO -+# -+# For this to work nicely, you have to choose interval names that sort nicely -+# such as int1, int2, int3 or a_daily, b_weekly, c_monthly, etc. -+# -+auto_interval() -+{ -+ if [ -d "${backup}/intervals" -a -n "$(ls "${backup}/intervals" 2>/dev/null)" ] ; then -+ intervals_dir="${backup}/intervals" -+ elif [ -d "${CDEFAULTS}/intervals" -a -n "$(ls "${CDEFAULTS}/intervals" 2>/dev/null)" ] ; then -+ intervals_dir="${CDEFAULTS}/intervals" -+ else -+ _exit_err "No intervals are defined. Skipping." -+ fi -+ echo intervals_dir=${intervals_dir} -+ -+ trial_interval="$(ls -1r "${intervals_dir}/" | head -n 1)" || \ -+ _exit_err "Failed to list contents of ${intervals_dir}/." -+ _techo "Considering interval ${trial_interval}" -+ most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${trial_interval}.*/$" | head -n 1)" || \ -+ _exit_err "Failed to list contents of ${ddir}/." -+ _techo " Most recent ${trial_interval}: '${most_recent}'" -+ if [ -n "${most_recent}" ]; then -+ no_intervals="$(ls -1 "${intervals_dir}/" | wc -l)" -+ n=1 -+ while [ "${n}" -le "${no_intervals}" ]; do -+ trial_interval="$(ls -p1 "${intervals_dir}/" | tail -n+${n} | head -n 1)" -+ _techo "Considering interval '${trial_interval}'" -+ c_interval="$(cat "${intervals_dir}/${trial_interval}" 2>/dev/null)" -+ m=$((${n}+1)) -+ set -- "${ddir}" -maxdepth 1 -+ while [ "${m}" -le "${no_intervals}" ]; do -+ interval_m="$(ls -1 "${intervals_dir}/" | tail -n+${m} | head -n 1)" -+ most_recent="$(pcmd ls -${TSORT}p1 "${ddir}" | grep "^${interval_m}\..*/$" | head -n 1)" -+ _techo " Most recent ${interval_m}: '${most_recent}'" -+ if [ -n "${most_recent}" ] ; then -+ set -- "$@" -$NEWER "${ddir}/${most_recent}" -+ fi -+ m=$((${m}+1)) -+ done -+ count=$(pcmd find "$@" -iname "${trial_interval}*" | wc -l) -+ _techo " Found $count more recent backups of ${trial_interval} (limit: ${c_interval})" -+ if [ "$count" -lt "${c_interval}" ] ; then -+ break -+ fi -+ n=$((${n}+1)) -+ done -+ fi -+ export INTERVAL="${trial_interval}" -+ D_FILE_INTERVAL="${intervals_dir}/${INTERVAL}" -+ D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null) -+} -+ -+# - # need at least interval and one source or --all - # - if [ $# -lt 2 ]; then - if [ "$1" = "-V" -o "$1" = "--version" ]; then - display_version -@@ -344,12 +398,28 @@ - _exit_err "${c_pre_exec} failed. Skipping." - fi - fi - - # -+ # Destination is a path -+ # -+ if [ ! -f "${c_dest}" ]; then -+ _exit_err "Destination ${c_dest} is not a file. Skipping." -+ else -+ ddir=$(cat "${c_dest}"); ret="$?" -+ if [ "${ret}" -ne 0 ]; then -+ _exit_err "Destination ${c_dest} is not readable. Skipping." -+ fi -+ fi -+ -+ # - # interval definition: First try source specific, fallback to default - # -+ if [ ${INTERVAL} = "AUTO" ] ; then -+ auto_interval -+ _techo "Selected interval: '$INTERVAL'" -+ fi - c_interval="$(cat "${backup}/intervals/${INTERVAL}" 2>/dev/null)" - - if [ -z "${c_interval}" ]; then - c_interval="${D_INTERVAL}" - -@@ -371,22 +441,10 @@ - fi - # Verify source is up and accepting connections before deleting any old backups - rsync "$source" >/dev/null || _exit_err "Source ${source} is not readable. Skipping." - - # -- # Destination is a path -- # -- if [ ! -f "${c_dest}" ]; then -- _exit_err "Destination ${c_dest} is not a file. Skipping." -- else -- ddir=$(cat "${c_dest}"); ret="$?" -- if [ "${ret}" -ne 0 ]; then -- _exit_err "Destination ${c_dest} is not readable. Skipping." -- fi -- fi -- -- # - # do we backup to a remote host? then set pre-cmd - # - if [ -f "${c_remote_host}" ]; then - # adjust ls and co - remote_host=$(cat "${c_remote_host}"); ret="$?" diff --git a/contrib/lucky-2009-07-22/ccollect_logwrapper_destination.patch b/contrib/lucky-2009-07-22/ccollect_logwrapper_destination.patch deleted file mode 100644 index 5fb20b5..0000000 --- a/contrib/lucky-2009-07-22/ccollect_logwrapper_destination.patch +++ /dev/null @@ -1,14 +0,0 @@ -31c31,41 -< logdir="${LOGCONF}/destination" ---- -> c_dest="${LOGCONF}/destination" -> -> if [ ! -f ${c_dest} ]; then -> _exit_err "Destination ${c_dest} is not a file. Skipping." -> else -> logdir=$(cat "${c_dest}"); ret="$?" -> if [ "${ret}" -ne 0 ]; then -> _exit_err "Destination ${c_dest} is not readable. Skipping." -> fi -> fi -> diff --git a/contrib/lucky-2009-07-22/ccollect_stats.sh b/contrib/lucky-2009-07-22/ccollect_stats.sh deleted file mode 100644 index 886be09..0000000 --- a/contrib/lucky-2009-07-22/ccollect_stats.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# 2007 Daniel Aubry -# 2008 Nico Schottelius (added minimal header) -# -# Copying license: GPL2-only -# - -# TODO: -# add variables, add copying, add configuration - -if [ ! -e /tmp/ccollect-stats.lock ] -then - touch /tmp/ccollect-stats.lock - - # changes after license clearify - # for dest in /etc/ccollect/sources/ -type f -name destination | while read line - - find /etc/ccollect/sources/*/destination | while read line - do - d=$(basename $(cat $line)) - echo "====[Backup: $backupname]====" | tee -a /var/log/backup.log - du -sh $line/* | tee -a /var/log/backup.log - done - rm /tmp/ccollect-stats.lock -fi diff --git a/contrib/thorsten_start_ccollect/start_ccollect b/contrib/thorsten_start_ccollect/start_ccollect deleted file mode 100644 index 5a774ed..0000000 --- a/contrib/thorsten_start_ccollect/start_ccollect +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -# Backup-Ordner -BACKUP_DIR="/mnt" - -# ccollect_logwrapper-Skript -CCOLLECT_LOGWRAPPER="./ccollect_logwrapper.sh" - -# letzte Sicherung für Gruppe daily, weekly und monthly in Backup-Ordner ermitteln -DATE_DAILY=` ls $BACKUP_DIR | grep daily | sort -r | sed -e'2,$d' | cut -f 2 -d.` -DATE_WEEKLY=` ls $BACKUP_DIR | grep weekly | sort -r | sed -e'2,$d' | cut -f 2 -d.` -DATE_MONTHLY=`ls $BACKUP_DIR | grep monthly | sort -r | sed -e'2,$d' | cut -f 2 -d.` -DATE_YEARLY=` ls $BACKUP_DIR | grep yearly | sort -r | sed -e'2,$d' | cut -f 2 -d.` - -# Falls Leerstring diesen mit "altem Datum" füllen -if [ -z "$DATE_DAILY" ] ; then DATE_DAILY="20000101-0101" ; fi -if [ -z "$DATE_WEEKLY" ] ; then DATE_WEEKLY="20000101-0101" ; fi -if [ -z "$DATE_MONTHLY" ] ; then DATE_MONTHLY="20000101-0101" ; fi -if [ -z "$DATE_YEARLY" ] ; then DATE_YEARLY="20000101-0101" ; fi - -echo current: $DATE_CUR -echo last daily: $DATE_DAILY -echo last weekly: $DATE_WEEKLY -echo last monthly: $DATE_MONTHLY -echo last yearly: $DATE_YEARLY - -# Datum date-konform wandeln -# Achtung: mit bash - nicht mit sh möglich! -# Alternativ mit expr... konvertieren - -DATE_DAILY=${DATE_DAILY:0:4}-${DATE_DAILY:4:2}-${DATE_DAILY:6:2}" "${DATE_DAILY:9:2}:${DATE_DAILY:11:2}:00 -DATE_WEEKLY=${DATE_WEEKLY:0:4}-${DATE_WEEKLY:4:2}-${DATE_WEEKLY:6:2}" "${DATE_WEEKLY:9:2}:${DATE_WEEKLY:11:2}:00 -DATE_MONTHLY=${DATE_MONTHLY:0:4}-${DATE_MONTHLY:4:2}-${DATE_MONTHLY:6:2}" "${DATE_MONTHLY:9:2}:${DATE_MONTHLY:11:2}:00 -DATE_YEARLY=${DATE_YEARLY:0:4}-${DATE_YEARLY:4:2}-${DATE_YEARLY:6:2}" "${DATE_YEARLY:9:2}:${DATE_YEARLY:11:2}:00 -DATE_CUR=`date "+%Y-%m-%d %T"` - -# Bei Bedarf Backups durchführen - -if [ `date --date "$DATE_YEARLY" +%Y` -ne `date --date "$DATE_CUR" +%Y` ] -then - - # Jahresbackup erzeugen - echo monthly backup started - source $CCOLLECT_LOGWRAPPER -a yearly - -elif [ `date --date "$DATE_MONTHLY" +%Y%m` -ne `date --date "$DATE_CUR" +%Y%m` ] -then - - # Monatsbackup erzeugen - echo monthly backup started - source $CCOLLECT_LOGWRAPPER -a monthly - -elif [ `date --date "$DATE_WEEKLY" +%Y%W` -ne `date --date "$DATE_CUR" +%Y%W` ] -then - - # Wochenbackup erzeugen - echo weekly backup started - source $CCOLLECT_LOGWRAPPER -a weekly - -elif [ `date --date "$DATE_DAILY" +%Y%j` -ne `date --date "$DATE_CUR" +%Y%j` ] -then - - # Tagesbackup erzeugen - echo daily backup started - source $CCOLLECT_LOGWRAPPER -a daily - -else - - # nichts zu tun - echo nothing to do - -fi diff --git a/doc/CHANGES b/doc/CHANGES new file mode 100644 index 0000000..5ec56de --- /dev/null +++ b/doc/CHANGES @@ -0,0 +1,20 @@ +0.3.1 to 0.3.2: + * ccollect now prints the start time, end time and duration of the backup + +0.3 to 0.3.1: + * added support for printing a summary + * some cosmetic changes + +0.2 to 0.3: + * added "very_verbose" + * normal "verbose" is now less verbose + * added general 'pre_exec' and 'post_exec' support + * added source specfifc 'pre_exec' and 'post_exec' support + +0.1 to 0.2: + * Added plausibility check + * Updated and made documentation readable + * implemented verbose option + * Fixed double exclude parameter bug + * Added much better documentation (asciidoc) + * added rsync extra parameter option diff --git a/doc/HACKING b/doc/HACKING deleted file mode 100644 index 00db4d1..0000000 --- a/doc/HACKING +++ /dev/null @@ -1,37 +0,0 @@ -Hello Hacker, - -I really appreciate your interest in hacking this software, but -I am kind of critical when seeing patches. Thus I created this -file to give you some hints of my thinking quirks. - - -Submitting patches ------------------- -Make my life easier, make your life easier, use a version control system (vcs). -For this software the preferred vcs is git. Clone the latest repo, create -a new local branch (git checkout -b ) write down your ideas. - -When you're done, push all your stuff out to some public repo and drop a -mail to the mailinglist, what you did and where to get it. - - -Introduce a feature or change behaviour ---------------------------------------- -Uhh, fancy! You have had a great idea, then it's time to change -the major version, so others know that something changed. - -If the configuration format is changed, add a script to tools/ -to allow users upgrade their configuration to this major version. - -And now comes the most difficult part: Add documentation. Nobody -benefits from your cool feature, if it is not known. I know, writing -documentation is not so much fun, but you also expect good documentation -for this software, don't you? - - -If you think my thinking quirks must be corrected -------------------------------------------------- -See above ("Submitting patches") and submit a patch to this file. - - -Thanks for reading. diff --git a/doc/TODO b/doc/TODO new file mode 100644 index 0000000..25f2078 --- /dev/null +++ b/doc/TODO @@ -0,0 +1,34 @@ +- update documentation: + - exit pre/post exec -> error codes (after implementation!) (in 0.4) +- write mkccollectconfig + o create source configuration + o another script for changing defaults + x intervalls + x pre-/post exec + o (X)dialog based + +- implement pre- and post-exec commands + o what to do with return values? + -> Check them, abort on error + +- Documentation + - write/generate a manpage + + +DONE +- implement verbosity + o per source (-v to rsync) + o general, very verbose (set -x) +- implement parallel execution +- implement general log +- implement source specific log (canceled) +- the name prefix is currently somehow inconsistent +- Documentation + - rsync_options, example paswd + - write a simple manual + - Hints section + - add note to --exclude=/proc/ vs. --exclude=/proc/* + - rsync_options \n seperated +- implement pre- and post-exec commands + o For the general backup process + o source specific diff --git a/doc/ccollect-restoring.text b/doc/ccollect-restoring.text deleted file mode 100644 index 8a3e11b..0000000 --- a/doc/ccollect-restoring.text +++ /dev/null @@ -1,196 +0,0 @@ -ccollect - Restoring backups -============================ -Nico Schottelius -0.1, for all ccollect version, Initial Version from 2008-07-04 -:Author Initials: NS - - -Having backups is half the way to success on a failure. -Knowing how to restore the systems is the other half. - - -Introduction ------------- -You made your backup and now you want to restore your -data. If you backuped only parts of a computer and need -only to restore them, it is pretty easy to achieve. -Restoring a whole system is a little bit more -difficult and needs some knowledge of the operating system. - - -Restoring parts of a system -~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Log into your backupserver. Change into the -backup directory you want to restore from. -Do `rsync -av './files/to/be/recovered/' 'sourcehost:/files/to/be/recovered/'. - -Restoring a complete system (general) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Boot the system to be rescued from a media that contains low level tools -for your OS (like partitioning, formatting) and the necessary tools -(ssh, tar or rsync). -Use -- create the necessary volumes (like partitions, slices, ...) - -Get a live-cd, that ships with -- rsync / tar -- ssh (d) -> from backupserver -- support for the filesystems - -Restoring a complete FreeBSD system -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Get a FreeBSD-live-cd (I used the FreeBSD 7.0 live CD, -but FreeSBIE (http://www.freesbie.org/), -Frenzy (http://frenzy.org.ua/en/) or the -FreeBSD LiveCD (http://livecd.sourceforge.net/) -may also be helpful. The following way uses the FreeBSD 7.0 -live cd. - -So boot it up, select your language. After that select -*Custom* then *Partition*. Create the slice like you want -to have it. Then let the installer write into the MBR, -select *BootMgr*. - -After that create the necessary labels, select *Label* and -make sure "Newfs" flag is set to "Y". - -Finally, select *Commit* and choose an installation type -that must fail, because we want the installer only to write -the partitions and labels, but not to install anything on it. - -At this point we have created the base for restoring the whole -system. Move back to the main menu and select *Fixit*, then -*CDROM/DVD*. This starts a shell on TTY4, which can be reached -by pressing *ALT+F4*. Then enter the following data: - --------------------------------------------------------------------------------- - rootdir=/ccollect - rootdev=/dev/ad0s1a - backupserver=192.42.23.5 - - # create destination directory - mkdir "$rootdir" - - # mount root; add other mounts if you created more labels - mount "$rootdev" "$rootdir" - - # find out which network devices exist - ifconfig - - # create the directory, because dhclient needs it - mkdir /var/db - - # retrieve an ip address - dhclient fxp0 - - # test connection - ssh "$backupserver" - - # go back - backupserver% exit --------------------------------------------------------------------------------- - -Now we've prepared everything for the real backup. The next problem maybe, -that we cannot (should not) be able to login as root to the backup server. -Additionally the system to be restored may not reachable from the backup server, -because it is behind a firewall or nat. -Thus I describe a way, that is a little bit more complicated for those, that -do not have these limitations, but works in both scenarios. - -I just start netcat on the local machine, pipe its output to tar and put -both into the background. Then I create a ssh tunnel to the backupserver, -which is then able to connect to my netcat "directly". - --------------------------------------------------------------------------------- - # user to connect to the backupserver - myuser=nico - - # our name in the backup - restorehost=server1 - - # the instance to be used - backup="weekly.20080718-2327.23053" - - # Need to setup lo0 first, the livecd did not do it for me - ifconfig lo0 127.0.0.1 up - - # change to the destination directory - cd "$rootdir" - - # start listener - ( nc -l 127.0.0.1 4242 | tar xvf - ) & - - # verify that it runs correctly - sockstat -4l - - # connect as a normal user to the backupserver - ssh -R4242:127.0.0.1:4242 "$myuser@$backupserver" - - # become root - backupserver% su - - - # change to the source directory - backupserver# cd /home/server/backup/$restorehost/$backup - - # begin the backup - backup # tar cf - . | nc 127.0.0.1 4242 - - # wait until it finishes, press ctrl-c to kill netcat - # logoff the backupserver - backupserver# exit - backupserver% exit --------------------------------------------------------------------------------- - -Now we are just right next to be finished. Still, we have to take care about -some things: - -- Do the block devices still have the same names? If not, correct /etc/fstab. -- Do the network devices still have the same names? If not, correct /etc/rc.conf. - -If everything is fixed, let us finish the restore: - --------------------------------------------------------------------------------- - # cleanly umount it - umount "$rootdir" - - # reboot, remove the cd and bootup the restored system - reboot --------------------------------------------------------------------------------- - -Restoring a complete Linux system -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Knoppix - knoppix 2 at boot prompt - - rootdir=/ccollect - dev=/dev/hda - rootdev="${dev}1" - fs=jfs - tar - - # create the needed partitions - cfdisk $dev - - mkfs.$fs $rootdev - - mkdir $rootdir - - mount $rootdev $rootdir - - cd $rootdir - - pump - ifconfig - - # start listener (from now on it is the same as - ( nc -l 127.0.0.1 4242 | tar xvf - ) & - - - -TO BE DONE - -Future ------- -I think about automating full system recoveries in the future. -I think it could be easily done and here are some hints for -people who would like to implement it. diff --git a/doc/ccollect.html b/doc/ccollect.html new file mode 100644 index 0000000..102acfa --- /dev/null +++ b/doc/ccollect.html @@ -0,0 +1,841 @@ + + + + + + +ccollect - Installing, Configuring and Using + + + +
+
+

(pseudo) incremental backup +with different exclude lists +using hardlinks and rsync

+
+
+

1. Introduction

+
+

ccollect is a backup utitily written in the sh-scripting language. +It does not depend on a specific shell, only /bin/sh needs to be +bourne shell compatibel (like dash, ksh, zsh, bash, …).

+

1.1. Why you can only backup TO localhost

+

While thinking about the design of ccollect, I thought about enabling +backup to remote hosts. Though this sounds like a nice feature +(Backup my notebook to the server now.), it is in my opinion a +bad idea to backup to a remote host, because you have to open +security at your backup host. Think of the following situation: You backup +your farm of webservers to a backup host somewhere else. One of +your webservers gets compromised, then your backup server will be compromised, +too. Think of it the other way round: The backup server (now behind a +firewall using NAT and strong firewall rules) connects to the +webservers and pulls the data to it. If someone gets access to the +webserver, the person will perhaps not even see your machine. If +he/she sees that there are connections from a host to the compromised +machine, he/she will not be able to login to the backup machine. +All other backups are still secure.

+
+

2. Requirements

+
+

2.1. Installing ccollect

+

For the installation, you need at least

+
    +
  • +

    +either cp and chmod or install +

    +
    • +
  • +

    +for more comfort: make +

    +
    • +
  • +

    +for rebuilding the generated documentation: additionally asciidoc +

    +
    • +
+

2.2. Using ccollect

+
Running ccollect requires the following tools installed:
    +
  • +

    +bc +

    +
    • +
  • +

    +cp with support for hard links (cp -al) +

    +
    • +
  • +

    +date +

    +
    • +
  • +

    +rsync +

    +
    • +
  • +

    +ssh (if you want to use rsync over ssh, which is recommened for security) +

    +
    • +
+
+

3. Installing

+
+

Either type make install or simply copy it to a directory in your +$PATH and execute chmod 0755 /path/to/ccollect.sh.

+
+

4. Configuring

+
+

4.1. Runtime options

+

ccollect looks for its configuration in /etc/ccollect or, if set, in +the directory specified by the variable $CCOLLECT_CONF +(use CCOLLECT_CONF=/your/config/dir ccollect.sh on the shell).

+

When you start ccollect, you have either to specify which intervall +to backup (daily, weekly, yearly; you can specify the names yourself, see below).

+

The intervall is used to specify how many backups to keep.

+

There are also some self explaining parameters you can pass to ccollect, simply use +"ccollect.sh —help" for info.

+

4.2. General configuration

+

The general configuration can be found below $CCOLLECT_CONF/defaults or +/etc/ccollect/defaults. All options specified here are generally valid for +all source definitions. Though the values can be overwritten in the source +configuration.

+

All configuration entries are plain-text (use UTF-8 if you use +non ASCII characters) files.

+

4.2.1. Intervall definition

+

The intervall definition can be found below +$CCOLLECT_CONF/defaults/intervalls/ or /etc/ccollect/defaults/intervalls. +Every file below this directory specifies an intervall. The name of the file is the +name of the intervall: intervalls/<intervall name>.

+

The content of this file should be a single line containing a number. +This number defines how many versions of this intervall to keep.

+

Example:

+
+
+
   [10:23] zaphodbeeblebrox:ccollect-0.2% ls -l conf/defaults/intervalls/
+   insgesamt 12
+   -rw-r--r--  1 nico users 3 2005-12-08 10:24 daily
+   -rw-r--r--  1 nico users 3 2005-12-08 11:36 monthly
+   -rw-r--r--  1 nico users 2 2005-12-08 11:36 weekly
+   [10:23] zaphodbeeblebrox:ccollect-0.2% cat conf/defaults/intervalls/*
+   28
+   12
+   4
+
+

This means to keep 28 daily backups, 12 monthly backups and 4 weekly.

+

4.2.2. General pre- and post-execution

+

If you add $CCOLLECT_CONF/defaults/pre_exec or +/etc/ccollect/defaults/pre_exec (same with post_exec), ccollect +will start pre_exec before the whole backup process and +post_exec after backup of all sources is done.

+

The following Example describes how to report free disk space in +human readable format before and after the whole backup process:

+
+
+
[13:00] hydrogenium:~# mkdir -p /etc/ccollect/defaults/
+[13:00] hydrogenium:~# echo '!/bin/sh' >  /etc/ccollect/defaults/pre_exec
+[13:01] hydrogenium:~# echo ''         >> /etc/ccollect/defaults/pre_exec
+[13:01] hydrogenium:~# echo 'df -h'    >> /etc/ccollect/defaults/pre_exec
+[13:01] hydrogenium:~# chmod 0755 /etc/ccollect/defaults/pre_exec
+[13:01] hydrogenium:~# ln -s /etc/ccollect/defaults/pre_exec /etc/ccollect/defaults/post_exec
+
+

4.3. Source configuration

+

Each source configuration exists below $CCOLLECT_CONF/sources/$name or +/etc/ccollect/sources/$name.

+

The name you choose for the subdirectory describes the source.

+

Each source has at least the following files:

+
    +
  • +

    +source (a text file containing the rsync compatible path to backup) +

    +
    • +
  • +

    +destination (a link to the directory we should backup to) +

    +
    • +
+

Additionally a source may have the following files:

+
    +
  • +

    +verbose whether to be verbose (passes -v to rsync) +

    +
    • +
  • +

    +very_verbose be very verbose (-v also for mkdir, cp, rm) +

    +
    • +
  • +

    +summary create a transfer summary when rsync finished +

    +
    • +
  • +

    +exclude exclude list for rsync. newline (\n) seperated list. +

    +
    • +
  • +

    +rsync_options' extra options to pass to `rsync +

    +
    • +
  • +

    +pre_exec program to execute before backuping this source +

    +
    • +
  • +

    +post_exec program to execute after backuping this source +

    +
    • +
+

Example:

+
+
+
   [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l  conf/sources/testsource2
+   insgesamt 12
+   lrwxrwxrwx  1 nico users   20 2005-11-17 16:44 destination -> /home/nico/backupdir
+   -rw-r--r--  1 nico users   62 2005-12-07 17:43 exclude
+   drwxr-xr-x  2 nico users 4096 2005-12-07 17:38 intervalls
+   -rw-r--r--  1 nico users   15 2005-11-17 16:44 source
+   [10:47] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/exclude
+   openvpn-2.0.1.tar.gz
+   nicht_reinnehmen
+   etwas mit leerzeichenli
+   [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l  conf/sources/testsource2/intervalls
+   insgesamt 4
+   -rw-r--r--  1 nico users 2 2005-12-07 17:38 daily
+   [10:48] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/intervalls/daily
+   5
+   [10:48] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/source
+   /home/nico/vpn
+
+

4.3.1. Detailled description of "source"

+

source describes a rsync compatible source (one line only).

+

For instance backup_user@foreign_host:/home/server/video. +To use the rsync protocol without the ssh-tunnel, use +rsync::USER@HOST/SRC. For more information have a look at rsync(1).

+

4.3.2. Detailled description of "verbose"

+

verbose tells ccollect that the log should contain verbose messages.

+

If this file exists in the source specification -v will be passed to rsync.

+

Example:

+
+
+
   [11:35] zaphodbeeblebrox:ccollect-0.2% touch conf/sources/testsource1/verbose
+
+

4.3.3. Detailled description of "very_verbose"

+

very_verbose tells ccollect that it should log very verbose.

+

If this file exists in the source specification -v will be passed to +rsync, cp, rm and mkdir.

+

Example:

+
+
+
   [23:67] nohost:~% touch conf/sources/testsource1/very_verbose
+
+

4.3.4. Detailled description of "summary"

+

If you create the file summary below the source definition, +ccollect will present you with a nice summary at the end.

+
+
+
backup:~# touch /etc/ccollect/sources/root/summary
+backup:~# ccollect.sh werktags root
+==> ccollect.sh: Beginning backup using intervall werktags <==
+[root] Beginning to backup this source ...
+[root] Currently 3 backup(s) exist, total keeping 50 backup(s).
+[root] Beginning to backup, this may take some time...
+[root] Hard linking...
+[root] Transferring files...
+[root]
+[root] Number of files: 84183
+[root] Number of files transferred: 32
+[root] Total file size: 26234080536 bytes
+[root] Total transferred file size: 9988252 bytes
+[root] Literal data: 9988252 bytes
+[root] Matched data: 0 bytes
+[root] File list size: 3016771
+[root] File list generation time: 1.786 seconds
+[root] File list transfer time: 0.000 seconds
+[root] Total bytes sent: 13009119
+[root] Total bytes received: 2152
+[root]
+[root] sent 13009119 bytes  received 2152 bytes  2891393.56 bytes/sec
+[root] total size is 26234080536  speedup is 2016.26
+[root] Successfully finished backup.
+==> Finished ccollect.sh <==
+
+

You could also combine it with verbose or very_verbose, but they +already print some statistics (but not all / the same as presented by +summary).

+

4.3.5. Detailled description of "exclude"

+

exclude specifies a list of paths to exclude. The entries are new line (\n) +seperated.

+

Example:

+
+
+
   [11:35] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/exclude
+   openvpn-2.0.1.tar.gz
+   nicht_reinnehmen
+   etwas mit leerzeichenli
+   something with spaces is not a problem
+
+

4.3.6. Detailled description of "destination"

+

destination must be a link to the destination directory.

+

Example:

+
+
+
   [11:36] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2/destination
+   lrwxrwxrwx  1 nico users 20 2005-11-17 16:44 conf/sources/testsource2/destination -> /home/nico/backupdir
+
+

4.3.7. Detailled description of "intervalls/"

+

When you create a subdirectory intervalls/ within your source configuration +directory, you can specify individiual intervalls for this specific source. +Each file below this directory describes an intervall.

+

Example:

+
+
+
   [11:37] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2/intervalls/
+   insgesamt 8
+   -rw-r--r--  1 nico users 2 2005-12-07 17:38 daily
+   -rw-r--r--  1 nico users 3 2005-12-14 11:33 yearly
+   [11:37] zaphodbeeblebrox:ccollect-0.2% cat  conf/sources/testsource2/intervalls/*
+   5
+   20
+
+

4.3.8. Detailled description of "rsync_options"

+

When you create the file rsync_options below your source configuration, +all the parameters found in this file will be passed to rsync. This +way you can pass additional options to rsync. For instance you can tell rsync +to show progress ("—progress") or which -password-file ("—password-file") +to use for automatic backup over the rsync-protocol.

+

Example:

+
+
+
   [23:42] hydrogenium:ccollect-0.2% cat conf/sources/test_rsync/rsync_options
+   --password-file=/home/user/backup/protected_password_file
+
+

4.3.9. Detailled description of "pre_exec" and "post_exec"

+

When you create pre_exec and / or post_exec below your source +configuration, ccollect will execute this command before, +respective after doing the backup for this specific source. +If you want to have pre-/post-exec before and after all +backups, see above for general configuration.

+

Example:

+
+
+
[13:09] hydrogenium:ccollect-0.3% cat conf/sources/with_exec/pre_exec
+#!/bin/sh
+
+# Show whats free before
+df -h
+[13:09] hydrogenium:ccollect-0.3% cat conf/sources/with_exec/post_exec
+#!/bin/sh
+
+# Show whats free after
+df -h
+
+
+

5. Hints

+
+

5.1. Using rsync protocol without ssh

+

When you have a computer with little computing power, it may be useful to use +rsync without ssh, directly using the rsync protocol +(specify user@host::share in source). You may wish to use +rsync_options to specify a password file to use for automatic backup.

+

Example:

+
+
+
backup:~# cat /etc/ccollect/sources/sample.backup.host.org/source
+backup@webserver::backup-share
+
+backup:~# cat /etc/ccollect/sources/sample.backup.host.org/rsync_options
+--password-file=/etc/ccollect/sources/sample.backup.host.org/rsync_password
+
+backup:~# cat /etc/ccollect/sources/sample.backup.host.org/rsync_password
+this_is_the_rsync_password
+
+

This hint was reported by Daniel Aubry.

+

5.2. Not-excluding top-level directories

+

When you exclude "/proc" or "/mnt" from your backup, you may run into +trouble when you restore your backup. When you use "/proc/*" or "/mnt/*" +instead ccollect will backup empty directories.

+
+ + + +
+
Note
+		 +

When those directories contain hidden files +(those beginning with a dot (.)), +they will still be transferred!

+
+
+

This hint was reported by Marcus Wagner.

+

5.3. Re-using already created rsync-backups

+

If you used rsync directly before you use ccollect, you can +use this old backup as initial backup for ccollect: You +simply move it into a subdirectory named "intervall.0".

+

Example:

+
+
+
backup:/home/backup/web1# ls
+bin   dev  etc   initrd  lost+found  mnt  root  srv  usr  vmlinuz
+boot  doc  home  lib     media       opt  sbin  tmp  var  vmlinuz.old
+
+backup:/home/backup/web1# mkdir daily.0
+
+# ignore error about copying to itself
+backup:/home/backup/web1# mv * daily.0 2>/dev/null
+
+backup:/home/backup/web1# ls
+daily.0
+
+

Now you could use /home/backup/web1 as the destination for the backup.

+
+ + + +
+
Note
+		 +

Do not name the first backup something like "daily.initial", but use +the "0" (or some very low number, at least lower than the current year) +as extension. ccollect uses sort to find the latest backup. ccollect +itself uses intervall.YEAR-MONTH-DAY-HOUR:MINUTE.PID. This notation will +always be before "daily.initial", as numbers are earlier in the list +which is produced by sort. So, if you have a directory named "daily.initial", +ccollect will always diff against this backup and transfer and delete +files which where deleted in previous backups. This means you simply +waste resources, but your backup will be complete.

+
+
+

5.4. Using pre_/post_exec

+

Your pre_/post_exec script does not need to be a script, you can also +use a link to

+
    +
  • +

    +an existing program +

    +
    • +
  • +

    +an already written script +

    +
    • +
+

The only requirement is that it is executable.

+
+

6. F.A.Q.

+
+

6.1. What happens, if one backup is broken or empty?

+

Let us assume, that one backup failed (connection broke or hard disk had +some failures). So we've one backup in our history, which is incomplete.

+

The next time you use ccollect, it will transfer the missing files

+

6.2. When backing up from localhost the destination is also included. Is this a bug?

+

No. ccollect passes your source definition directly to rsync. It +does not try to analyze it. So it actually does not know if a source +comes from local harddisk or from a remote server. And it does not want +to. When you backup from the local harddisk (which is perhaps not +even a good idea when thinking of security) add the destination +to source/exclude. (Daniel Aubry reported this problem)

+

6.3. Why does ccollect say "Permission denied" with my pre-/postexec script?

+

The most common error is to not give your script the correct +permissions. Try chmod 0755 /etc/ccollect/sources/yoursource/*_exec`.

+
+

7. Examples

+
+

7.1. A backup host configuration from scratch

+
+
+
srwali01:~# mkdir /etc/ccollect
+srwali01:~# mkdir -p /etc/ccollect/defaults/intervalls/
+srwali01:~# echo 28 > /etc/ccollect/defaults/intervalls/taeglich
+srwali01:~# echo 52 > /etc/ccollect/defaults/intervalls/woechentlich
+srwali01:~# cd /etc/ccollect/
+srwali01:/etc/ccollect# mkdir sources
+srwali01:/etc/ccollect# cd sources/
+srwali01:/etc/ccollect/sources# ls
+srwali01:/etc/ccollect/sources# mkdir local-root
+srwali01:/etc/ccollect/sources# cd local-root/
+srwali01:/etc/ccollect/sources/local-root# echo / > source
+srwali01:/etc/ccollect/sources/local-root# cat > exclude << EOF
+> /proc
+> /sys
+> /mnt
+> EOF
+srwali01:/etc/ccollect/sources/local-root# ln -s /mnt/hdbackup/local-root destination
+srwali01:/etc/ccollect/sources/local-root# mkdir /mnt/hdbackup/local-root
+srwali01:/etc/ccollect/sources/local-root# ccollect.sh taeglich local-root
+/o> ccollect.sh: Beginning backup using intervall taeglich
+/=> Beginning to backup "local-root" ...
+|-> 0 backup(s) already exist, keeping 28 backup(s).
+
+

After that, I added some more sources:

+
+
+
srwali01:~# cd /etc/ccollect/sources
+srwali01:/etc/ccollect/sources# mkdir windos-wl6
+srwali01:/etc/ccollect/sources# cd windos-wl6/
+srwali01:/etc/ccollect/sources/windos-wl6# echo /mnt/win/SYS/WL6 > source
+srwali01:/etc/ccollect/sources/windos-wl6# ln -s /mnt/hdbackup/wl6 destination
+srwali01:/etc/ccollect/sources/windos-wl6# mkdir /mnt/hdbackup/wl6
+srwali01:/etc/ccollect/sources/windos-wl6# cd ..
+srwali01:/etc/ccollect/sources# mkdir windos-daten
+srwali01:/etc/ccollect/sources/windos-daten# echo /mnt/win/Daten > source
+srwali01:/etc/ccollect/sources/windos-daten# ln -s /mnt/hdbackup/windos-daten destination
+srwali01:/etc/ccollect/sources/windos-daten# mkdir /mnt/hdbackup/windos-daten
+
+# Now add some remote source
+srwali01:/etc/ccollect/sources/windos-daten# cd ..
+srwali01:/etc/ccollect/sources# mkdir srwali03
+srwali01:/etc/ccollect/sources# cd srwali03/
+srwali01:/etc/ccollect/sources/srwali03# cat > exclude << EOF
+> /proc
+> /sys
+> /mnt
+> /home
+> EOF
+srwali01:/etc/ccollect/sources/srwali03# echo 'root@10.103.2.3:/' > source
+srwali01:/etc/ccollect/sources/srwali03# ln -s /mnt/hdbackup/srwali03 destination
+srwali01:/etc/ccollect/sources/srwali03# mkdir /mnt/hdbackup/srwali03
+
+

7.2. Using hard-links requires less disk space

+
+
+
# du (coreutils) 5.2.1
+[10:53] srsyg01:sources% du -sh ~/backupdir
+4.6M    /home/nico/backupdir
+[10:53] srsyg01:sources% du -sh ~/backupdir/*
+4.1M    /home/nico/backupdir/daily.2005-12-08-10:52.28456
+4.1M    /home/nico/backupdir/daily.2005-12-08-10:53.28484
+4.1M    /home/nico/backupdir/daily.2005-12-08-10:53.28507
+4.1M    /home/nico/backupdir/daily.2005-12-08-10:53.28531
+4.1M    /home/nico/backupdir/daily.2005-12-08-10:53.28554
+4.1M    /home/nico/backupdir/daily.2005-12-08-10:53.28577
+
+srwali01:/etc/ccollect/sources# du -sh /mnt/hdbackup/wl6/
+186M    /mnt/hdbackup/wl6/
+srwali01:/etc/ccollect/sources# du -sh /mnt/hdbackup/wl6/*
+147M    /mnt/hdbackup/wl6/taeglich.2005-12-08-14:42.312
+147M    /mnt/hdbackup/wl6/taeglich.2005-12-08-14:45.588
+
+

The backup of our main fileserver:

+
+
+
backup:~# df -h /home/backup/srsyg01/
+Filesystem            Size  Used Avail Use% Mounted on
+/dev/mapper/backup--01-srsyg01
+                      591G  451G  111G  81% /home/backup/srsyg01
+backup:~# du -sh /home/backup/srsyg01/*
+432G    /home/backup/srsyg01/daily.2006-01-24-01:00.15990
+432G    /home/backup/srsyg01/daily.2006-01-26-01:00.30152
+434G    /home/backup/srsyg01/daily.2006-01-27-01:00.4596
+435G    /home/backup/srsyg01/daily.2006-01-28-01:00.11998
+437G    /home/backup/srsyg01/daily.2006-01-29-01:00.19115
+437G    /home/backup/srsyg01/daily.2006-01-30-01:00.26405
+438G    /home/backup/srsyg01/daily.2006-01-31-01:00.1148
+439G    /home/backup/srsyg01/daily.2006-02-01-01:00.8321
+439G    /home/backup/srsyg01/daily.2006-02-02-01:00.15383
+439G    /home/backup/srsyg01/daily.2006-02-03-01:00.22567
+16K     /home/backup/srsyg01/lost+found
+backup:~# du --version | head -n1
+du (coreutils) 5.2.1
+
+

Newer versions of du also detect the hardlinks, so we can even compare +the sizes directly with du:

+
+
+
[8:16] eiche:~# du --version | head -n 1
+du (GNU coreutils) 5.93
+[8:17] eiche:schwarzesloch# du -slh hydrogenium/*
+19G     hydrogenium/durcheinander.0
+18G     hydrogenium/durcheinander.2006-01-17-00:27.13820
+19G     hydrogenium/durcheinander.2006-01-25-23:18.31328
+19G     hydrogenium/durcheinander.2006-01-26-00:11.3332
+[8:22] eiche:schwarzesloch# du -sh hydrogenium/*
+19G     hydrogenium/durcheinander.0
+12G     hydrogenium/durcheinander.2006-01-17-00:27.13820
+1.5G    hydrogenium/durcheinander.2006-01-25-23:18.31328
+200M    hydrogenium/durcheinander.2006-01-26-00:11.3332
+
+

In the second report the sizes include the space the inodes of +the hardlinks allocate.

+
+ + + diff --git a/doc/ccollect.text b/doc/ccollect.text index f075b9a..3814c73 100644 --- a/doc/ccollect.text +++ b/doc/ccollect.text @@ -1,248 +1,46 @@ ccollect - Installing, Configuring and Using ============================================ -Nico Schottelius -2.10, for ccollect 2.10, Initial Version from 2006-01-13 +Nico Schottelius +0.3.1, for ccollect 0.3.1, Initial Version from 2005-01-13 :Author Initials: NS - (pseudo) incremental backup with different exclude lists using hardlinks and `rsync` - Introduction ------------ -`ccollect` is a backup utility written in the sh-scripting language. +ccollect is a backup utitily written in the sh-scripting language. It does not depend on a specific shell, only `/bin/sh` needs to be -bourne shell compatible (like 'dash', 'ksh', 'zsh', 'bash', ...). +bourne shell compatibel (like 'dash', 'ksh', 'zsh', 'bash', ...). -Supported and tested operating systems and architectures -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -`ccollect` was successfully tested on the following platforms: - -- FreeBSD on amd64/i386 -- GNU/Linux on amd64/arm/hppa/i386/ppc -- Mac OS X 10.5 -- NetBSD on alpha/amd64/i386/sparc/sparc64 -- OpenBSD on amd64 -- Windows by installing Cygwin, OpenSSH and rsync - -It *should* run on any Unix that supports `rsync` and has a POSIX-compatible -bourne shell. If your platform is not listed above and you have it successfully -running, please drop me a mail. - - -Why you COULD only backup from remote hosts, not to them -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -While considering the design of ccollect, I thought about enabling +Why you can only backup TO localhost +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +While thinking about the design of ccollect, I thought about enabling backup to *remote* hosts. Though this sounds like a nice feature -('"Backup my notebook to the server now."'), in my opinion it is a -bad idea to backup to a remote host. - -But as more and more people requested this feature, it was implemented, -so you have the choice whether you want to use it or not. - - -Reason -^^^^^^ -If you want to backup *TO* a remote host, you have to loosen security on it. - -Imagine the following situation: You backup your farm of webservers *TO* -a backup host somewhere else. -Now one of your webservers which has access to your backup host gets -compromised. - -Your backup server will be compromised, too. - -And the attacker will have access to all data on the other webservers. - - -Doing it securely -^^^^^^^^^^^^^^^^^ -Think of it the other way round: The backup server (now behind a -firewall, not accessable from outside) connects to the -webservers and pulls the data *from* them. If someone gets access to one -of the webservers, this person will perhaps not even see your machine. If -the attacker sees connections from a host to the compromised -machine, she will not be able to log in on the backup machine. +('Backup my notebook to the server now.'), it is in my opinion a +bad idea to backup to a remote host, because you have to open +security at your backup host. Think of the following situation: You backup +your farm of webservers *to* a backup host somewhere else. One of +your webservers gets compromised, then your backup server will be compromised, +too. Think of it the other way round: The backup server (now behind a +firewall using NAT and strong firewall rules) connects to the +webservers and pulls the data to it. If someone gets access to the +webserver, the person will perhaps not even see your machine. If +he/she sees that there are connections from a host to the compromised +machine, he/she will not be able to login to the backup machine. All other backups are still secure. -Incompatibilities and changes -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - -Versions 0.9 and 1.0 -^^^^^^^^^^^^^^^^^^^^ -- Added "Error: " prefix in _exit_err() - -Versions 0.8 and 0.9 -^^^^^^^^^^^^^^^^^^^^ -- Renamed script to ccollect (.sh is not needed) -- Removed feature to backup to a host via ccollect, added new tool - (FIXME: insert name here) that takes care of this via tunnel -- Perhaps creating subdirectory of source name (idea from Stefan Schlörholz) - -Versions 0.7 and 0.8 -^^^^^^^^^^^^^^^^^^^^ - -.The argument order changed: -- Old: " [args] " -- New: "[args] " - -If you did not use arguments (most people do not), nothing will -change for you. - -.Deletion of incomplete backups using the 'delete_incomplete' option -- Old: Only incomplete backups from the current interval have been removed -- New: All incomplete backups are deleted - -.Support for standard values -- Old: no support -- New: Options in $CCOLLECT_CONF/defaults are used as defaults (see below) - -Versions 0.6 and 0.7 -^^^^^^^^^^^^^^^^^^^^ -.The format of `destination` changed: -- Before 0.7 it was a (link to a) directory -- As of 0.7 it is a textfile containing the destination - -You can update your configuration using `tools/config-pre-0.7-to-0.7.sh`. - -.Added 'remote_host' -- As of 0.7 it is possible to backup *to* hosts (see section remote_host below). - - -Versions 0.5 and 0.6 -^^^^^^^^^^^^^^^^^^^^ -.The format of `rsync_options` changed: -- Before 0.6 it was whitespace delimeted -- As of 0.6 it is newline seperated (so you can pass whitespaces to `rsync`) - -You can update your configuration using `tools/config-pre-0.6-to-0.6.sh`. - -.The name of the backup directories changed: -- Before 0.6: "date +%Y-%m-%d-%H%M" -- As of 0.6: "date +%Y%m%d-%H%M" (better readable, date is closer together) - -For the second change there is no updated needed, as XXXX- is always before -XXXXX (- comes before digit). - - - -Versions 0.4 and 0.5 -^^^^^^^^^^^^^^^^^^^^ -Not a real incompatibilty, but seems to fit in this section: - -.0.5 does *NOT* require -- PaX -- bc - -anymore! - - -Versions < 0.4 and 0.4 -^^^^^^^^^^^^^^^^^^^^^^ - -Since `ccollect` 0.4 there are several incompatibilities with earlier -versions: - -.List of incompatibilities -- `pax` (Posix) is now required, `cp -al` (GNU specific) is removed -- "interval" was written with two 'l' (ell), which is wrong in English -- Changed the name of backup directories, removed the colon in the interval -- ccollect will now exit when preexec returns non-zero -- ccollect now reports when postexec returns non-zero - -You can convert your old configuration directory using -`config-pre-0.4-to-0.4.sh`, which can be found in the *tools/* -subdirectory: - --------------------------------------------------------------------------------- -[10:05] hydrogenium:ccollect-0.4# ./tools/config-pre-0.4-to-0.4.sh /etc/ccollect --------------------------------------------------------------------------------- - - -Quick start ------------ -For those who do not want to read the whole long document: - --------------------------------------------------------------------------------- -# get latest ccollect tarball from http://www.nico.schottelius.org/software/ccollect/ -# replace value for CCV with the current version -export CCV=0.8.1 - -# -# replace 'wget' with 'fetch' on bsd -# -holen=wget -"$holen" http://www.nico.schottelius.org/software/ccollect/ccollect-${CCV}.tar.bz2 - -# extract the tarball, change to the newly created directory -tar -xvjf ccollect-${CCV}.tar.bz2 -cd ccollect-${CCV} - -# create mini-configuration -# first create directory structure -mkdir -p miniconfig/defaults/intervals -mkdir miniconfig/sources - -# create sample intervals -echo 2 > miniconfig/defaults/intervals/testinterval -echo 3 > miniconfig/defaults/intervals/testinterval2 - -# create destination directory, where the backups will be kept -mkdir ~/DASI - -# create sample source, which will be saved -mkdir miniconfig/sources/testsource - -# We will save '/bin' to the directory '~/DASI' -echo '/bin' > miniconfig/sources/testsource/source - -# configure ccollect to use ~/DASI as destination -echo ~/DASI > miniconfig/sources/testsource/destination - -# We want to see what happens and also a small summary at the end -touch miniconfig/sources/testsource/verbose -touch miniconfig/sources/testsource/summary - -echo "do the backup, twice" -CCOLLECT_CONF=./miniconfig ./ccollect.sh testinterval testsource -CCOLLECT_CONF=./miniconfig ./ccollect.sh testinterval testsource - -echo "the third time ccollect begins to remove old backups" -echo -n "Hit enter to see it" -read -CCOLLECT_CONF=./miniconfig ./ccollect.sh testinterval testsource - -echo "Now we add another interval, ccollect should clone from existent ones" -echo -n "Hit enter to see it" -read -CCOLLECT_CONF=./miniconfig ./ccollect.sh testinterval2 testsource - -echo "Let's see how much space we used with two backups and compare it to /bin" -du -s ~/DASI /bin - -# report success -echo "Please report success using ./tools/report_success.sh" - --------------------------------------------------------------------------------- - -Cutting and pasting the complete section above to your shell will result in -the download of ccollect, the creation of a sample configuration and the -execution of some backups. - - Requirements ------------ Installing ccollect ~~~~~~~~~~~~~~~~~~~ -For the installation you need at least - - the latest ccollect package (http://www.nico.schottelius.org/software/ccollect/) +For the installation, you need at least + - either `cp` and `chmod` or `install` - for more comfort: `make` - for rebuilding the generated documentation: additionally `asciidoc` @@ -250,7 +48,9 @@ For the installation you need at least Using ccollect ~~~~~~~~~~~~~~ -.Running ccollect requires the following tools to be installed: +.Running ccollect requires the following tools installed: + - `bc` + - `cp` with support for hard links ('cp -al') - `date` - `rsync` - `ssh` (if you want to use rsync over ssh, which is recommened for security) @@ -259,280 +59,167 @@ Using ccollect Installing ---------- Either type 'make install' or simply copy it to a directory in your -$PATH and execute 'chmod *0755* /path/to/ccollect.sh'. If you like -to use the new management scripts (available since 0.6), copy the -following scripts to a directory in $PATH: - -- `tools/ccollect_add_source.sh` -- `tools/ccollect_analyse_logs.sh.sh` -- `tools/ccollect_delete_source.sh` -- `tools/ccollect_list_intervals.sh` -- `tools/ccollect_logwrapper.sh` - -After having installed and used ccollect, report success using -'./tools/report_success.sh'. +$PATH and execute 'chmod *0755* /path/to/ccollect.sh'. Configuring ----------- -For configuration aid have a look at the above mentioned tools, which can assist -you quite well. When you are successfully using `ccollect`, I would be happy if -you add a link to your website, stating "I backup with ccollect", which points -to the ccollect homepage. So more people now about ccollect, use it and -improve it. You can also report success using `tools/report_success.sh`. - Runtime options ~~~~~~~~~~~~~~~ `ccollect` looks for its configuration in '/etc/ccollect' or, if set, in -the directory specified by the variable '$CCOLLECT_CONF': --------------------------------------------------------------------------------- -# sh-compatible (dash, zsh, mksh, ksh, bash, ...) -$ CCOLLECT_CONF=/your/config/dir ccollect.sh ... +the directory specified by the variable '$CCOLLECT_CONF' +(use 'CCOLLECT_CONF=/your/config/dir ccollect.sh' on the shell). -# csh -$ ( setenv CCOLLECT_CONF /your/config/dir ; ccollect.sh ... ) --------------------------------------------------------------------------------- +When you start `ccollect`, you have either to specify which intervall +to backup (daily, weekly, yearly; you can specify the names yourself, see below). -When you start `ccollect`, you have to specify in which interval -to backup (daily, weekly, yearly; you can specify the names yourself, see below) -and which sources to backup (or -a to backup all sources). +The intervall is used to specify how many backups to keep. -The interval specifies how many backups are kept. - -There are also some self-explanatory parameters you can pass to ccollect, -simply use `ccollect.sh --help` for info. +There are also some self explaining parameters you can pass to ccollect, simply use +"ccollect.sh --help" for info. General configuration ~~~~~~~~~~~~~~~~~~~~~ -The general configuration can be found in $CCOLLECT_CONF/defaults or -/etc/ccollect/defaults. All options specified there are generally valid for -all source definitions, although the values can be overwritten in the source +The general configuration can be found below $CCOLLECT_CONF/defaults or +/etc/ccollect/defaults. All options specified here are generally valid for +all source definitions. Though the values can be overwritten in the source configuration. -All configuration entries are plain-text files -(use UTF-8 for non-ascii characters). +All configuration entries are plain-text (use UTF-8 if you use +non ASCII characters) files. -Interval definition +Intervall definition ^^^^^^^^^^^^^^^^^^^^ -The interval definition can be found in -'$CCOLLECT_CONF/defaults/intervals/' or '/etc/ccollect/defaults/intervals'. -Each file in this directory specifies an interval. The name of the file is -the same as the name of the interval: `intervals/''`. +The intervall definition can be found below +'$CCOLLECT_CONF/defaults/intervalls/' or '/etc/ccollect/defaults/intervalls'. +Every file below this directory specifies an intervall. The name of the file is the +name of the intervall: `intervalls/''`. The content of this file should be a single line containing a number. -This number defines how many versions of this interval are kept. +This number defines how many versions of this intervall to keep. Example: ------------------------------------------------------------------------- - [10:23] zaphodbeeblebrox:ccollect-0.2% ls -l conf/defaults/intervals/ + [10:23] zaphodbeeblebrox:ccollect-0.2% ls -l conf/defaults/intervalls/ insgesamt 12 -rw-r--r-- 1 nico users 3 2005-12-08 10:24 daily -rw-r--r-- 1 nico users 3 2005-12-08 11:36 monthly -rw-r--r-- 1 nico users 2 2005-12-08 11:36 weekly - [10:23] zaphodbeeblebrox:ccollect-0.2% cat conf/defaults/intervals/* + [10:23] zaphodbeeblebrox:ccollect-0.2% cat conf/defaults/intervalls/* 28 12 4 -------------------------------------------------------------------------------- This means to keep 28 daily backups, 12 monthly backups and 4 weekly. - General pre- and post-execution ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + If you add '$CCOLLECT_CONF/defaults/`pre_exec`' or '/etc/ccollect/defaults/`pre_exec`' (same with `post_exec`), `ccollect` will start `pre_exec` before the whole backup process and `post_exec` after backup of all sources is done. -If `pre_exec` exits with a non-zero return code, the whole backup -process will be aborted. - -The `pre_exec` and `post_exec` script can access the following exported variables: - -- 'INTERVAL': the interval selected (`daily`) -- 'no_sources': number of sources to backup (`2`) -- 'source_$no': name of the source, '$no' starts at 0 (`$source_0`) - -The following example describes how to report free disk space in +The following Example describes how to report free disk space in human readable format before and after the whole backup process: ------------------------------------------------------------------------- [13:00] hydrogenium:~# mkdir -p /etc/ccollect/defaults/ -[13:00] hydrogenium:~# echo '#!/bin/sh' > /etc/ccollect/defaults/pre_exec -[13:01] hydrogenium:~# echo '' >> /etc/ccollect/defaults/pre_exec -[13:01] hydrogenium:~# echo 'df -h' >> /etc/ccollect/defaults/pre_exec +[13:00] hydrogenium:~# echo '!/bin/sh' > /etc/ccollect/defaults/pre_exec +[13:01] hydrogenium:~# echo '' >> /etc/ccollect/defaults/pre_exec +[13:01] hydrogenium:~# echo 'df -h' >> /etc/ccollect/defaults/pre_exec [13:01] hydrogenium:~# chmod 0755 /etc/ccollect/defaults/pre_exec [13:01] hydrogenium:~# ln -s /etc/ccollect/defaults/pre_exec /etc/ccollect/defaults/post_exec ------------------------------------------------------------------------- - Source configuration ~~~~~~~~~~~~~~~~~~~~ -Each source configuration exists in '$CCOLLECT_CONF/sources/$name' or +Each source configuration exists below '$CCOLLECT_CONF/sources/$name' or '/etc/ccollect/sources/$name'. The name you choose for the subdirectory describes the source. -Each source contains at least the following files: +Each source has at least the following files: - `source` (a text file containing the `rsync` compatible path to backup) - - `destination` (a text file containing the directory we should backup to) + - `destination` (a link to the directory we should backup to) Additionally a source may have the following files: - - `pre_exec` program to execute before backing up *this* source - - `post_exec` program to execute after backing up *this* source - - - `verbose` whether to be verbose (passes -v to `rsync`) - - `very_verbose` be very verbose (`mkdir -v`, `rm -v` and `rsync -vv`) - - `summary` create a transfer summary when `rsync` finished + - `verbose` whether to be verbose (passes -v to `rsync`) + - `very_verbose` be very verbose (-v also for `mkdir`, `cp`, `rm`) + - `summary` create a transfer summary when `rsync` finished - - `exclude` exclude list for `rsync`. newline seperated list. - - `rsync_options` extra options for `rsync`. newline seperated list. - - - `delete_incomplete` delete incomplete backups - - `remote_host` host to backup to - - `rsync_failure_codes` list of rsync exit codes that indicate complete failure - - `mtime` Sort backup directories based on their modification time - - `quiet_if_down` Suppress error messages if source is not connectable + - `exclude` exclude list for `rsync`. newline ('\n') seperated list. + - `rsync_options' extra options to pass to `rsync` + - `pre_exec` program to execute before backuping this source + - `post_exec` program to execute after backuping this source Example: -------------------------------------------------------------------------------- [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2 insgesamt 12 - lrwxrwxrwx 1 nico users 20 2005-11-17 16:44 destination + lrwxrwxrwx 1 nico users 20 2005-11-17 16:44 destination -> /home/nico/backupdir -rw-r--r-- 1 nico users 62 2005-12-07 17:43 exclude - drwxr-xr-x 2 nico users 4096 2005-12-07 17:38 intervals + drwxr-xr-x 2 nico users 4096 2005-12-07 17:38 intervalls -rw-r--r-- 1 nico users 15 2005-11-17 16:44 source [10:47] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/exclude openvpn-2.0.1.tar.gz nicht_reinnehmen etwas mit leerzeichenli - [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2/intervals + [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2/intervalls insgesamt 4 -rw-r--r-- 1 nico users 2 2005-12-07 17:38 daily - [10:48] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/intervals/daily + [10:48] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/intervalls/daily 5 [10:48] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/source /home/nico/vpn -------------------------------------------------------------------------------- -Default options -^^^^^^^^^^^^^^^ -If you add '$CCOLLECT_CONF/defaults/`option_name`', the value will -be used in abscence of the option in a source. If you want to prevent -the default value to be used in a source, you can create the file -'$CCOLLECT_CONF/sources/$name/`no_option_name`' (i.e. prefix it with -'no_'. - -Example: --------------------------------------------------------------------------------- - [9:04] ikn2:ccollect% touch conf/defaults/verbose - [9:04] ikn2:ccollect% touch conf/sources/local/no_verbose --------------------------------------------------------------------------------- -This enables the verbose option for all sources, but disables it for the -source 'local'. - -If an option is specified in the defaults folder and in the source, -the source specific version overrides the default one: - -Example: --------------------------------------------------------------------------------- - [9:05] ikn2:ccollect% echo "backup-host" > conf/defaults/remote_host - [9:05] ikn2:ccollect% echo "different-host" > conf/sources/local/remote_host --------------------------------------------------------------------------------- - -You can use all source options as defaults, with the exception of - -- `source` -- `destination` -- `pre_exec` -- `post_exec` - -Detailed description of "source" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Detailled description of "source" +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `source` describes a `rsync` compatible source (one line only). For instance 'backup_user@foreign_host:/home/server/video'. To use the `rsync` protocol without the `ssh`-tunnel, use -'rsync::USER@HOST/SRC'. For more information have a look at the manpage -of `rsync`(1). +'rsync::USER@HOST/SRC'. For more information have a look at `rsync`(1). - -Detailed description of "destination" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -`destination` must be a text file containing the destination directory. -`destination` *USED* to be a link to the destination directory in -earlier versions, so do not be confused if you see such examples. - - -Example: --------------------------------------------------------------------------------- - [11:36] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/destination - /home/nico/backupdir --------------------------------------------------------------------------------- - - -Detailed description of "remote_host" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -`remote_host` must be a text file containing the destination host. -If this file is existing, you are backing up your data *TO* this host -and *not* to you local host. - -*Warning*: You need to have `ssh` access to the remote host. `rsync` and -`ccollect` will connect to that host via `ssh`. `ccollect` needs the shell -access, because it needs to find out how many backups exist on the remote -host and to be able to delete them. - - -Example: --------------------------------------------------------------------------------- - [10:17] denkbrett:ccollect-0.7.0% cat conf/sources/remote1/remote_host - home.schottelius.org --------------------------------------------------------------------------------- - -It may contain all the ssh-specific values like 'myuser@yourhost.ch'. - - -Detailed description of "verbose" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Detailled description of "verbose" +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `verbose` tells `ccollect` that the log should contain verbose messages. If this file exists in the source specification *-v* will be passed to `rsync`. - Example: -------------------------------------------------------------------------------- [11:35] zaphodbeeblebrox:ccollect-0.2% touch conf/sources/testsource1/verbose -------------------------------------------------------------------------------- - -Detailed description of "very_verbose" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -`very_verbose` tells `ccollect` that it should log very verbosely. +Detailled description of "very_verbose" +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +`very_verbose` tells `ccollect` that it should log very verbose. If this file exists in the source specification *-v* will be passed to -`rsync`, `rm` and `mkdir`. - +`rsync`, `cp`, `rm` and `mkdir`. Example: -------------------------------------------------------------------------------- [23:67] nohost:~% touch conf/sources/testsource1/very_verbose -------------------------------------------------------------------------------- +Detailled description of "summary" +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Detailed description of "summary" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -If you create the file `summary` in the source definition, -`ccollect` will present you a nice summary at the end. +If you create the file `summary` below the source definition, +`ccollect` will present you with a nice summary at the end. ------------------------------------------------------------------------------- backup:~# touch /etc/ccollect/sources/root/summary backup:~# ccollect.sh werktags root -==> ccollect.sh: Beginning backup using interval werktags <== +==> ccollect.sh: Beginning backup using intervall werktags <== [root] Beginning to backup this source ... [root] Currently 3 backup(s) exist, total keeping 50 backup(s). [root] Beginning to backup, this may take some time... @@ -557,15 +244,15 @@ backup:~# ccollect.sh werktags root ==> Finished ccollect.sh <== ------------------------------------------------------------------------------- -You could also combine it with `verbose` or `very_verbose`, but these -already print some statistics (though not all / the same as presented by +You could also combine it with `verbose` or `very_verbose`, but they +already print some statistics (but not all / the same as presented by `summary`). -Detailed description of "exclude" +Detailled description of "exclude" ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -`exclude` specifies a list of paths to exclude. The entries are seperated by a newline (\n). - +`exclude` specifies a list of paths to exclude. The entries are new line (\n) +seperated. Example: -------------------------------------------------------------------------------- @@ -577,33 +264,42 @@ Example: -------------------------------------------------------------------------------- -Detailed description of "intervals/" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -When you create the subdirectory `intervals/` in your source configuration -directory, you can specify individiual intervals for this specific source. -Each file in this directory describes an interval. - +Detailled description of "destination" +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +`destination` must be a link to the destination directory. Example: -------------------------------------------------------------------------------- - [11:37] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2/intervals/ + [11:36] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2/destination + lrwxrwxrwx 1 nico users 20 2005-11-17 16:44 conf/sources/testsource2/destination -> /home/nico/backupdir +-------------------------------------------------------------------------------- + + +Detailled description of "intervalls/" +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +When you create a subdirectory `intervalls/` within your source configuration +directory, you can specify individiual intervalls for this specific source. +Each file below this directory describes an intervall. + +Example: +-------------------------------------------------------------------------------- + [11:37] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2/intervalls/ insgesamt 8 -rw-r--r-- 1 nico users 2 2005-12-07 17:38 daily -rw-r--r-- 1 nico users 3 2005-12-14 11:33 yearly - [11:37] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/intervals/* + [11:37] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/intervalls/* 5 20 -------------------------------------------------------------------------------- - Detailled description of "rsync_options" ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -When you create the file `rsync_options` in your source configuration, -all the parameters in this file will be passed to rsync. This -way you can pass additional options to rsync. For instance you can tell rsync -to show progress ("--progress"), or which -password-file ("--password-file") -to use for automatic backup over the rsync-protocol. +When you create the file `rsync_options` below your source configuration, +all the parameters found in this file will be passed to rsync. This +way you can pass additional options to rsync. For instance you can tell rsync +to show progress ("--progress") or which -password-file ("--password-file") +to use for automatic backup over the rsync-protocol. Example: -------------------------------------------------------------------------------- @@ -611,26 +307,15 @@ Example: --password-file=/home/user/backup/protected_password_file -------------------------------------------------------------------------------- - Detailled description of "pre_exec" and "post_exec" ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -When you create `pre_exec` and / or `post_exec` in your source -configuration, `ccollect` will execute this command before and -respectively after doing the backup for *this specific* source. + +When you create `pre_exec` and / or `post_exec` below your source +configuration, `ccollect` will execute this command before, +respective after doing the backup for *this specific* source. If you want to have pre-/post-exec before and after *all* backups, see above for general configuration. -If `pre_exec` exits with a non-zero return code, the backup -process of `this source` will be aborted (i.e. backup skipped). - -The `post_exec` script can access the following exported variables from -ccollect: - -- 'name': name of the source that is being backed up -- 'destination_name': contains the base directory name (`daily.20091031-1013.24496`) -- 'destination_dir': full path (`/tmp/ccollect/daily.20091031-1013.24496`) -- 'destination_full': like 'destination_dir', but prepended with the remote_host, if set (`host:/tmp/ccollect/daily.20091031-1013.24496` or `/tmp/ccollect/daily.20091031-1013.24496`) - Example: -------------------------------------------------------------------------------- [13:09] hydrogenium:ccollect-0.3% cat conf/sources/with_exec/pre_exec @@ -645,109 +330,12 @@ df -h df -h -------------------------------------------------------------------------------- - -Detailed description of "delete_incomplete" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -If you create the file `delete_incomplete` in a source specification directory, -`ccollect` will look for incomplete backups (when the whole `ccollect` process -was interrupted) and remove them. Without this file `ccollect` will only warn -the user. - - -Detailed description of "rsync_failure_codes" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -If you have the file `rsync_failure_codes` in your source configuration -directory, it should contain a newline-separated list of numbers representing -rsync exit codes. If rsync exits with any code in this list, a marker will -be left in the destination directory indicating failure of this backup. If -you have enabled delete_incomplete, then this backup will be deleted during -the next ccollect run on the same interval. - - -Detailed description of "mtime" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -By default, ccollect.sh chooses the most recent backup directory for cloning or -the oldest for deletion based on the directory's last change time (ctime). -With this option, the sorting is done based on modification time (mtime). With -this version of ccollect, the ctime and mtime of your backups will normally -be the same and this option has no effect. However, if you, for example, move -your backups to another hard disk using cp -a or rsync -a, you should use this -option because the ctimes are not preserved during such operations. - -If you have any backups in your repository made with ccollect version 0.7.1 or -earlier, do not use this option. - - -Detailed description of "quiet_if_down" -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -By default, ccollect.sh emits a series of error messages if a source is not -connectable. With this option enabled, ccollect still reports that the -source is not connectable but the associated error messages generated by -rsync or ssh are suppressed. You may want to use this option for sources, -like notebook PCs, that are often disconnected. - - Hints ----- -Smart logging -~~~~~~~~~~~~~ -Since ccollect-0.6.1 you can use the ccollect-logwrapper.sh(1) for logging. -You call it the same way you call ccollect.sh and it will create a -logfile containing the output of ccollect.sh. For more information look -at the manpage 'ccollect-logwrapper'. The following is an example running -ccollect-logwrapper.sh: - --------------------------------------------------------------------------------- -u0219 ~ # ~chdscni9/ccollect-logwrapper.sh daily u0160.nshq.ch.netstream.com -ccollect-logwrapper.sh (11722): Starting with arguments: daily u0160.nshq.ch.netstream.com -ccollect-logwrapper.sh (11722): Finished. --------------------------------------------------------------------------------- - - -Using a different ssh port -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Mostly easy is to use your ~/.ssh/config file: - --------------------------------------------------------------------------------- -host mx2.schottelius.org - Port 2342 --------------------------------------------------------------------------------- - -If you only use that port for backup only and normally want to use another port, -you can add 'HostName' and "HostKeyAlias" (if you also have different -keys on the different ports): - --------------------------------------------------------------------------------- -Host hhydrogenium - Hostname bruehe.schottelius.org - Port 666 - HostKeyAlias hydrogenium - -Host bruehe - Hostname bruehe.schottelius.org - Port 22 - HostKeyAlias bruehe.schottelius.org --------------------------------------------------------------------------------- - - -Using source names or interval in pre_/post_exec scripts -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The pre-/post_exec scripts can access some internal variables from `ccollect`: - -- 'INTERVAL': The interval specified on the command line -- 'no_sources': number of sources -- 'source_$NUM': the name of the source -- 'name': the name of the currently being backuped source (not available for - generic pre_exec script) - -Only available for `post_exec`: - -- 'remote_host': name of host we backup to (empty if unused) - - Using rsync protocol without ssh ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + When you have a computer with little computing power, it may be useful to use rsync without ssh, directly using the rsync protocol (specify 'user@host::share' in `source`). You may wish to use @@ -768,12 +356,12 @@ this_is_the_rsync_password This hint was reported by Daniel Aubry. -Not excluding top-level directories +Not-excluding top-level directories ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + When you exclude "/proc" or "/mnt" from your backup, you may run into trouble when you restore your backup. When you use "/proc/\*" or "/mnt/\*" -instead, `ccollect` will backup empty directories. - +instead `ccollect` will backup empty directories. [NOTE] =========================================== @@ -786,11 +374,10 @@ This hint was reported by Marcus Wagner. Re-using already created rsync-backups ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + If you used `rsync` directly before you use `ccollect`, you can use this old backup as initial backup for `ccollect`: You -simply move it into a directory below the destination directory -and name it "'interval'.0". - +simply move it into a subdirectory named "'intervall'.0". Example: ------------------------------------------------------------------------------- @@ -806,27 +393,19 @@ backup:/home/backup/web1# mv * daily.0 2>/dev/null backup:/home/backup/web1# ls daily.0 ------------------------------------------------------------------------------- -Now you can use /home/backup/web1 as the `destination` for the backup. +Now you could use /home/backup/web1 as the `destination` for the backup. [NOTE] =============================================================================== -It does not matter anymore how you name your directory, as `ccollect` uses -the -c option from `ls` to find out which directory to clone from. -=============================================================================== - - -[NOTE] -=============================================================================== -Older versions (pre 0.6, iirc) had a problem, if you named the first backup -something like "daily.initial". It was needed to use the "*0*" (or some -number that is lower than the current year) as extension. `ccollect` -used `sort` to find the latest backup. `ccollect` itself uses -'interval.YEARMONTHDAY-HOURMINUTE.PID'. This notation was *always* before -"daily.initial", as numbers are earlier in the list -which is produced by `sort`. So, if you had a directory named "daily.initial", -`ccollect` always diffed against this backup and transfered and deleted +Do *not* name the first backup something like "daily.initial", but use +the "*0*" (or some very low number, at least lower than the current year) +as extension. `ccollect` uses `sort` to find the latest backup. `ccollect` +itself uses 'intervall.YEAR-MONTH-DAY-HOUR:MINUTE.PID'. This notation will +*always* be before "daily.initial", as numbers are earlier in the list +which is produced by `sort`. So, if you have a directory named "daily.initial", +`ccollect` will always diff against this backup and transfer and delete files which where deleted in previous backups. This means you simply -wasted resources, but your backup had beer complete anyway. +waste resources, but your backup will be complete. =============================================================================== @@ -840,174 +419,35 @@ use a link to The only requirement is that it is executable. - -Using source specific interval definitions -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -When you are backing up multiple hosts via cron each night, it may be -a problem that host "big_server" may only have 4 daily backups, because -otherwise its backup device will be full. But for all other hosts -you want to keep 20 daily backups. In this case you would create -`/etc/ccollect/default/intervals/daily` containing "20" and -`/etc/ccollect/sources/big_server/intervals/daily` containing "4". - -Source specific intervals always overwrite the default values. -If you have to specify it individually for every host, because -of different requirements, you can even omit creating -`/etc/ccollect/default/intervals/daily`. - - -Comparing backups -~~~~~~~~~~~~~~~~~ -If you want to see what changed between two backups, you can use -`rsync` directly: - --------------------------------------------------------------------------------- -[12:00] u0255:ddba034.netstream.ch# rsync -n -a --delete --stats --progress daily.20080324-0313.17841/ daily.20080325-0313.31148/ --------------------------------------------------------------------------------- -This results in a listing of changes. Because we pass -n to rsync no transfer -is made (i.e. report only mode). - -This hint was reported by Daniel Aubry. - - -Testing for host reachabilty -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you want to test whether the host you try to backup is reachable, you can use -the following script as source specific pre-exec: - --------------------------------------------------------------------------------- -#!/bin/sh -# ping -c1 -q `cat "/etc/ccollect/sources/$name/source" | cut -d"@" -f2 | cut -d":" -f1` --------------------------------------------------------------------------------- - -This prevents the deletion of old backups, if the host is not reachable. - -This hint was reported by Daniel Aubry. - - -Easy check for errors -~~~~~~~~~~~~~~~~~~~~~ -If you want to see whether there have been any errors while doing the backup, -you can run `ccollect` together with `ccollect_analyse_logs.sh`: --------------------------------------------------------------------------------- -$ ccollect | ccollect_analyse_logs.sh e --------------------------------------------------------------------------------- - - F.A.Q. ------ -What happens if one backup is broken or empty? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Let us assume that one backup failed (connection broke or the source -hard disk had some failures). Therefore we've got one incomplete backup in our history. +What happens, if one backup is broken or empty? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -`ccollect` will transfer the missing files the next time you use it. -This leads to +Let us assume, that one backup failed (connection broke or hard disk had +some failures). So we've one backup in our history, which is incomplete. - - more transferred files - - much greater disk space usage, as no hardlinks can be used - -If the whole `ccollect` process was interrupted, `ccollect` (since 0.6) can -detect that and remove the incomplete backups, so you can clone from a complete -backup instead +The next time you use `ccollect`, it will transfer the missing files When backing up from localhost the destination is also included. Is this a bug? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + No. `ccollect` passes your source definition directly to `rsync`. It does not try to analyze it. So it actually does not know if a source comes from local harddisk or from a remote server. And it does not want to. When you backup from the local harddisk (which is perhaps not -even a good idea when thinking of security), add the `destination` +even a good idea when thinking of security) add the `destination` to 'source/exclude'. (Daniel Aubry reported this problem) Why does ccollect say "Permission denied" with my pre-/postexec script? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The most common error is that you have not given your script the correct +The most common error is to not give your script the correct permissions. Try `chmod 0755 /etc/ccollect/sources/'yoursource'/*_exec``. -Why does the backup job fail when part of the source is a link? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -When a part of your path you specified in the source is a -(symbolic, hard links are not possible for directories) link, -the backup *must* fail. - -First of all, let us have a look at how it looks like: - -------------------------------------------------------------------------------- -==> ccollect 0.4: Beginning backup using interval taeglich <== -[testsource] Sa Apr 29 00:01:55 CEST 2006 Beginning to backup -[testsource] Currently 0 backup(s) exist(s), total keeping 10 backup(s). -[testsource] Beginning to backup, this may take some time... -[testsource] Creating /etc/ccollect/sources/testsource/destination/taeglich.2006-04-29-0001.3874 ... -[testsource] Sa Apr 29 00:01:55 CEST 2006 Transferring files... -[testsource] rsync: recv_generator: mkdir "/etc/ccollect/sources/testsource/destination/taeglich.2006-04-29-0001.3874/home/user/nico/projekte/ccollect" failed: No such file or directory (2) -[testsource] rsync: stat "/etc/ccollect/sources/testsource/destination/taeglich.2006-04-29-0001.3874/home/user/nico/projekte/ccollect" failed: No such file or directory (2) -[...] -------------------------------------------------------------------------------- - -So what is the problem? It is very obvious when you look deeper into it: - -------------------------------------------------------------------------------- -% cat /etc/ccollect/sources/testsource/source -/home/user/nico/projekte/ccollect/ccollect-0.4 -% ls -l /home/user/nico/projekte -lrwxrwxrwx 1 nico nico 29 2005-12-02 23:28 /home/user/nico/projekte -> oeffentlich/computer/projekte -% ls -l /etc/ccollect/sources/testsource/destination/taeglich.2006-04-29-0001.3874/home/user/nico -lrwxrwxrwx 1 nico nico 29 2006-04-29 00:01 projekte -> oeffentlich/computer/projekte -------------------------------------------------------------------------------- - -`rsync` creates the directory structure before it creates the symbolic link. -This link now links to something not reachable (dead link). It is -impossible to create subdirectories under the broken link. - -In conclusion you cannot use paths with a linked part. - -However, you can backup directories containing symbolic links -(in this case you could backup /home/user/nico, which contains -/home/user/nico/projekte and oeffentlich/computer/projekte). - - -How can I prevent missing the right time to enter my password? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -As `ccollect` first deletes the old backups, it may take some time -until `rsync` requests the password for the `ssh` session from you. - -The easiest way not to miss that point is running `ccollect` in `screen`, -which has the ability to monitor the output for activity. So as soon as -your screen beeps, after `ccollect` began to remove the last directory, -you can enter your password (have a look at screen(1), especially "C-a M" -and "C-a _", for more information). - - -Backup fails, if autofs is running, but sources not reachable -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you are trying to backup a system containing paths that are managed -by autofs, you may run into this error: - -------------------------------------------------------------------------------- -2009-12-01-23:14:15: ccollect 0.8.1: Beginning backup using interval monatlich -[ikn] 2009-12-01-23:14:15: Beginning to backup -[ikn] 2009-12-01-23:14:15: Executing /home/users/nico/ethz/ccollect/sources/ikn/pre_exec ... -Enter LUKS passphrase: -[ikn] Command successful. -[ikn] key slot 0 unlocked. -[ikn] 2009-12-01-23:14:23: Finished /home/users/nico/ethz/ccollect/sources/ikn/pre_exec (return code 0). [ikn] directory has vanished: "/home/users/nico/privat/firmen/ethz/autofs/projects" -[ikn] directory has vanished: "/home/users/nico/privat/firmen/ethz/autofs/scratch" -[ikn] directory has vanished: "/home/users/nico/privat/firmen/ethz/autofs/sgscratch" -[ikn] directory has vanished: "/home/users/nico/privat/firmen/ethz/autofs/supp" -[ikn] directory has vanished: "/home/users/nico/privat/firmen/ethz/autofs/sysadmin" -[ikn] rsync warning: some files vanished before they could be transferred (code 24) at main.c(1057) [sender=3.0.6] -[ikn] 2009-12-01-23:44:23: Source / is not readable. Skipping. -------------------------------------------------------------------------------- - -Thus, if you are unsure whether autofs paths can be mounted during backup, -stop autofs in pre_exec and reenable it in post_exec. - - Examples -------- @@ -1016,9 +456,9 @@ A backup host configuration from scratch -------------------------------------------------------------------------------- srwali01:~# mkdir /etc/ccollect -srwali01:~# mkdir -p /etc/ccollect/defaults/intervals/ -srwali01:~# echo 28 > /etc/ccollect/defaults/intervals/taeglich -srwali01:~# echo 52 > /etc/ccollect/defaults/intervals/woechentlich +srwali01:~# mkdir -p /etc/ccollect/defaults/intervalls/ +srwali01:~# echo 28 > /etc/ccollect/defaults/intervalls/taeglich +srwali01:~# echo 52 > /etc/ccollect/defaults/intervalls/woechentlich srwali01:~# cd /etc/ccollect/ srwali01:/etc/ccollect# mkdir sources srwali01:/etc/ccollect# cd sources/ @@ -1031,27 +471,26 @@ srwali01:/etc/ccollect/sources/local-root# cat > exclude << EOF > /sys > /mnt > EOF -srwali01:/etc/ccollect/sources/local-root# echo /mnt/hdbackup/local-root > destination +srwali01:/etc/ccollect/sources/local-root# ln -s /mnt/hdbackup/local-root destination srwali01:/etc/ccollect/sources/local-root# mkdir /mnt/hdbackup/local-root srwali01:/etc/ccollect/sources/local-root# ccollect.sh taeglich local-root -/o> ccollect.sh: Beginning backup using interval taeglich +/o> ccollect.sh: Beginning backup using intervall taeglich /=> Beginning to backup "local-root" ... |-> 0 backup(s) already exist, keeping 28 backup(s). -------------------------------------------------------------------------------- - After that, I added some more sources: -------------------------------------------------------------------------------- srwali01:~# cd /etc/ccollect/sources srwali01:/etc/ccollect/sources# mkdir windos-wl6 srwali01:/etc/ccollect/sources# cd windos-wl6/ srwali01:/etc/ccollect/sources/windos-wl6# echo /mnt/win/SYS/WL6 > source -srwali01:/etc/ccollect/sources/windos-wl6# echo /mnt/hdbackup/wl6 > destination +srwali01:/etc/ccollect/sources/windos-wl6# ln -s /mnt/hdbackup/wl6 destination srwali01:/etc/ccollect/sources/windos-wl6# mkdir /mnt/hdbackup/wl6 srwali01:/etc/ccollect/sources/windos-wl6# cd .. srwali01:/etc/ccollect/sources# mkdir windos-daten srwali01:/etc/ccollect/sources/windos-daten# echo /mnt/win/Daten > source -srwali01:/etc/ccollect/sources/windos-daten# echo /mnt/hdbackup/windos-daten > destination +srwali01:/etc/ccollect/sources/windos-daten# ln -s /mnt/hdbackup/windos-daten destination srwali01:/etc/ccollect/sources/windos-daten# mkdir /mnt/hdbackup/windos-daten # Now add some remote source @@ -1065,11 +504,10 @@ srwali01:/etc/ccollect/sources/srwali03# cat > exclude << EOF > /home > EOF srwali01:/etc/ccollect/sources/srwali03# echo 'root@10.103.2.3:/' > source -srwali01:/etc/ccollect/sources/srwali03# echo /mnt/hdbackup/srwali03 > destination +srwali01:/etc/ccollect/sources/srwali03# ln -s /mnt/hdbackup/srwali03 destination srwali01:/etc/ccollect/sources/srwali03# mkdir /mnt/hdbackup/srwali03 -------------------------------------------------------------------------------- - Using hard-links requires less disk space ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1131,109 +569,5 @@ du (GNU coreutils) 5.93 200M hydrogenium/durcheinander.2006-01-26-00:11.3332 ------------------------------------------------------------------------- -In the second report (without -l) the sizes include the space the inodes of +In the second report the sizes include the space the inodes of the hardlinks allocate. - - -A collection of backups on the backup server -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -All the data of my important hosts is backuped to eiche into -/mnt/schwarzesloch/backup: - -------------------------------------------------------------------------- -[9:24] eiche:backup# ls * -creme: -woechentlich.2006-01-26-22:22.4153 woechentlich.2006-02-12-11:48.2461 -woechentlich.2006-01-26-22:23.4180 woechentlich.2006-02-18-23:00.7898 -woechentlich.2006-02-05-02:43.14281 woechentlich.2006-02-25-23:00.13480 -woechentlich.2006-02-06-00:24.15509 woechentlich.2006-03-04-23:00.25439 - -hydrogenium: -durcheinander.2006-01-27-11:16.6391 durcheinander.2006-02-13-01:07.2895 -durcheinander.2006-01-30-19:29.9505 durcheinander.2006-02-17-08:20.6707 -durcheinander.2006-01-30-22:27.9623 durcheinander.2006-02-24-16:24.12461 -durcheinander.2006-02-03-09:52.12885 durcheinander.2006-03-03-19:17.18075 -durcheinander.2006-02-05-23:00.15068 durcheinander.2006-03-17-22:41.5007 - -scice: -woechentlich.2006-02-04-10:32.13766 woechentlich.2006-02-16-23:00.6185 -woechentlich.2006-02-05-23:02.15093 woechentlich.2006-02-23-23:00.11783 -woechentlich.2006-02-06-08:22.15994 woechentlich.2006-03-02-23:00.17346 -woechentlich.2006-02-06-19:40.16321 woechentlich.2006-03-09-23:00.29317 -woechentlich.2006-02-12-11:51.2514 woechentlich.2006-03-16-23:00.4218 -------------------------------------------------------------------------- - -And this incremental backup and the archive are copied to an external -usb harddisk (attention: you *should* really use -H to backup the backup): - -------------------------------------------------------------------------- -[9:23] eiche:backup# df -h -Filesystem Size Used Avail Use% Mounted on -rootfs 14G 8.2G 4.9G 63% / -/dev/root 14G 8.2G 4.9G 63% / -/dev/root 14G 8.2G 4.9G 63% /dev/.static/dev -tmpfs 10M 444K 9.6M 5% /dev -/dev/hdh 29G 3.7M 29G 1% /mnt/datenklo -tmpfs 110M 4.0K 110M 1% /dev/shm -/dev/mapper/nirvana 112G 90G 23G 81% /mnt/datennirvana -/dev/mapper/schwarzes-loch - 230G 144G 86G 63% /mnt/schwarzesloch -/dev/mapper/archiv 38G 20G 19G 52% /mnt/archiv -/dev/mapper/usb-backup - 280G 36M 280G 1% /mnt/usb/backup -[9:24] eiche:backup# cat ~/bin/sync-to-usb -DDIR=/mnt/usb/backup - -rsync -av -H --delete /mnt/schwarzesloch/ "$DDIR/schwarzesloch/" - -rsync -av -H --delete /mnt/archiv/ "$DDIR/archiv/" -------------------------------------------------------------------------- - - -Processes running when doing ccollect -j -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Truncated output from `ps axuwwwf`: - -------------------------------------------------------------------------- - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily -j ddba034 ddba045 ddba046 ddba047 ddba049 ddna010 ddna011 - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba034 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba034 - R+ 11:40 23:40 | | | | | \_ rsync -a --delete --numeric-ids --relative --delete-excluded --link-dest=/home/server/backup/ddba034 - S+ 11:40 0:00 | | | | | \_ ssh -l root ddba034.netstream.ch rsync --server --sender -vlogDtprR --numeric-ids . / - S+ 11:41 0:11 | | | | | \_ rsync -a --delete --numeric-ids --relative --delete-excluded --link-dest=/home/server/backup/ddb - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba034 - S+ 11:40 0:00 | | | | \_ sed s:^:\[ddba034\] : - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba045 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba045 - R+ 11:40 0:02 | | | | | \_ rm -rf /etc/ccollect/sources/ddba045/destination/daily.2006-10-19-1807.6934 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba045 - S+ 11:40 0:00 | | | | \_ sed s:^:\[ddba045\] : - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba046 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba046 - R+ 11:40 0:02 | | | | | \_ rm -rf /etc/ccollect/sources/ddba046/destination/daily.2006-10-19-1810.7072 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba046 - S+ 11:40 0:00 | | | | \_ sed s:^:\[ddba046\] : - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba047 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba047 - R+ 11:40 0:03 | | | | | \_ rm -rf /etc/ccollect/sources/ddba047/destination/daily.2006-10-19-1816.7268 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba047 - S+ 11:40 0:00 | | | | \_ sed s:^:\[ddba047\] : - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba049 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba049 - D+ 11:40 0:03 | | | | | \_ rm -rf /etc/ccollect/sources/ddba049/destination/daily.2006-10-19-1821.7504 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba049 - S+ 11:40 0:00 | | | | \_ sed s:^:\[ddba049\] : - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddna010 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddna010 - R+ 11:40 0:03 | | | | | \_ rm -rf /etc/ccollect/sources/ddna010/destination/daily.2006-10-19-1805.6849 - S+ 11:40 0:00 | | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddna010 - S+ 11:40 0:00 | | | | \_ sed s:^:\[ddna010\] : - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddna011 - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddna011 - R+ 12:08 0:00 | | | | \_ rm -rf /etc/ccollect/sources/ddna011/destination/daily.2006-10-20-1502.7824 - S+ 11:40 0:00 | | | \_ /bin/sh /usr/local/bin/ccollect.sh daily ddna011 - S+ 11:40 0:00 | | | \_ sed s:^:\[ddna011\] : - -------------------------------------------------------------------------- -As you can see, six processes are deleting old backups, while one backup -(ddba034) is already copying data. diff --git a/doc/changes/0.7.1 b/doc/changes/0.7.1 deleted file mode 100644 index adf9ff4..0000000 --- a/doc/changes/0.7.1 +++ /dev/null @@ -1,9 +0,0 @@ -* Added support for global delete_incomplete option -* Updated tools/ccollect_analyse_logs.sh: Added more error strings to find -* Removed use of 'basename': Replaced it with standard variables from cconf -* Updated documentation - * More hints - * Updated remote_host description -* Bugfix in shell artihmetic (Jeroen Bruijning) -* Bugfix: Allow "&" in sourcename (Reported by Tiziano Müller) -* Added ccollect_list_intervals.sh to list intervals with values diff --git a/doc/changes/0.8 b/doc/changes/0.8 deleted file mode 100644 index 75f9a63..0000000 --- a/doc/changes/0.8 +++ /dev/null @@ -1,14 +0,0 @@ -* Introduce consistenst time sorting (John Lawless) -* Check for source connectivity before trying backup (John Lawless) -* Defensive programming patch (John Lawless) -* Some code cleanups (argument parsing, usage) (Nico Schottelius) -* Only consider directories as sources when using -a (Nico Schottelius) -* Fix general parsing problem with -a (Nico Schottelius) -* Fix potential bug when using remote_host, delete_incomplete and ssh (Nico Schottelius) -* Improve removal performance: minimised number of 'rm' calls (Nico Schottelius) -* Support sorting by mtime (John Lawless) -* Improve option handling (John Lawless) -* Add support for quiet operation for dead devices (quiet_if_down) (John Lawless) -* Add smart option parsing, including support for default values (John Lawless) -* Updated and cleaned up documentation (Nico Schottelius) -* Fixed bug "removal of current directory" in ccollect_delete_source.sh (Found by Günter Stöhr, fixed by Nico Schottelius) diff --git a/doc/changes/2.0 b/doc/changes/2.0 deleted file mode 100644 index 2fee139..0000000 --- a/doc/changes/2.0 +++ /dev/null @@ -1,16 +0,0 @@ - * Introduce -j option for max parallel jobs, deprecate -p (Darko Poljak) - * Add locking (Darko Poljak) - * Fix source-is-up check (Nikita Koshikov) - * Fix some minor command line parsing issues (Nico Schottelius) - * Correct output, if configuration is not in cconfig format (Nico Schottelius) - * Minor code cleanups and optimisations (Nico Schottelius) - * ccollect_analyse_logs.sh traps more errors and warnings (Patrick Drolet) - * Remove -v for mkdir and rm, as they are not POSIX (Patrick Drolet) - * Export destination_* to source specific post_exec (Nico Schottelius) - * Update documentation regarding exported variables (Nico Schottelius) - * Simplify time calculation (Nico Schottelius) - * Documentate pre_exec error handling (Nico Schottelius) - * Added start script (Thorsten Elle) - * Documentate autofs hint (Nico Schottelius) - * Speedup source-is-up check and remove --archive (Nico Schottelius) - * Removed support for remote backup (see doc) (Nico Schottelius) diff --git a/doc/changes/2.1 b/doc/changes/2.1 deleted file mode 100644 index ec42d4b..0000000 --- a/doc/changes/2.1 +++ /dev/null @@ -1 +0,0 @@ -* Add options for stdout, file and syslog logging (Darko Poljak) diff --git a/doc/changes/2.10 b/doc/changes/2.10 deleted file mode 100644 index 1d1e85d..0000000 --- a/doc/changes/2.10 +++ /dev/null @@ -1 +0,0 @@ -* Add 'current' symlink to backup destinations (Steffen Zieger) diff --git a/doc/changes/2.2 b/doc/changes/2.2 deleted file mode 100644 index 0ee09d6..0000000 --- a/doc/changes/2.2 +++ /dev/null @@ -1 +0,0 @@ -* Bugfix: empty rsync_options line causes destroying source (Darko Poljak) diff --git a/doc/changes/2.3 b/doc/changes/2.3 deleted file mode 100644 index 960110c..0000000 --- a/doc/changes/2.3 +++ /dev/null @@ -1 +0,0 @@ -* Bugfix: Fix parallel mode deadlock when max jobs > number of sources (Darko Poljak) diff --git a/doc/changes/2.4 b/doc/changes/2.4 deleted file mode 100644 index 07ffe9d..0000000 --- a/doc/changes/2.4 +++ /dev/null @@ -1,2 +0,0 @@ -* Add Windows(Cygwin) as supported OS -* Add source name tag in log line diff --git a/doc/changes/2.5 b/doc/changes/2.5 deleted file mode 100644 index a6b319c..0000000 --- a/doc/changes/2.5 +++ /dev/null @@ -1 +0,0 @@ -* Bugfix: exit in case of subshell error diff --git a/doc/changes/2.6 b/doc/changes/2.6 deleted file mode 100644 index a68cbbc..0000000 --- a/doc/changes/2.6 +++ /dev/null @@ -1 +0,0 @@ -* Improve performance, improve process of deletion of old backups diff --git a/doc/changes/2.7 b/doc/changes/2.7 deleted file mode 100644 index bafbb01..0000000 --- a/doc/changes/2.7 +++ /dev/null @@ -1 +0,0 @@ -* Fix shellcheck reported issues diff --git a/doc/changes/2.8 b/doc/changes/2.8 deleted file mode 100644 index 563b438..0000000 --- a/doc/changes/2.8 +++ /dev/null @@ -1 +0,0 @@ -* Fix excluding destination dir from removal diff --git a/doc/changes/2.9 b/doc/changes/2.9 deleted file mode 100644 index 45097c7..0000000 --- a/doc/changes/2.9 +++ /dev/null @@ -1 +0,0 @@ -* Make rsync return code available in post_exec (Steffen Zieger) diff --git a/doc/changes/pre-0.7.1 b/doc/changes/pre-0.7.1 deleted file mode 100644 index 2c3f522..0000000 --- a/doc/changes/pre-0.7.1 +++ /dev/null @@ -1,100 +0,0 @@ -0.6.2 to 0.7.0: - * Added tools/report_success.sh (try it out!) - * Added ccollect_analyse_logs.sh (see ccollect_analyse_logs(1)) - * Add capability to backup to a host - - Also updated documentation - * Changed "destination" format - - Use tools/config-pre-0.7-to-0.7.sh to convert pre 0.7.x configurations - * Renamed all tools to begin with "ccollect_" - * Updated ccollect_add_source.sh and added manpage - * Updated todos - * Changed license to GPLv3 (from GPLv2) - - -0.6.1 to 0.6.2: - * Added analyse-ccollect-logs.sh - * Fixed bug: Removing of backups was broken since update to 0.6 - (forgot to prepend path...) - * Fixed bug: The marker was always deleted, because rsync deleted it. - Create it outside of the backup destination now. - -0.6 to 0.6.1: - * Added check for destination_base in add_ccollect_source.sh - * Added support for -V and --version - * Added ccollect-logwrapper.sh (and a manpage ;-) - * Changed behaviour: ccollect now clones from the latest existing backup, - independent of the interval. This way different intervals do not - diverge. ccollect uses ls -c to determine latest backup. - -0.5.2 to 0.6: - * Always print return code of rsync - * Add much more timing information - * One option per line in rsync_options now (NOT space seperated) - * Added --sparse as default option - * Added management tools (including manpages): - * add_ccollect_source.sh - * delete_ccollect_source.sh - * list_ccollect_intervals.sh - * Cleaned up exit calls (now always cleanly removes temporary files) - * In theory, added pdf documentation (though, was unable to do it with fop) - * Changed license to GPLv3 (from GPLv2) - -0.5.1 to 0.5.2: - * Display correct error code, if rsync returns non-zero - * Unify messages - * Remove some potential quoting problems - -0.5 to 0.5.1: - * Remove always printed debug information - -0.4.3 to 0.5: - * Removed requirement PaX - * Removed requirement bc - -0.4.2 to 0.4.3: - * Display error code of rsync, if non-zero (for further analysis) - * Fix Makefile, so 'make install' works on others OS - * reorder $RSYNC_EXTRA, so it can be overriden by users - -0.4.1 to 0.4.2: - * fixed bug when $CCOLLECT_CONF is relative - * added Quickstart to documentation - -0.4 to 0.4.1: - * updated documentation, fixed some English related problems - * added Texinfo documentation - * added a manpage (English) - * fixed problem with 'make install' (strip was used) - * fixed possible problem with pre_exec beeing executed to late - * fixed small bug in sed expression: using 'source/' made it fail - -0.3.3 to 0.4: - * `pax` (Posix) is now required, `cp -al` (GNU specific) is removed - * "interval" was written with two 'l' (ell), which is wrong in English - * Changed the name of backup directories, removed the colon in the interval - * ccollect will now exit, when preexec returns non-zero - * ccollect now reports when postexec returns non-zero - -0.3.2 to 0.3.3: - * Fix a small bug, which suppressed information when rsync exits non-zero - -0.3.1 to 0.3.2: - * ccollect now prints the start time, end time and duration of the backup - -0.3 to 0.3.1: - * added support for printing a summary - * some cosmetic changes - -0.2 to 0.3: - * added "very_verbose" - * normal "verbose" is now less verbose - * added general 'pre_exec' and 'post_exec' support - * added source specfifc 'pre_exec' and 'post_exec' support - -0.1 to 0.2: - * Added plausibility check - * Updated and made documentation readable - * implemented verbose option - * Fixed double exclude parameter bug - * Added much better documentation (asciidoc) - * added rsync extra parameter option diff --git a/doc/gpl3-header b/doc/gpl3-header deleted file mode 100644 index 5a1663d..0000000 --- a/doc/gpl3-header +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# -# 2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# diff --git a/doc/logwrapper.text b/doc/logwrapper.text deleted file mode 100644 index ec12db4..0000000 --- a/doc/logwrapper.text +++ /dev/null @@ -1,29 +0,0 @@ -ccollect-logwrapper: Logging backup output -=========================================== -Nico Schottelius -0.1, for ccollect-logwrapper 0.1, Initial Version from 2007-06-08 -:Author Initials: NS - -This wrapper makes it easy to have logs of ccollect output. - - -Introduction ------------- -/etc/ccollect/logwrapper/ (also uses $CCOLLECT_CONF). - - - pipe: will pipe to a program - staticfile: link to a file - datefile: - contains a string that is passed to date that returns - dynamicfile: - is a program, that returns some string that we use as - a filename - syslog: - syslog-facility - syslog-level - only-stderr: - omit stdout output - -The logger will output to which destinations it logs and with which -parameters it was started. diff --git a/doc/man/ccollect.text b/doc/man/ccollect.text deleted file mode 100644 index 67f8f47..0000000 --- a/doc/man/ccollect.text +++ /dev/null @@ -1,98 +0,0 @@ -ccollect(1) -=========== -Nico Schottelius - - -NAME ----- -ccollect - (pseudo) incremental backup with different exclude lists using hardlinks and rsync - - -SYNOPSIS --------- -'ccollect.sh' [args] - - -DESCRIPTION ------------ -`ccollect` is a backup utility written in the sh-scripting language. -It does not depend on a specific shell, only `/bin/sh` needs to be -bourne shell compatibel (like 'dash', 'ksh', 'zsh', 'bash', ...). - -For more information refer to the manual titled -"ccollect - Installing, Configuring and Using" (available as text (asciidoc), -texinfo or html). - - -OPTIONS -------- --a, --all:: - Backup all sources specified in /etc/ccollect/sources - --e, --errors:: - Log only errors - --h, --help:: - Show the help screen - --j [max], --jobs [max]:: - Specifies the number of jobs to run simultaneously. - If max is not specified then parallelise all jobs. - --l FILE, --logfile FILE:: - Log to specified file - --p, --parallel:: - Parallelise backup processes (deprecated from 2.0) - --s, --syslog:: - Log to syslog with tag ccollect - --V, --version:: - Show version and exit - --v, --verbose:: - Be very verbose (uses set -x) - - -LOGGING MECHANISM ------------------ -ccollect logging depends on running in non-interactive/interactive mode -and on specified optins. The mechanism behaves as the following: - -non-interactive mode:: - - * standard output goes to syslog - * optional: specify logging into file - * log all output by default - * optional: log only errors - -interactive mode:: - - * standard output goes to stdout - * log only errors - * optional: log into syslog or file - - log all output by default - - optional: log only errors - - -SEE ALSO --------- -ccollect_add_source(1), ccollect_analyse_logs(1), ccollect_logwrapper(1) -ccollect_delete_source(1), ccollect_list_intervals(1) - - -AUTHOR ------- -Nico Schottelius - - -RESOURCES ---------- -Main web site: http://www.nico.schottelius.org/software/ccollect/[] - - -COPYING -------- -Copyright \(C) 2006-2008 Nico Schottelius. Free use of this software is -granted under the terms of the GNU General Public License Version 3 (GPLv3). diff --git a/doc/man/ccollect_add_source.text b/doc/man/ccollect_add_source.text deleted file mode 100644 index e3b9f83..0000000 --- a/doc/man/ccollect_add_source.text +++ /dev/null @@ -1,75 +0,0 @@ -ccollect_add_source(1) -====================== -Nico Schottelius - - -NAME ----- -ccollect_add_source - create new source for ccollect(1) - - -SYNOPSIS --------- - -'ccollect_add_source.sh' - - -DESCRIPTION ------------ -ccollect_add_source.sh creates a new backup source for use with ccollect(1). -It copies the files from to the source directory with the hostname below -'$CCOLLECT_CONF/sources'. It is designed to run on a backup server to create -new directories for new hosts. - - -FILES ------ -$CCOLLECT_CONF/defaults/sources:: - Main configuration directory. $CCOLLECT_CONF is '/etc/ccollect', if unset. - All the following files reside below this directory. - -exclude:: -summary:: -intervals:: -pre_exec:: -post_exec:: -rsync_options:: -verbose:: -very_verbose:: - Those are the standard configuration files known by ccollect(1). - If the file exist it will be copied to the newly created source. - Directories ('intervals') are copied recursively. - -destination_base:: - A link to the directory where to store the backups. Below this directory - `ccollect_add_source.sh` will create a directory with the hostname you - specified on the command line. A common valua for `destination_base` is - '/home/server/backup'. - -source_prefix:: -source_postfix:: - `source_prefix` is put before the hostname, `source_postfix` is appended - after it. A common value for `source_prefix` maybe 'root@' and ':/' - for `source_postfix`. - - -SEE ALSO --------- -ccollect(1), ccollect_analyse_logs.sh, ccollect_delete_source(1), -ccollect_list_intervals(1), ccollect_logwrapper(1), - - -AUTHOR ------- -Nico Schottelius - - -RESOURCES ---------- -Main web site: http://www.nico.schottelius.org/software/ccollect/[] - - -COPYING -------- -Copyright \(C) 2007-2008 Nico Schottelius. Free use of this software is -granted under the terms of the GNU General Public License Version 3 (GPLv3). diff --git a/doc/man/ccollect_analyse_logs.text b/doc/man/ccollect_analyse_logs.text deleted file mode 100644 index 659ddbf..0000000 --- a/doc/man/ccollect_analyse_logs.text +++ /dev/null @@ -1,56 +0,0 @@ -ccollect_analyse_logs(1) -======================== -Nico Schottelius - - -NAME ----- -ccollect_analyse_logs - analyse logs produced by ccollect(1) - - -SYNOPSIS --------- - -'ccollect_analyse_logs.sh' [iwe] - - -DESCRIPTION ------------ -ccollect_analyse_logs.sh reads the logfiles from stdin. You have to specify -at least one of the three loglevels (*i*nformational, *w*arning, *e*rror). Any -combination of them is allowed. - - -FILES ------ -ccollect log files:: - Are read from stdin - -EXAMPLES --------- -cat /var/log/ccollect/single/* | ccollect_analyse_logs.sh iw:: - Displays warnings and informational parts -ccollect_analyse_logs.sh iw < /var/log/ccollect/all_together:: - Displays only error messages (useful for the morning mail) - - -SEE ALSO --------- -ccollect(1), ccollect_add_source.sh, ccollect_delete_source(1), -ccollect_list_intervals(1), ccollect_logwrapper(1), - - -AUTHOR ------- -Nico Schottelius - - -RESOURCES ---------- -Main web site: http://www.nico.schottelius.org/software/ccollect/[] - - -COPYING -------- -Copyright \(C) 2007-2008 Nico Schottelius. Free use of this software is -granted under the terms of the GNU General Public License Version 3 (GPLv3). diff --git a/doc/man/ccollect_delete_source.text b/doc/man/ccollect_delete_source.text deleted file mode 100644 index 2b7f300..0000000 --- a/doc/man/ccollect_delete_source.text +++ /dev/null @@ -1,57 +0,0 @@ -ccollect_delete_source(1) -========================= -Nico Schottelius - - -NAME ----- -ccollect_delete_source - delete sources from ccollect(1) - - -SYNOPSIS --------- -'ccollect_delete_source.sh' [-d] [-f] - - -DESCRIPTION ------------ -ccollect_delete_source.sh deletes backup sources from ccollect(1) and optional -also the backups created for that source. - - -OPTIONS -------- --d: - Delete also the destination directory. `add_ccollect_source.sh` will change - to the source/'name'/destination directory, get the absolute name and delete - it recursively. --f: - Force deletion. Do not ask. Very handy for people who know what they do. - Very dangerous for everyone else. - - -FILES ------ -$CCOLLECT_CONF/sources:: - Directory containing the sources. $CCOLLECT_CONF is '/etc/ccollect', if unset. - -SEE ALSO --------- -ccollect(1), ccollect_add_source(1), ccollect_add_source(1), -ccollect_logwrapper(1), ccollect_list_intervals(1) - - -AUTHOR ------- -Nico Schottelius - - -RESOURCES ---------- -Main web site: http://www.nico.schottelius.org/software/ccollect/[] - - -COPYING -------- -Copyright \(C) 2007-2008 Nico Schottelius. Free use of this software is -granted under the terms of the GNU General Public License Version 3 (GPLv3). diff --git a/doc/man/ccollect_list_intervals.text b/doc/man/ccollect_list_intervals.text deleted file mode 100644 index 9df4121..0000000 --- a/doc/man/ccollect_list_intervals.text +++ /dev/null @@ -1,48 +0,0 @@ -ccollect_list_intervals(1) -========================== -Nico Schottelius - - -NAME ----- -ccollect_list_intervals - list available intervals from ccollect(1) - - -SYNOPSIS --------- -'ccollect_list_intervals.sh' - - -DESCRIPTION ------------ -ccollect_list_intervals.sh shows intervals specified in the configuration -for ccollect(1). It displays the name of each interval, followed by a colon -followed by the number backups to keep. - - -FILES ------ -$CCOLLECT_CONF/intervals:: - Directory containing the intervals. $CCOLLECT_CONF is '/etc/ccollect', if unset. - - -SEE ALSO --------- -collect(1), ccollect_add_source(1), ccollect_analyse_logs(1), -ccollect_delete_source(1), ccollect_logwrapper(1) - - -AUTHOR ------- -Nico Schottelius - - -RESOURCES ---------- -Main web site: http://www.nico.schottelius.org/software/ccollect/[] - - -COPYING -------- -Copyright \(C) 2007-2008 Nico Schottelius. Free use of this software is -granted under the terms of the GNU General Public License Version 3 (GPLv3). diff --git a/doc/man/ccollect_logwrapper.text b/doc/man/ccollect_logwrapper.text deleted file mode 100644 index 8084c10..0000000 --- a/doc/man/ccollect_logwrapper.text +++ /dev/null @@ -1,56 +0,0 @@ -ccollect_logwrapper(1) -====================== -Nico Schottelius - - -NAME ----- -ccollect_logwrapper - start ccollect(1) and create a unique logfile - - -SYNOPSIS --------- -'ccollect_logwrapper.sh' - - -DESCRIPTION ------------ -ccollect_logwrapper.sh creates a unique logfile below -'$CCOLLECT_CONF/logwrapper' and redirects ccollect(1) output -(stdout and stderr) to it. - - -OPTIONS -------- -Options are passed directly to ccollect(1). - - -FILES ------ -$CCOLLECT_CONF/logwrapper:: - Directory containing the configuration. $CCOLLECT_CONF is '/etc/ccollect', if unset. - -$CCOLLECT_CONF/logwrapper/destination:: - Link to the destination directory for the logfiles - - -SEE ALSO --------- -ccollect(1), ccollect_add_source(1), ccollect_analyse_logs(1), -ccollect_delete_source(1), ccollect_list_intervals(1) - - -AUTHOR ------- -Nico Schottelius - - -RESOURCES ---------- -Main web site: http://www.nico.schottelius.org/software/ccollect/[] - - -COPYING -------- -Copyright \(C) 2007-2008 Nico Schottelius. Free use of this software is -granted under the terms of the GNU General Public License Version 3 (GPLv3). diff --git a/doc/old/README b/doc/old/README deleted file mode 100644 index 56d0964..0000000 --- a/doc/old/README +++ /dev/null @@ -1 +0,0 @@ -ccollect-DE.text is not maintained anymore (no feedback from author). diff --git a/doc/old/ccollect-DE.text b/doc/old/ccollect-DE.text deleted file mode 100644 index 2fa6237..0000000 --- a/doc/old/ccollect-DE.text +++ /dev/null @@ -1,192 +0,0 @@ -ccollect- Installieren, Konfigurieren und Anwenden -=================================================== -Julian Meier -v0.1, Initiale Version vom 2006-03-04 -:Author Initials: JM - -*DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS -AKTUALISIERT WERDEN (siehe Englische Version)* -inkrementelle Datensicherung -mit 'hardlinks' und 'rsync' - -Einleitung ----------- -*DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS -AKTUALISIERT WERDEN (siehe Englische Version)* - -'ccollect' ist ein Backuptool geschrieben in der sh-skript Programmiersprache. -Es braucht nichts besonderes nur die '/bin/sh'-Konsole (oder eine kompatible). - -Installation ------------- - -Anforderungen -~~~~~~~~~~~~~ - -.Die aufgelisteten Werkzeuge müssen für das Benutzen von ccollect installiert sein: -- bc -- cp -- rsync -- date -- ssh (optional, wenn man ssh-Verbindungen nutzen moechte) - -Am besten überprüfen Sie das mit dem Befehl 'apt-get install bc rsync ssh'. -Beim Fehlen eines Werkzeuges wird dieses nachinstalliert. - -Installieren -~~~~~~~~~~~~ - -. Laden Sie sich die neuste Version von ccollect herunter. - Diese finden Sie unter: 'http://linux.schottelius.org/ccollect' -. Wechseln Sie in der Konsole mit "cd 'Pfad" in das Verzeichniss, - indem sich das ccollect Archiv befindet. - Entpacken Sie das Archiv mit "tar xvfj ccollect-$version.tar.bz2". - Am Besten ist es, wenn Sie jetzt in das Verzeichniss mit den - entpackten Daten wechseln: "cd 'pfad/'ccollect-'version'. -. Danach kopieren Sie die Datei 'ccollect.sh' aus dem entpackten Archiv nach - /usr/local/bin. Das geht mit dem Befehl "cp ccollect.sh /usr/local/bin". -. Nun ändern Sie die Rechte für die Datei damit jeder Benutzer das - Programm verwenden kann: "chmod 0755 /usr/local/bin/ccollect.sh" -. Erstellen Sie nun das Konfigurationsverzeichnis für ccollect: - "mkdir /etc/ccollect/" -. Starten sie nun zum Testen das Programm ccollect mit dem Befehl - `ccollect.sh` in der Konsole. - - -Konfiguration -------------- - -Konfigurationsverzeichnisse -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Die Konfigurationsdaten befinden sich bei ccollect im oben erstellten Verzeichnis -"/etc/ccollect". Um ccollect richtig konfigurieren zu können benötigen Sie -noch ein paar weitere Verzeichnisse: - -- "/etc/ccollect/defaults" mit: - 'mkdir /etc/ccollect/defaults' -- "/etc/ccollect/defaults/intervals" mit: - 'mkdir /etc/ccollect/defaults/intervals' -- "/etc/ccollect/sources" mit: - 'mkdir /etc/ccollect/sources' - - -Intervalle -~~~~~~~~~~ - -Der Intervall-Wert definiert, wie viele Backup-Versionen ccollect von -den gesicherten Daten behalten soll. -Der Name der Datei, in der der Wert steht, ist zugleich auch der -Name des Intervalls. - --------------------------------------------------------------- -julian@flumy:/etc/ccollect/defaults/intervals$ ls -daily -julian@flumy:/etc/ccollect/defaults/intervals$ cat daily -7 -julian@flumy:/etc/ccollect/defaults/intervals$ --------------------------------------------------------------- - - -Intervall erstellen -^^^^^^^^^^^^^^^^^^^^ -Sie erstellen einen Intervall wie folgt: - -. Wechseln Sie in das Intervall-Verzeichnis: 'cd /etc/ccollect/defaults/intervals'. -. Erstellen Sie einen neuen Intervall mit dem Befehl - "echo 'wert' > 'Intervall-Name'" - - -Sources -~~~~~~~ - -Mit Sourcen meint man bei 'ccollect' die Quelldaten. Der Wert einer 'source'-Datei -verweist auf einen Pfad in dem sich die zu sichernden Daten befinden. - -.Im Ordner '/etc/ccollect/sources/*' wird festgelegt: -- Der Sicherungs-Titel -- Quell- und Ziel-Verzeichnis -- Spezielle Einstellungen - -Sicherungs-Titel -^^^^^^^^^^^^^^^^ -Der Sicherungstitel ist der Name eines Ordners in /etc/ccollect/sources. - - -Man erstellt also ein neue neue Sicherung mit dem Befehl -"mkdir '/etc/ccollect/sources/'Sicherungs-Titel'". -In diesem Verzeichnis folgen dann die spezifischen Konfigurationsdaten -(nur!) für diese Sicherung. - -Quelle -~~~~~~ -Mit Quelle ist gemeint welche Daten gesichert werden. -Dies wird in der Konfigurationsdatei 'source' festgelegt. - -Diese liegt im Verzeichnis "/etc/ccollect/sources/'Sicherungs-Titel'". -Wechseln Sie in das Verzeichnis mit dem Sicherungs-Titel und erstellen Sie die -Datei mit "echo 'Quellpfad' > source". - -Exclude -^^^^^^^ -Es kann vorkommen das man in einem Verzeichniss alles sichern will -bis auf ein paar Unterordner. -Für dieses Vorhaben gibt es die Datei 'exclude', die sich wiederum -im Verzeichnis 'Sicherungs-Titel' befindet. - -Die Datei wird mit folgenden Schritten angelegt: - -. "echo 'Quellpfad/verzeichnis1 > exclude" - Ein Pfad wird weggelassen. -. "echo 'Quellpfad/verzeichnis2 >> exclude" - Ein weiterer Pfad der weggelassen wird. Das zweite '>' bewirkt, - das an die 'exclude'-Datei angefügt wird (das einfache '>' - ueberschreibt eine vorhandene Datei). - - -Ziel -~~~~ -Mit dem Ziel ist gemeint wohin die Sicherung gespeichert wird. -Dies geschieht mit einer Verknüpfung (Link), die 'destination' heisst. - -.Erstellen Sie diese mit den Befehlen -- "ln -s '/Pfad/zum/Speicherort/' destination" -- Mit dem Befehl "ls -l destination" kann man die Richtigkeit der - Verknüpfung überprüfen. - -[IMPORTANT] -============================== -Es -darf -immer -nur -eine -'source', -'destination', -und -'exclude' -Datei -vorhanden -sein. -============================== - - -Spezielles -~~~~~~~~~~ -Im Ordner "/etc/ccollect/sources/'Sicherung'" kann man weitere Daten einfügen -und damit Optionen ein- oder auszuschalten. - -'verbose':: - Beim Sicherungsvorgang ausführlich berichten ('-v' für 'rsync'). -'very_verbose':: - Beim Sicherungsvorgang sehr ausführlich berichten - ('-v' für 'rsync', 'mkdir', 'cp' und 'rm'). -'summary':: - 'ccollect' erstellt beim Beenden des Sicherungsvorganges eine - Zusammenfassung des Geschehenen. -'rsync_option':: - Alle Befehle in dieser Datei zu 'rsync' werden ausgeführt beim Sicherungsvorgang. -'pre_exec':: - Die Befehle im Inhalt dieser Datei werden vor dem Backup ausgeführt. -'post_exec':: - Die Befehle im Inhalt dieser Datei werden nach dem Backup ausgeführt. diff --git a/doc/release-checklist b/doc/release-checklist deleted file mode 100644 index 71b40ee..0000000 --- a/doc/release-checklist +++ /dev/null @@ -1,8 +0,0 @@ -* Change version and date in ccollect.sh -* Change version in documentation/ccollect.text -* Create tarball -* Transfer to website -* Extract files -* Update website -* Announce on freshmeat -* Announce on announce@ diff --git a/doc/todos.text b/doc/todos.text deleted file mode 100644 index cf687cb..0000000 --- a/doc/todos.text +++ /dev/null @@ -1,45 +0,0 @@ -ccollect todos -============== -Nico Schottelius -0.1, for the current ccollect version -:Author Initials: NS - - -These todos are things that would be senseful todo, but are just nice -to have. This means I won't code them, so somebody can code them. - -- Add ccollect-restore.sh - (new project, perhaps coordinated with jchome's ccollect-config) - - Helper (in dialog?) to restore backups - - Perhaps create ccollect-gui.{whatever} instead, which does all the - end user staff? - - Including cronjob, creating configuration, displaying status of - backups, allowing manual remove, allowing manual trigger of ccollect - (with realtime message window?)? - -- write mkccollectconfig (for 0.5!) - -> jchome works on it! - o create source configuration - o another script for changing defaults - x intervalls - x pre-/post exec - o (X)dialog based - -- add option ("run_only_once") to prevent ccollect to run twice - (per source/general) - -> or create wrapper, that takes care of it - -- add support for wipe - -- cleanup doc/: remove old stuff, make clear what can be installeld, - cleanup ccollect-restoring.text - -- clean logwrapper.text and probably create logwrapper, that does - what is being stated in logwrapper.text - -- include pdf support again (Makefile:72) - -- integrate website into ccollect -> updates are done here diff --git a/release.sh b/release.sh index ae095ec..f5e5642 100755 --- a/release.sh +++ b/release.sh @@ -1,60 +1,23 @@ -#!/bin/sh -# -# 200?-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Standard release script for dummies like me -# - -if [ $# -ne 2 ]; then - echo "$0: version description" +if [ $# -ne 1 ]; then + echo "$0: ccollect dir" exit 23 fi -echo "Did you change version and date information in the script?" -read bla - -VERSION="$1"; shift -DESCRIPTION="$1"; shift -NAME=ccollect-${VERSION} +NAME=$1 TARNAME=${NAME}.tar.bz2 -TARLOCAL=../${TARNAME} -#DHOST=nico@home.schottelius.org -DHOST=nico@localhost -#DDIR=www/unix.schottelius.org/www/ccollect/ -DDIR=/home/users/nico/privat/computer/net/netzseiten/www.nico.schottelius.org/src/software/ccollect + +DHOST=nico@creme.schottelius.org +DDIR=www/org/schottelius/linux/ccollect/ DESTINATION="$DHOST:$DDIR" -set -e -set -x -git tag -m "$DESCRIPTION" "$VERSION" -git push --mirror -git archive --prefix="${NAME}/" "$VERSION" | bzip2 > "$TARLOCAL" -scp "${TARLOCAL}" "$DESTINATION" +tar cvfj "$TARNAME" \ + --exclude=.git \ + --exclude="conf/sources/*/destination/*" "$NAME" -# create & publish documentation for the end user -make publish-doc +scp "${TARNAME}" "$DESTINATION" - -ssh "$DHOST" "( cd "$DDIR" &&; tar xfj \"$TARNAME\" )" +ssh "$DHOST" "( cd $DDIR; tar xfj \"$TARNAME\" )" echo "setting paranoid permissions to public..." -ssh "$DHOST" "( cd "$DDIR" && find -type d -exec chmod 0755 {} \; )" -ssh "$DHOST" "( cd "$DDIR" &&; find -type f -exec chmod 0644 {} \; )" - -cat "doc/release-checklist" -exit 0 +ssh "$DHOST" "( cd $DDIR; find -type d -exec chmod 0755 {} \; )" +ssh "$DHOST" "( cd $DDIR; find -type f -exec chmod 0644 {} \; )" diff --git a/test/conf/ccollect_local-with b/test/conf/ccollect_local-with deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/ccollect_source b/test/conf/ccollect_source deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/defaults/intervals/monthly b/test/conf/defaults/intervals/monthly deleted file mode 100644 index b8626c4..0000000 --- a/test/conf/defaults/intervals/monthly +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/test/conf/defaults/intervals/normal b/test/conf/defaults/intervals/normal deleted file mode 100644 index b8626c4..0000000 --- a/test/conf/defaults/intervals/normal +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/test/conf/defaults/post_exec b/test/conf/defaults/post_exec deleted file mode 100755 index 0dac0ed..0000000 --- a/test/conf/defaults/post_exec +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo 'General post_exec executed.' diff --git a/test/conf/defaults/pre_exec b/test/conf/defaults/pre_exec deleted file mode 100755 index 451fdad..0000000 --- a/test/conf/defaults/pre_exec +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo 'General pre__exec executed.' diff --git a/test/conf/defaults/sources/exclude b/test/conf/defaults/sources/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/test/conf/defaults/sources/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/test/conf/defaults/sources/rsync_options b/test/conf/defaults/sources/rsync_options deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/defaults/sources/verbose b/test/conf/defaults/sources/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/defaults/verbose b/test/conf/defaults/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/delete_incomplete/delete_incomplete b/test/conf/sources/delete_incomplete/delete_incomplete deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/delete_incomplete/destination b/test/conf/sources/delete_incomplete/destination deleted file mode 100644 index c2a7c55..0000000 --- a/test/conf/sources/delete_incomplete/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/backup diff --git a/test/conf/sources/delete_incomplete/exclude b/test/conf/sources/delete_incomplete/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/test/conf/sources/delete_incomplete/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/test/conf/sources/delete_incomplete/source b/test/conf/sources/delete_incomplete/source deleted file mode 100644 index 9e90576..0000000 --- a/test/conf/sources/delete_incomplete/source +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/source diff --git a/test/conf/sources/local-with&ersand/destination b/test/conf/sources/local-with&ersand/destination deleted file mode 100644 index c2a7c55..0000000 --- a/test/conf/sources/local-with&ersand/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/backup diff --git a/test/conf/sources/local-with&ersand/exclude b/test/conf/sources/local-with&ersand/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/test/conf/sources/local-with&ersand/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/test/conf/sources/local-with&ersand/source b/test/conf/sources/local-with&ersand/source deleted file mode 100644 index 9e90576..0000000 --- a/test/conf/sources/local-with&ersand/source +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/source diff --git a/test/conf/sources/local-with-interval/delete_incomplete b/test/conf/sources/local-with-interval/delete_incomplete deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/local-with-interval/destination b/test/conf/sources/local-with-interval/destination deleted file mode 100644 index 4de7e06..0000000 --- a/test/conf/sources/local-with-interval/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/backup-chint diff --git a/test/conf/sources/local-with-interval/exclude b/test/conf/sources/local-with-interval/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/test/conf/sources/local-with-interval/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/test/conf/sources/local-with-interval/intervals/daily b/test/conf/sources/local-with-interval/intervals/daily deleted file mode 100644 index e440e5c..0000000 --- a/test/conf/sources/local-with-interval/intervals/daily +++ /dev/null @@ -1 +0,0 @@ -3 \ No newline at end of file diff --git a/test/conf/sources/local-with-interval/source b/test/conf/sources/local-with-interval/source deleted file mode 100644 index 9e90576..0000000 --- a/test/conf/sources/local-with-interval/source +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/source diff --git a/test/conf/sources/local-with-interval/verbose b/test/conf/sources/local-with-interval/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/local/destination b/test/conf/sources/local/destination deleted file mode 100644 index c2a7c55..0000000 --- a/test/conf/sources/local/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/backup diff --git a/test/conf/sources/local/exclude b/test/conf/sources/local/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/test/conf/sources/local/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/test/conf/sources/local/no_verbose b/test/conf/sources/local/no_verbose deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/local/source b/test/conf/sources/local/source deleted file mode 100644 index 9e90576..0000000 --- a/test/conf/sources/local/source +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/source diff --git a/test/conf/sources/source with spaces and interval/delete_incomplete b/test/conf/sources/source with spaces and interval/delete_incomplete deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/source with spaces and interval/destination b/test/conf/sources/source with spaces and interval/destination deleted file mode 100644 index c2a7c55..0000000 --- a/test/conf/sources/source with spaces and interval/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/backup diff --git a/test/conf/sources/source with spaces and interval/exclude b/test/conf/sources/source with spaces and interval/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/test/conf/sources/source with spaces and interval/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/test/conf/sources/source with spaces and interval/source b/test/conf/sources/source with spaces and interval/source deleted file mode 100644 index 9e90576..0000000 --- a/test/conf/sources/source with spaces and interval/source +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/source diff --git a/test/conf/sources/source with spaces and interval/verbose b/test/conf/sources/source with spaces and interval/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/very_verbose/destination b/test/conf/sources/very_verbose/destination deleted file mode 100644 index c2a7c55..0000000 --- a/test/conf/sources/very_verbose/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/backup diff --git a/test/conf/sources/very_verbose/exclude b/test/conf/sources/very_verbose/exclude deleted file mode 100644 index 6b8710a..0000000 --- a/test/conf/sources/very_verbose/exclude +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/test/conf/sources/very_verbose/source b/test/conf/sources/very_verbose/source deleted file mode 100644 index 9e90576..0000000 --- a/test/conf/sources/very_verbose/source +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/source diff --git a/test/conf/sources/very_verbose/summary b/test/conf/sources/very_verbose/summary deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/very_verbose/verbose b/test/conf/sources/very_verbose/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/very_verbose/very_verbose b/test/conf/sources/very_verbose/very_verbose deleted file mode 100644 index e69de29..0000000 diff --git a/test/conf/sources/with_exec/destination b/test/conf/sources/with_exec/destination deleted file mode 100644 index c2a7c55..0000000 --- a/test/conf/sources/with_exec/destination +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/backup diff --git a/test/conf/sources/with_exec/post_exec b/test/conf/sources/with_exec/post_exec deleted file mode 100755 index abc0a40..0000000 --- a/test/conf/sources/with_exec/post_exec +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/cat - -###################################################################### -Source post_exec executed. -###################################################################### diff --git a/test/conf/sources/with_exec/pre_exec b/test/conf/sources/with_exec/pre_exec deleted file mode 100755 index ba7b2af..0000000 --- a/test/conf/sources/with_exec/pre_exec +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/cat - -###################################################################### -Source pre_exec executed. -###################################################################### diff --git a/test/conf/sources/with_exec/source b/test/conf/sources/with_exec/source deleted file mode 100644 index 9e90576..0000000 --- a/test/conf/sources/with_exec/source +++ /dev/null @@ -1 +0,0 @@ -/tmp/ccollect/source diff --git a/tools/README b/tools/README deleted file mode 100644 index bbc9706..0000000 --- a/tools/README +++ /dev/null @@ -1,18 +0,0 @@ -Files and their tasks / destinations: - -ccollect_add_source: bin -ccollect_analyse_logs: bin -ccollect_create_source2: ??? -ccollect_create_source: ??? -ccollect_delete_source: bin -ccollect_list_intervals: bin -ccollect_logwrapper: bin -ccollect-stats: ??? -config-pre-0.4-to-0.4.BUGS: only to be used for converting -config-pre-0.4-to-0.4: only to be used for converting -config-pre-0.4-to-0.4.sub: only to be used for converting -config-pre-0.6-to-0.6: only to be used for converting -config-pre-0.6-to-0.6.sub: only to be used for converting -config-pre-0.7-to-0.7: only to be used for converting -config-pre-0.7-to-0.7.sub: only to be used for converting -README diff --git a/tools/called_from_remote_pre_exec b/tools/called_from_remote_pre_exec deleted file mode 100755 index f458114..0000000 --- a/tools/called_from_remote_pre_exec +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# 2011 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Support backup triggering and actual backup through -# ssh tunnel -# -# Use the supplied called_from_remote script as pre…exec -# -# - -export ssh_remote_port="$1"; shift -export backup_host="$1"; shift - -ssh -R$ssh_remote_port:127.0.0.1:22 "$backup_host" "ccollect" "$@" diff --git a/tools/ccollect_add_source b/tools/ccollect_add_source deleted file mode 100755 index 4a60d38..0000000 --- a/tools/ccollect_add_source +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh -# -# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# 2007-08-16: Written for Netstream (www.netstream.ch) -# -# Creates a source from standard values specified in -# /etc/ccollect/defaults/sources -# - -# standard values -CCOLLECT_CONF="${CCOLLECT_CONF:-/etc/ccollect}" -CSOURCES="${CCOLLECT_CONF}/sources" -CDEFAULTS="${CCOLLECT_CONF}/defaults" -SCONFIG="${CDEFAULTS}/sources" - -# standard options: variable2filename -exclude="exclude" -summary="summary" -intervals="intervals" -pre_exec="pre_exec" -post_exec="post_exec" -rsync_options="rsync_options" -verbose="verbose" -very_verbose="very_verbose" - -# options that we simply copy over -standard_opts="exclude summary intervals pre_exec post_exec rsync_options verbose very_verbose" - -# options not in standard ccollect, used only for source generation -src_prefix="${SCONFIG}/source_prefix" -src_postfix="${SCONFIG}/source_postfix" -destination_base="${SCONFIG}/destination_base" - -self="$(basename $0)" - -# functions first -_echo() -{ - echo "${self}> $@" -} - -_exit_err() -{ - _echo "$@" - rm -f "$TMP" - exit 1 -} - -# argv -if [ $# -lt 1 ]; then - _exit_err "" -fi - -_echo "Reading defaults from ${SCONFIG} ..." - -while [ $# -gt 0 ]; do - source="$1"; shift - - # Create - _echo "Creating ${source} ..." - - fullname="${CSOURCES}/${source}" - - # create source - if [ -e "${fullname}" ]; then - _echo "${fullname} already exists. Skipping." - continue - fi - mkdir -p "${fullname}" || _exit_err Cannot create \"${fullname}\". - - # copy standard files - for file in $standard_opts; do - eval rfile=\"\$$file\" - eval filename="${SCONFIG}/${rfile}" - if [ -e "${filename}" ]; then - _echo Copying \"$rfile\" to ${fullname} ... - cp -r "${filename}" "${fullname}/${rfile}" - fi - done - - # create source entry - if [ -f "${src_prefix}" ]; then - source_source="$(cat "${src_prefix}")" || _exit_err "${src_prefix}: Reading failed." - fi - source_source="${source_source}${source}" - if [ -f "${src_postfix}" ]; then - source_source="${source_source}$(cat "${src_postfix}")" || _exit_err "${src_postfix}: Reading failed." - fi - _echo "Adding \"${source_source}\" as source for ${source}" - echo "${source_source}" > "${fullname}/source" || _exit_err "Creating ${fullname}/source: failed." - - # create destination directory - absbase=$(cd "${destination_base}" 2>/dev/null && pwd -P) || \ - _exit_err "${destination_base} must exist before creating sources." - - dest="${absbase}/${source}" - _echo "Creating ${dest} ..." - mkdir -p "${dest}" || _exit_err "${dest}: Cannot create." - - # link destination directory - dest_abs=$(cd "${dest}" && pwd -P) || _exit_err "${dest}: Changing to newly created directory failed." - echo "${dest_abs}" > "${fullname}/destination" || \ - _exit_err "${fullname}/destination: Failed to create." - -done - -exit 0 diff --git a/tools/ccollect_analyse_logs b/tools/ccollect_analyse_logs deleted file mode 100644 index 7d48d54..0000000 --- a/tools/ccollect_analyse_logs +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/sh -# -# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Written for Netstream (www.netstream.ch) on Di 21. Aug 17:10:15 CEST 2007 -# -# Analyse logs -# - -version=0.2 -date=2008-06-13 -fullversion="${version} (${date})" -args=iwe - -usage() { - echo "$(basename "$0") ${fullversion}: [iwe]" - echo "" - echo " i: print informational messages" - echo " w: print warning messages" - echo " e: print error messages" - echo "" - echo "Reading input from stdin, displaying to stdout." - exit 1 -} - -# -# read and verify argv -# -if [ "$#" -ne 1 ]; then - usage -fi -argv="$1"; shift - -wrong="$(echo ${argv} | grep -e "[^${args}]")" -if [ "${wrong}" ]; then - usage -fi - - -# set output levels -search_err="$(echo ${argv} | grep 'e')" -search_warn="$(echo ${argv} | grep 'w')" -search_info="$(echo ${argv} | grep 'i')" - -# -# Interesting strings in the logs: errors -# --------------------------------------- - -if [ "$search_err" ]; then - set -- "$@" "-e" 'Read from remote host .*: Connection timed out$' - set -- "$@" "-e" 'Read from remote host .*: Connection reset by peer$' - set -- "$@" "-e" 'rsync: .*: Invalid argument (22)$' - set -- "$@" "-e" 'rsync: .*: Input/output error (5)$' - set -- "$@" "-e" 'cannot send long-named file "' - set -- "$@" "-e" 'ERROR: .* failed verification -- update discarded.$' - set -- "$@" "-e" 'Host key verification failed.' - set -- "$@" "-e" 'ssh: connect to host .*: Connection timed out' - set -- "$@" "-e" 'rsync error: unexplained error (code 255)' - set -- "$@" "-e" 'rsync: connection unexpectedly closed' - set -- "$@" "-e" 'rsync: send_files failed to open' - set -- "$@" "-e" 'rsync: readlink_stat .* failed: File name too long' - set -- "$@" "-e" 'IO error encountered .* skipping file deletion' - set -- "$@" "-e" 'rsync: read error: Connection reset by peer' - set -- "$@" "-e" 'rsync error: error in rsync protocol data stream' -fi - -# known error strings: -#[ddba049.netstream.ch] receiving file list ... rsync: readdir("/proc"): Invalid argument (22) -#[ddba033.netstream.ch] rsync: readlink "/usr/local/inetpub2/webmailroot/2wire.ch/royal@2wire.ch" failed: Input/output error (5) -#[ddba033.netstream.ch] rsync: read errors mapping "/usr/local/inetpub2/netstream/adsl.netstream.ch/mrtg/lbswiss.rrd": Input/output error (5) -#[zrha165.netstream.ch] Read from remote host zrha165.netstream.ch: Connection reset by peer -#[ddba017.netstream.ch] receiving file list ... cannot send long-named file "/usr/local/www/apache22/cgi-bin/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/ backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/bac kup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup /backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/ba ckup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backu p/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/backup/back" -#[ddba033.netstream.ch] ERROR: usr/local/inetpub2/netstream/adsl.netstream.ch/mrtg/lbswiss.rrd failed verification -- update discarded. -# [ddba034.netstream.ch] Host key verification failed. -# [ddba034.netstream.ch] rsync error: unexplained error (code 255) at io.c(454) [receiver=2.6.9] -# [ddba034.netstream.ch] rsync: connection unexpectedly closed (0 bytes received so far) [receiver] - - - - -# -# Interesting strings in the logs: warnings -# ----------------------------------------- -#[ddba033.netstream.ch] rsync: read errors mapping "/usr/local/inetpub2/netstream/adsl.netstream.ch/mrtg/lbswiss.rrd": Input/output error (5) - -# [ddba015.netstream.ch] send_files failed to open /usr/local/dnscache/log/main/@4000000046ca0f3616939c14.s: No such file or directory -# [ddba015.netstream.ch] 2007-08-21-02:17:28: Finished backup (rsync return code: 23). -# [ddba017.netstream.ch] file has vanished: "/var/spool/postfix/active/657575D686" -#[ddba026.netstream.ch] 2007-08-21-05:35:13: Finished backup (rsync return code: 24). -#[ddba045.netstream.ch] send_files failed to open /data/hsphere/local/var/named/logs/@4000000046c98fa9079f39ac.s: No such file or directory -# file has vanished: ".*" - -if [ "$search_warn" ]; then - # warn on non-zero exit code - set -- "$@" "-e" 'Finished backup (rsync return code: [^0]' - set -- "$@" "-e" 'rsync: file has vanished' - set -- "$@" "-e" 'WARNING: .* failed verification -- update discarded (will try again).' -fi -# known warnings: -#[ddba033.netstream.ch] WARNING: usr/local/inetpub2/netstream/adsl.netstream.ch/mrtg/lbswiss.rrd failed verification -- update discarded (will try again). - - -# -# Interesting strings in the logs: informational -# ---------------------------------------------- -if [ "$search_info" ]; then - set -- "$@" "-e" 'Number of files: [[:digit:]]*' - set -- "$@" "-e" 'Number of files transferred: [[:digit:]]*' - set -- "$@" "-e" 'Total transferred file size: [[:digit:]]* bytes' - set -- "$@" "-e" 'total size is [[:digit:]]* speedup is' - set -- "$@" "-e" 'Backup lasted: [[:digit:]]*:[[:digit:]]\{1,2\}:[[:digit:]]* (h:m:s)$' - set -- "$@" "-e" 'sent [[:digit:]]* bytes received [0-9]* bytes' -fi - -# info includes: -#[ddba012.netstream.ch] total size is 22384627486 speedup is 13.75 -# [u0160.nshq.ch.netstream.com] 2007-08-20-18:26:06: Backup lasted: 0:43:34 (h:m:s) -#[ddba012.netstream.ch] sent 3303866 bytes received 1624630525 bytes 122700.92 bytes/sec - -#echo Parameters: "$@" - -grep "$@" diff --git a/tools/ccollect_archive_config b/tools/ccollect_archive_config deleted file mode 100755 index f42c88a..0000000 --- a/tools/ccollect_archive_config +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# 2009 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Write a tar containing the configuration -# - -# standard values -CCOLLECT_CONF="${CCOLLECT_CONF:-/etc/ccollect}" - -self="$(basename $0)" - -# functions first -_echo() -{ - echo "${self}> $@" -} - -_exit_err() -{ - _echo "$@" - rm -f "$TMP" - exit 1 -} - -# argv -if [ $# -ne 1 ]; then - _echo "${self} " - _exit_err "Exiting." -fi - -file="$1" - -_echo "Creating $file ..." - -[ -d "${CCOLLECT_CONF}" ] || _exit_err "No configuration in $CCOLLECT_CONF" - -tar cf "$file" "${CCOLLECT_CONF}" diff --git a/tools/ccollect_check_config b/tools/ccollect_check_config deleted file mode 100644 index c24a400..0000000 --- a/tools/ccollect_check_config +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# 2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# - -################################################################################ -# standard vars stolen from cconf -__pwd="$(pwd -P)" -__mydir="${0%/*}"; __abs_mydir="$(cd "$__mydir" && pwd -P)" -__myname=${0##*/}; __abs_myname="$__abs_mydir/$__myname" - - -################################################################################ -# ccollect standard vars -CCOLLECT_CONF="${CCOLLECT_CONF:-/etc/ccollect}" -CDEFAULTS="${CCOLLECT_CONF}/defaults" -CLOGDIR="${CDEFAULTS}/logdir" -CRONTAB="${CRONTAB:-/etc/crontab}" - -# Parameters: -# -c, --crontab -# -f, --fix -# -l, --logs - - diff --git a/tools/ccollect_delete_source b/tools/ccollect_delete_source deleted file mode 100755 index 509e95f..0000000 --- a/tools/ccollect_delete_source +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# -# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# 2007-08-16 Written for Netstream (www.netstream.ch) -# Delete sources and their backups (optionally). -# - -# standard values -CCOLLECT_CONF="${CCOLLECT_CONF:-/etc/ccollect}" -CSOURCES="${CCOLLECT_CONF}/sources" - -self="$(basename $0)" - -# functions first -_echo() -{ - echo "${self}> $@" -} - -_exit_err() -{ - _echo "$@" - rm -f "$TMP" - exit 1 -} - -# argv -if [ $# -lt 1 ]; then - _echo "${self} [-f] [-d] " - _echo " -f: Do not ask, simply delete. Dangerous and good for sysadmins." - _echo " -d: Also delete the destination (removes all backups)" - _exit_err "Exiting." -fi - -params_possible=yes -force="" -backups="" - -while [ $# -gt 0 ]; do - if [ "$params_possible" ]; then - case "$1" in - "-f"|"--force") - force="-r" - shift; continue - ;; - "-d"|"--destination") - backups=yes - shift; continue - ;; - --) - params_possible="" - shift; continue - ;; - -*|--*) - _exit_err "Unknown option: $1" - ;; - esac - fi - - # Reached here? So there are no more parameters. - params_possible="" - - source="$1"; shift - - # Create - _echo "Deleting ${source} ..." - fullname="${CSOURCES}/${source}" - - # ask the user per source, if she's not forcing us - if [ -z "$force" ]; then - sure="" - echo -n "Do you really want to delete ${source} (y/n)? " - read sure - - if [ "$sure" != "y" ]; then - _echo "Skipping ${source}." - continue - fi - fi - - if [ "$backups" ]; then - ddir="$(cat "${fullname}/destination")" - absdir="$(cd "${ddir}" && pwd -P)" || _exit_err "Cannot change to ${ddir}" - _echo "Deleting ${absdir} ..." - echo rm -r $force "${absdir}" - fi - - _echo "Deleting ${fullname} ..." - echo rm -r $force "${fullname}" -done - -exit 0 diff --git a/tools/ccollect_list_intervals b/tools/ccollect_list_intervals deleted file mode 100755 index d95bbde..0000000 --- a/tools/ccollect_list_intervals +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# 2006-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Initially written on 24-Jun-2006 -# - -CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} -CCOLLECT_INTERVALS="$CCOLLECT_CONF/defaults/intervals" - -me="$(basename $0)" - -_echo() -{ - echo "$me> $@" -} - -if [ ! -d "${CCOLLECT_INTERVALS}" ]; then - _echo "No intervals defined in ${CCOLLECT_INTERVALS}" - exit 1 -fi - -set -e -cd "${CCOLLECT_INTERVALS}" - -for interval in *; do - eval int_${interval}=$(cat "${interval}"); - eval echo ${interval}: \$int_${interval}; -done diff --git a/tools/ccollect_logwrapper b/tools/ccollect_logwrapper deleted file mode 100755 index 95e6fbb..0000000 --- a/tools/ccollect_logwrapper +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Written for Netstream (www.netstream.ch) on Fr 8. Jun 10:30:24 CEST 2007 -# -# Call the log-wrapper instead of ccollect.sh and it will create nice logs -# - -# -# where to find our configuration and temporary file -# -CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} -LOGCONF=$CCOLLECT_CONF/logwrapper - -logdir="${LOGCONF}/destination" -CDATE="date +%Y%m%d-%H%M" -we="$(basename $0)" -pid=$$ - -export ccollect_logfile="${logdir}/$(${CDATE}).${pid}" - -# use syslog normally -# Also use echo, can be redirected with > /dev/null if someone cares -_echo() -{ - string="${we} (${pid}): $@" - logger "${string}" - echo "${string}" -} - - -# exit on error -_exit_err() -{ - _echo "$@" >&2 - rm -f "${TMP}" - exit 1 -} - -# put everything into that specified file -_echo "Starting with arguments: $@" -touch "${ccollect_logfile}" || _exit_err "Failed to create ${ccollect_logfile}" - -# First line in the logfile is always the commandline -echo ccollect "$@" > "${ccollect_logfile}" 2>&1 -ccollect "$@" >> "${ccollect_logfile}" 2>&1 - -_echo "Finished." diff --git a/tools/ccollect_push b/tools/ccollect_push deleted file mode 100755 index f458114..0000000 --- a/tools/ccollect_push +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# 2011 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Support backup triggering and actual backup through -# ssh tunnel -# -# Use the supplied called_from_remote script as pre…exec -# -# - -export ssh_remote_port="$1"; shift -export backup_host="$1"; shift - -ssh -R$ssh_remote_port:127.0.0.1:22 "$backup_host" "ccollect" "$@" diff --git a/tools/ccollect_stats b/tools/ccollect_stats deleted file mode 100644 index bfaefab..0000000 --- a/tools/ccollect_stats +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# 2007 Daniel Aubry -# 2008 Nico Schottelius (added minimal header) -# -# Copying license: GPL2-only -# - -# TODO: -# add variables, add copying, add configuration - -if [ ! -e /tmp/ccollect-stats.lock ] -then - touch /tmp/ccollect-stats.lock - - # changes after license clearify - # for dest in /etc/ccollect/sources/ -type f -name destination | while read line - - find /etc/ccollect/sources/ -type l | while read line - d=$(basename $(readlink $line)) - echo "====[Backup: $backupname]====" | tee -a /var/log/backup.log - du -sh $line/* | tee -a /var/log/backup.log - done - rm /tmp/ccollect-stats.lock -fi diff --git a/tools/config-pre-0.4-to-0.4 b/tools/config-pre-0.4-to-0.4 deleted file mode 100755 index 23b3307..0000000 --- a/tools/config-pre-0.4-to-0.4 +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -# 2006-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Written on Do Apr 27 09:13:26 CEST 2006 -# - -if [ $# -ne 1 ]; then - echo "$0: ccollect-configuration directory" - echo "" - echo " Fix pre 0.4 configuration directories to match 0.4 style" - echo "" - exit 23 -fi - -tmp=$(mktemp) -tmp2=$(mktemp) -script=$(echo $0 | sed 's/\.sh/.sub.sh/') - -find "$1" -type d -name intervalls > "$tmp" - -# -# reverse found data, so deepest directories are renamed first -# -tac "$tmp" > "$tmp2" - -while read intervals - do - "$script" "$intervals" -done < "$tmp2" - -rm -f "$tmp" "$tmp2" diff --git a/tools/config-pre-0.4-to-0.4.BUGS b/tools/config-pre-0.4-to-0.4.BUGS deleted file mode 100644 index 2be9d21..0000000 --- a/tools/config-pre-0.4-to-0.4.BUGS +++ /dev/null @@ -1,27 +0,0 @@ --------------------------------------------------------------------------------- -BUGS, 2006-04-27, Nico Schottelius --------------------------------------------------------------------------------- -The scripts are only for 'standard' configurations. - -If you've multiple directories named 'intervalls', the -scripts will try to replace _all_ instances of intervalls with -"intervals". - -This will fail: - - intervalls/defaults/intervalls/ exists before. - - Then we'll replace the first time: - - intervals/defaults/intervalls/ exists now. - - Then find will fail, as the first directory disappeared. - -Also, if you have a source named 'intervalls' -(why so ever you would want to have something like that) and -a 'intervalls' directory below it, it will rename your source. - -Yes this is a bug. - -No, I do not care about it, this is just a dumb helper script which -should be used once. diff --git a/tools/config-pre-0.4-to-0.4.sub b/tools/config-pre-0.4-to-0.4.sub deleted file mode 100755 index e28e718..0000000 --- a/tools/config-pre-0.4-to-0.4.sub +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# -# 2006-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Written on Do Apr 27 09:13:26 CEST 2006 -# - -master=$(echo $0 | sed 's/\.sub//') - -if [ $# -ne 1 ]; then - echo "$0:" - echo "" - echo " DO NOT CALL ME DIRECTLY" - echo "" - echo "Use $master, please." - exit 23 -fi - -# strip trailing / -oldname=$(echo $1 | sed 's,/$,,') - -# replace the last component of the path "intervalls" -newname=$(echo $oldname | sed 's/intervalls$/intervals/') - -echo mv "$oldname" "$newname" -mv "$oldname" "$newname" diff --git a/tools/config-pre-0.6-to-0.6 b/tools/config-pre-0.6-to-0.6 deleted file mode 100755 index 1a4bc2f..0000000 --- a/tools/config-pre-0.6-to-0.6 +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Written on 20070816-2225 -# Transfer configuration to 0.6 layout -# - -if [ $# -ne 1 ]; then - echo "$0: ccollect-configuration directory" - echo "" - echo " Fix pre 0.6 configuration directories to match 0.6 style" - echo "" - exit 23 -fi - -dir="$1" -script="${0}.sub" - -find "${dir}/sources/" -type f -name rsync_options -exec "${script}" {} \; - -echo "Finished." diff --git a/tools/config-pre-0.6-to-0.6.sub b/tools/config-pre-0.6-to-0.6.sub deleted file mode 100755 index 7744f9e..0000000 --- a/tools/config-pre-0.6-to-0.6.sub +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Written on 20070816-2227 -# Transfer configuration to 0.6 layout (subscript) -# - -if [ $# -ne 1 ]; then - echo "$0: rsync_options file" - echo "" - echo " Fix pre 0.6 configuration directories to match 0.6 style (sub)" - echo "" - exit 23 -fi - -tmp=$(mktemp) - -echo "Working on $1 ..." - -for option in $(cat "$1"); do - echo "${option}" >> "${tmp}" -done -mv ${tmp} "$1" diff --git a/tools/config-pre-0.7-to-0.7 b/tools/config-pre-0.7-to-0.7 deleted file mode 100755 index 3098728..0000000 --- a/tools/config-pre-0.7-to-0.7 +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# 2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Convert configuration to 0.7 layout -# - -if [ $# -ne 1 ]; then - echo "$0: ccollect-configuration directory" - echo "" - echo " Fix pre 0.7 configuration directories to match 0.7 style" - echo "" - exit 23 -fi - -dir="$1" -script="${0}.sub" - -find "${dir}/sources/" -name destination -exec "${script}" {} \; - -echo "Finished." diff --git a/tools/config-pre-0.7-to-0.7.sub b/tools/config-pre-0.7-to-0.7.sub deleted file mode 100755 index 5bc6f75..0000000 --- a/tools/config-pre-0.7-to-0.7.sub +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# -# 2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Helper script -# - -if [ $# -ne 1 ]; then - echo "$0: destination-file" - echo "" - echo " Fix pre 0.7 configuration directories to match 0.6 style (sub)" - echo "" - exit 23 -fi - -tmp=$(mktemp) -file="$1" - -echo "Working on $file ..." - -if [ -L "${file}" ]; then - echo "Converting ${file} ..." - dir="$(cd "${file}" && pwd -P)"; ret=$? - - if [ $ret -ne 0 ]; then - echo "ERROR: $file is a broken link" - exit 1 - else - echo "${dir}" > "${tmp}" - rm -f "${file}"; ret=$? - if [ $ret -ne 0 ]; then - echo "ERROR: Removing $file failed" - exit 1 - fi - mv "${tmp}" "${file}"; ret=$? - if [ $ret -ne 0 ]; then - echo "ERROR: Moving ${tmp} to ${file} failed, your source is broken." - exit 1 - fi - fi -else - echo "$file is not a link, not converting" - exit 1 -fi diff --git a/tools/old/ccollect_create_source.sh b/tools/old/ccollect_create_source.sh deleted file mode 100755 index 7a34c6b..0000000 --- a/tools/old/ccollect_create_source.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# Nico Schottelius -# 2007-08-07 -# Written for Netstream (www.netstream.ch) -# Creates a source, including exclude - -# standard values -CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} -CSOURCES=$CCOLLECT_CONF/sources -CDEFAULTS=$CCOLLECT_CONF/defaults - -self=$(basename $0) - -# functions first -_echo() -{ - echo "${self}> $@" -} - -_exit_err() -{ - _echo "$@" - rm -f "$TMP" - exit 1 -} - -# argv -if [ $# -ne 3 ]; then - _echo " " - _echo "Example: \"my-notebook\" \"192.168.42.42\" \"/home/server/backup/my-notebook\"" - exit 1 -fi - -name="$1" -source="$2" -destination="$3" -fullname="${CSOURCES}/${name}" - -# Tests -if [ -e "${fullname}" ]; then - _echo "${fullname} already exists. Aborting." - exit 2 -fi - -_echo "Trying to reach ${source} ..." -ping -c1 "${source}" || _exit_err "Cannot reach ${source}. Aborting." - -# Create -_echo "Creating ${fullname} ..." -mkdir -p "${fullname}" || exit 3 - -echo "root@${source}:/" > "${fullname}/source" -cat << eof > "${fullname}/exclude" || exit 4 -/dev/* -/proc/* -/tmp/* -eof - -# Destination -if [ -e "${destination}" ]; then - if [ ! -d "${destination}" ]; then - echo "${destination} exists, but is not a directory. Aborting." - exit 5 - fi -else - _echo "Creating ${destination} ..." - mkdir -p "${destination}" || _exit_err "Failed to create ${destination}." -fi - -ln -s "${destination}" "${fullname}/destination" || \ - _exit_err "Failed to link \"${destination}\" to \"${fullname}/destination\"" - -# finish -_echo "Added some default values, please verify \"${fullname}\"." -_echo "Finished." diff --git a/tools/old/ccollect_create_source2.sh b/tools/old/ccollect_create_source2.sh deleted file mode 100755 index 842afb6..0000000 --- a/tools/old/ccollect_create_source2.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh -# Nico Schottelius -# 2007-08-07 -# Written for Netstream (www.netstream.ch) -# Creates a source, including exclude - -# standard values -CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} -CSOURCES=$CCOLLECT_CONF/sources -CDEFAULTS=$CCOLLECT_CONF/defaults - -self=$(basename $0) - -# functions first -_echo() -{ - echo "${self}> $@" -} - -_exit_err() -{ - _echo "$@" - rm -f "$TMP" - exit 1 -} - -# argv -if [ $# -ne 2 ]; then - _echo " " - _echo "Example: \"192.168.42.42\" \"/home/server/backup/\"" - _echo " This will create ${CSOURCES}/192.168.42.42 and /home/server/backup/192.168.42.42." - exit 1 -fi - -# sourcename / servername -name="$1" - -# basedir -basedir="$2" - -fullname="${CSOURCES}/${name}" -destination="${basedir}/${name}" - -# Tests -if [ -e "${fullname}" ]; then - _echo "${fullname} already exists. Aborting." - exit 2 -fi - -_echo "Trying to reach ${name} ..." -ping -c1 "${name}" || _exit_err "Cannot reach ${name}. Aborting." - -if [ ! -d "${basedir}" ]; then - echo "${basedir} is not a directory. Aborting." - exit 7 -fi - -# Create -_echo "Creating ${fullname} ..." -mkdir -p "${fullname}" || exit 3 - -echo "root@${name}:/" > "${fullname}/source" -cat << eof > "${fullname}/exclude" || exit 4 -/dev/* -/proc/* -/tmp/* -eof - -# Destination -if [ -e "${destination}" ]; then - if [ ! -d "${destination}" ]; then - echo "${destination} exists, but is not a directory. Aborting." - exit 5 - fi -else - _echo "Creating ${destination} ..." - mkdir -p "${destination}" || _exit_err "Failed to create ${destination}." -fi - -ln -s "${destination}" "${fullname}/destination" || \ - _exit_err "Failed to link \"${destination}\" to \"${fullname}/destination\"" - -# finish -_echo "Added some default values, please verify \"${fullname}\"." -_echo "Finished." diff --git a/tools/old/gnu-du-backup-size-compare b/tools/old/gnu-du-backup-size-compare deleted file mode 100755 index cf3b194..0000000 --- a/tools/old/gnu-du-backup-size-compare +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Written on 2007-08-16 -# - -exit 1 -# not yet finished. - -CCOLLECT_CONF=${CCOLLECT_CONF:-/etc/ccollect} -CCOLLECT_SOURCES="$CCOLLECT_CONF/defaults/sources" - -me="$(basename "$0")" - -if [ $# -lt 1 ]; then - echo "${me}: sources names - exit 1 -fi - -if [ ! -d "$CCOLLECT_SOURCES" ]; then - echo "No sources defined in $CCOLLECT_SOURCES" - exit 1 -fi - -cd "${CCOLLECT_SOURCES}" - -while [ "$#" -gt 0 ]; do - source="$1"; shift - fsource="${CCOLLECT_SOURCES}/${source}" - du -s "${fsource}/"* "${fsource}" - # du -l should follow -done diff --git a/tools/report_success b/tools/report_success deleted file mode 100755 index b0f9d1b..0000000 --- a/tools/report_success +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# -# 2008 Nico Schottelius (nico-ccollect at schottelius.org) -# -# This file is part of ccollect. -# -# ccollect 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. -# -# ccollect 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 ccollect. If not, see . -# -# Sends feedback -# - -subject="==> success: ccollect" -to="nico-ccollect-success" -host="schottelius.org" -fullto="${to}@${host}" - -software="ccollect" -author="Nico Schottelius" -info="$(uname -s -v -r -m)" - -echo "Reporting success for $software to ${author}" -echo "-----------------" -echo -n "Your name (leave free for anonymous): " -read name -echo -n "Your email (leave free for anonymous): " -read email -echo -n "Comment (leave free for no comment): " -read comment - -echo "" -echo "The following information will be send to ${author}:" -echo "" - -cat << eof -Name: $name (will be used to contact you and kept secret) -E-Mail: $email (will be used to contact you and kept secret) -Comment: $comment -Info: $info - -eof - -echo -n "Is it ok to send out that mail (press enter to send or ctrl-c to abort)? " -read yes - -cat << eof | mail -s "$subject" "$fullto" -Name: $name (will be used to contact you and kept secret) -E-Mail: $email (will be used to contact you and kept secret) -Comment: $comment -Info: $info -eof - -echo "Send. Thank you for your feedback."