From 2844d6b963b712e7689f2d6d369ff521b3c76334 Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 22:48:33 +0100 Subject: [PATCH 01/38] Debian packaging added to release actions --- .forgejo/workflows/build+release.yml | 44 ++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 33b38f2..c294c74 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -51,17 +51,31 @@ jobs: - name: Checking Out Repository Code uses: https://code.forgejo.org/actions/checkout@v3 + - + name: Installing cargo-deb dependencies + run: apt install -y liblzma-dev + - + name: Installing cargo-deb + run: | + cargo install cargo-deb - name: Compiling To Linux Target run: | cargo build -r - mv target/release/cloudflare-dns-updater cloudflare-dns-updater-linux-amd64 + mv target/release/cloudflare-dns-updater cloudflare-dns-updater-linux-amd64 + - + name: Bundle .deb package + run: | + cargo deb + mv target/debian/cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 with: - name: cloudflare-dns-updater-linux-amd64 - path: cloudflare-dns-updater-linux-amd64 + name: release_blobs + path: | + cloudflare-dns-updater-linux-amd64 + cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb if-no-files-found: error upload-release: @@ -73,25 +87,29 @@ jobs: name: Downloading All Build Artifacts uses: actions/download-artifact@v3 - - name: Rearrange Artifact Paths - run: | - mkdir release - mv cloudflare-dns-updater-linux-amd64/cloudflare-dns-updater-linux-amd64 release/cloudflare-dns-updater-linux-amd64 - - - name: Upload Artifacts As Generic Packages + name: Upload Binary run: | echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release/cloudflare-dns-updater-linux-amd64 \ + --upload-file release_blobs/cloudflare-dns-updater-linux-amd64 \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-linux-amd64' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release/cloudflare-dns-updater-linux-amd64 \ - https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-linux-amd64 + --upload-file release_blobs/cloudflare-dns-updater-linux-amd64 \ + https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-linux-amd64 + - + name: Upload Debian Package + run: | + echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ + --upload-file release_blobs/cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb \ + https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload' + curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ + --upload-file release_blobs/cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb \ + https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload - name: Release New Version uses: actions/forgejo-release@v1 with: direction: upload url: https://forgejo.neshweb.net - release-dir: release + release-dir: release_blobs token: ${{ secrets.FORGEJO_TOKEN }} tag: ${{ github.ref_name }} \ No newline at end of file -- 2.39.2 From c14db40a773a58bc0084702a8bfd68cfece900d4 Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 22:48:52 +0100 Subject: [PATCH 02/38] Release Candidate 1.1.1-rc.1 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6d70d8..0bcb71f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.0" +version = "1.1.1-rc.1" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index 64e1edd..4d8da40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cloudflare-dns-updater" -version = "1.1.0" +version = "1.1.1-rc.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -- 2.39.2 From 4c0ace604f69ee66f54f692faeb535a9b95ead46 Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 22:52:17 +0100 Subject: [PATCH 03/38] Add missing authors field --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 4d8da40..a8290a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [package] +authors = ["Neshura"] name = "cloudflare-dns-updater" version = "1.1.1-rc.1" edition = "2021" -- 2.39.2 From 98cb5c68377160e1577f1a016b24566d9a62a77e Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 22:52:40 +0100 Subject: [PATCH 04/38] Release Candidate 1.1.1-rc.2 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bcb71f..f0d5b02 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.1" +version = "1.1.1-rc.2" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index a8290a9..9e192e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.1" +version = "1.1.1-rc.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -- 2.39.2 From 1ef874b092c146f4955be1556dfd6b0e72cf42df Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:03:43 +0100 Subject: [PATCH 05/38] Fix Debian replacing - with ~ --- .forgejo/workflows/build+release.yml | 20 +++++++++++--------- Cargo.toml | 2 ++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index c294c74..c1e227a 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -62,20 +62,21 @@ jobs: name: Compiling To Linux Target run: | cargo build -r - mv target/release/cloudflare-dns-updater cloudflare-dns-updater-linux-amd64 + mv target/release/${{ github.event.repository.name }} ${{ github.event.repository.name }}-linux-amd64 - name: Bundle .deb package run: | cargo deb - mv target/debian/cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb + DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - ~) + mv target/debian/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb ${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 with: name: release_blobs path: | - cloudflare-dns-updater-linux-amd64 - cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb + ${{ github.event.repository.name }}-linux-amd64 + ${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb if-no-files-found: error upload-release: @@ -90,19 +91,20 @@ jobs: name: Upload Binary run: | echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/cloudflare-dns-updater-linux-amd64 \ + --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-linux-amd64' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/cloudflare-dns-updater-linux-amd64 \ + --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-linux-amd64 - name: Upload Debian Package run: | + DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - ~) echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload - name: Release New Version @@ -112,4 +114,4 @@ jobs: url: https://forgejo.neshweb.net release-dir: release_blobs token: ${{ secrets.FORGEJO_TOKEN }} - tag: ${{ github.ref_name }} \ No newline at end of file + tag: ${{ github.ref_name }} \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 9e192e1..288413b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,8 @@ authors = ["Neshura"] name = "cloudflare-dns-updater" version = "1.1.1-rc.2" edition = "2021" +description = "Application for automatically updating Cloudflare DNS records" +license = "" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -- 2.39.2 From c88c4d9baf2dcb209b38def6ec4ad00295f4ea12 Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:04:00 +0100 Subject: [PATCH 06/38] Release Candidate 1.1.1-rc.3 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0d5b02..bcbd3f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.2" +version = "1.1.1-rc.3" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index 288413b..93ba579 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.2" +version = "1.1.1-rc.3" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "" -- 2.39.2 From f0f4b16b2d5d61ead17a38b2b38d53dfe9ad922d Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:21:10 +0100 Subject: [PATCH 07/38] Fix tr command in Actions --- .forgejo/workflows/build+release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index c1e227a..6755c1d 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -67,7 +67,7 @@ jobs: name: Bundle .deb package run: | cargo deb - DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - ~) + DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) mv target/debian/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb ${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb - name: Uploading Build Artifact @@ -99,7 +99,7 @@ jobs: - name: Upload Debian Package run: | - DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - ~) + DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ --upload-file release_blobs/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload' -- 2.39.2 From abb1f9a07cac664ea00481b46bed53569222848b Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:21:25 +0100 Subject: [PATCH 08/38] Add GPLv3 License --- COPYING | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 2 +- 2 files changed, 675 insertions(+), 1 deletion(-) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Cargo.toml b/Cargo.toml index 93ba579..e2ab518 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ name = "cloudflare-dns-updater" version = "1.1.1-rc.3" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" -license = "" +license = "GPL-3.0-or-later" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -- 2.39.2 From 9e61ff2c6cd4a1a42a4e497f400e807e373538f5 Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:21:35 +0100 Subject: [PATCH 09/38] Release Candidate 1.1.1-rc.4 --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index bcbd3f1..0013a6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.3" +version = "1.1.1-rc.4" dependencies = [ "chrono", "confy", -- 2.39.2 From 7bd690f6503bbbbdb03afe2d8599311d1b343c2a Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:38:16 +0100 Subject: [PATCH 10/38] Cargo.toml change for rc.4 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e2ab518..7397306 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.3" +version = "1.1.1-rc.4" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From 73f2b90482fd3327647a746a9e79a49e7ff42fe7 Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:43:18 +0100 Subject: [PATCH 11/38] Fix release blobs artifacts --- .forgejo/workflows/build+release.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 6755c1d..3d99d5b 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -58,25 +58,26 @@ jobs: name: Installing cargo-deb run: | cargo install cargo-deb + - + name: Prepare build environment + run: mkdir dist - name: Compiling To Linux Target run: | cargo build -r - mv target/release/${{ github.event.repository.name }} ${{ github.event.repository.name }}-linux-amd64 + mv target/release/${{ github.event.repository.name }} dist/${{ github.event.repository.name }}-linux-amd64 - name: Bundle .deb package run: | cargo deb DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) - mv target/debian/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb ${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb + mv target/debian/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb dist/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 with: name: release_blobs - path: | - ${{ github.event.repository.name }}-linux-amd64 - ${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb + path: dist if-no-files-found: error upload-release: -- 2.39.2 From 9c45603ee69781d537228f3fdaa177585f820b7b Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:43:54 +0100 Subject: [PATCH 12/38] Release Candidate 1.1.1-rc.1 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0013a6c..0bcb71f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.4" +version = "1.1.1-rc.1" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index 7397306..b59af23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.4" +version = "1.1.1-rc.1" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From 846e07b56cc7dd61fca5ca20930fea6bc593284c Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:48:39 +0100 Subject: [PATCH 13/38] Remove cargo-deb dependency due to inclusion in docker image --- .forgejo/workflows/build+release.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 3d99d5b..a9abeec 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -54,10 +54,6 @@ jobs: - name: Installing cargo-deb dependencies run: apt install -y liblzma-dev - - - name: Installing cargo-deb - run: | - cargo install cargo-deb - name: Prepare build environment run: mkdir dist -- 2.39.2 From 9e3415f890c7c7195a077c2d4f84b714d9a462f3 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:04:01 +0100 Subject: [PATCH 14/38] Swap out hardcoded revision for Cargo.toml variable --- .forgejo/workflows/build+release.yml | 11 +++++++---- Cargo.toml | 2 ++ unit-scripts/cloudflare-dns-updater.service | 0 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 unit-scripts/cloudflare-dns-updater.service diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index a9abeec..34ddd5e 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -67,7 +67,10 @@ jobs: run: | cargo deb DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) - mv target/debian/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb dist/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb + echo "DEBIAN_REF=$DEBIAN_REF" >> dist/build.env + DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " ") + echo "DEBIAN_REV=$DEBIAN_REV" >> dist/build.env + mv target/debian/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb dist/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 @@ -96,12 +99,12 @@ jobs: - name: Upload Debian Package run: | - DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) + source release_blobs/build.env echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload - name: Release New Version diff --git a/Cargo.toml b/Cargo.toml index b59af23..c42346e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,8 @@ edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" +[package.metadata.deb] +revision = "1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/unit-scripts/cloudflare-dns-updater.service b/unit-scripts/cloudflare-dns-updater.service new file mode 100644 index 0000000..e69de29 -- 2.39.2 From 4ba04706b5da8e55ddaea76f5f09ecb8ffefa0e1 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:04:36 +0100 Subject: [PATCH 15/38] Release Candidate 1.1.1-rc.2 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bcb71f..f0d5b02 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.1" +version = "1.1.1-rc.2" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index c42346e..f465b78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.1" +version = "1.1.1-rc.2" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From f78f735b2c501049c630aa248ced83dcdd72cc1c Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:36:01 +0100 Subject: [PATCH 16/38] Move .env configuration to config.toml --- Cargo.lock | 7 --- Cargo.toml | 1 - src/cloudflare.rs | 7 ++- src/config.rs | 44 +++++++++++++++++++ src/main.rs | 109 ++++++++++++++++++++++++++++++++++------------ 5 files changed, 128 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0d5b02..2afbe43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,7 +118,6 @@ version = "1.1.1-rc.2" dependencies = [ "chrono", "confy", - "dotenv", "ipnet", "log", "reqwest", @@ -178,12 +177,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - [[package]] name = "encoding_rs" version = "0.8.33" diff --git a/Cargo.toml b/Cargo.toml index f465b78..1da0418 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,6 +20,5 @@ strum_macros = "^0.24.3" log = "^0.4.20" systemd-journal-logger = "^2.1.1" confy = "^0.5.1" -dotenv = "^0.15.0" ipnet = "^2.9.0" url = "2.5.0" diff --git a/src/cloudflare.rs b/src/cloudflare.rs index 44c938c..700788f 100644 --- a/src/cloudflare.rs +++ b/src/cloudflare.rs @@ -1,5 +1,4 @@ use std::collections::HashMap; -use std::env; use std::env::VarError; use std::error::Error; use std::net::{Ipv4Addr, Ipv6Addr}; @@ -11,7 +10,7 @@ use serde_derive::{Deserialize, Serialize}; use strum_macros::{Display, IntoStaticStr}; use systemd_journal_logger::connected_to_journal; use url::ParseError; -use crate::config::{ZoneConfig, ZoneEntry}; +use crate::config::{AppConfig, ZoneConfig, ZoneEntry}; const API_BASE: &str = "https://api.cloudflare.com/client/v4"; @@ -34,8 +33,8 @@ pub(crate) struct CloudflareZone { } impl CloudflareZone { - pub(crate) fn new(zone: &ZoneConfig) -> Result { - let key = env::var("CF_API_TOKEN")?; + pub(crate) fn new(zone: &ZoneConfig, config: &AppConfig) -> Result { + let key = config.cloudflare_api_token.clone(); Ok(Self { name: zone.name.clone(), email: zone.email.clone(), diff --git a/src/config.rs b/src/config.rs index e7bf385..2652cfa 100644 --- a/src/config.rs +++ b/src/config.rs @@ -140,3 +140,47 @@ impl Default for ZoneConfig { } } +#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] +pub(crate) struct AppConfig { + #[serde(alias="cf_api_token")] + pub(crate) cloudflare_api_token: String, + pub(crate) check_interval_seconds: Option, + pub(crate) uptime_url: Option, +} + +impl AppConfig { + pub(crate) fn load() -> Result> { + let cfg: Self = match confy::load(env!("CARGO_PKG_NAME"),"config") { + Ok(data) => data, + Err(e) => { + match connected_to_journal() { + true => error!("[ERROR] {e}"), + false => eprintln!("[ERROR] {e}") + } + return Err(Box::new(e)); + } + }; + + if cfg.cloudflare_api_token.is_empty() { + let err_msg = "Cloudflare api token not specified. The app cannot work without this"; + match connected_to_journal() { + true => error!("[ERROR] {err_msg}"), + false => eprintln!("[ERROR] {err_msg}") + } + panic!("{err_msg}"); + } + + Ok(cfg) + } +} + +impl Default for AppConfig { + fn default() -> Self { + Self { + cloudflare_api_token: "".to_owned(), + check_interval_seconds: None, + uptime_url: None + } + } +} + diff --git a/src/main.rs b/src/main.rs index 54bcc8f..f549057 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,16 +1,15 @@ /*use cloudflare_old::{Instance, CloudflareDnsType};*/ use reqwest::blocking::get; -use std::{env, thread::{sleep}}; +use std::{thread::{sleep}}; use std::error::Error; use std::net::{Ipv4Addr, Ipv6Addr}; use std::str::FromStr; use chrono::{Utc, Duration}; -use dotenv::dotenv; use log::{info, warn, error, LevelFilter}; use reqwest::StatusCode; use systemd_journal_logger::{connected_to_journal, JournalLog}; use crate::cloudflare::{CloudflareZone, DnsRecordType}; -use crate::config::{InterfaceConfig, ZoneConfig, ZoneEntry}; +use crate::config::{AppConfig, InterfaceConfig, ZoneConfig, ZoneEntry}; mod config; mod cloudflare; @@ -233,10 +232,10 @@ fn compare_zones(old_zone: &ZoneConfig, new_zone: &ZoneConfig) -> Vec { } fn main() { - dotenv().ok(); JournalLog::new().expect("Systemd-Logger crate error").install().expect("Systemd-Logger crate error"); log::set_max_level(LevelFilter::Info); + let mut config = AppConfig::load().unwrap(); let mut ifaces = InterfaceConfig::load().unwrap(); let mut zone_cfgs = ZoneConfig::load().unwrap(); @@ -248,32 +247,22 @@ fn main() { Err(e) => panic!("{}", e) }; - let reload_interval = match env::var("CHECK_INTERVAL_SECONDS") { - Ok(interval_string) => i64::from_str(&interval_string).unwrap_or_else(|e| { - let warn_msg = format!("Expected integer number, got '{interval_string}'. Defaulting to 60"); - match connected_to_journal() { - true => warn!("[WARN] {warn_msg}"), - false => println!("[WARN] {warn_msg}"), - }; - 60 - }), - Err(_) => { - let warn_msg = "Reload interval env not set, defaulting to 60"; - match connected_to_journal() { - true => warn!("[WARN] {warn_msg}"), - false => println!("[WARN] {warn_msg}"), - } - 60 - }, - }; + let reload_interval = config.check_interval_seconds.unwrap_or_else(|| { + let warn_msg = "Reload interval option not set, defaulting to 60"; + match connected_to_journal() { + true => warn!("[WARN] {warn_msg}"), + false => println!("[WARN] {warn_msg}"), + } + 60 + }) as i64; loop { now = Utc::now(); if now >= start + Duration::seconds(reload_interval) { start = now; - if let Ok(uptime_url) = env::var("UPTIME_URL") { - get(uptime_url); + if let Some(uptime_url) = &config.uptime_url { + let _ = get(uptime_url); } match InterfaceConfig::load() { @@ -353,10 +342,9 @@ fn main() { ifaces = new_cfg } - }, Err(e) => { - let err_msg = format!("Unable to load ínterfaces.toml with error: {}", e); + let err_msg = format!("Unable to load ínterfaces.toml with error: {e}"); match connected_to_journal() { true => error!("[ERROR] {err_msg}"), false => eprintln!("[ERROR] {err_msg}"), @@ -496,7 +484,72 @@ fn main() { } } Err(e) => { - let err_msg = format!("Unable to load from zones.d with error: {}", e); + let err_msg = format!("Unable to load from zones.d with error: {e}"); + match connected_to_journal() { + true => error!("[ERROR] {err_msg}"), + false => eprintln!("[ERROR] {err_msg}"), + } + } + } + + match AppConfig::load() { + Ok(new_cfg) => { + if config != new_cfg { + if config.cloudflare_api_token != new_cfg.cloudflare_api_token { + let info_msg = "API token in config.toml changed"; + match connected_to_journal() { + true => info!("[INFO] {info_msg}"), + false => println!("[INFO] {info_msg}"), + } + } + + if config.check_interval_seconds != new_cfg.check_interval_seconds { + let info_msg = match config.check_interval_seconds { + Some(old_interval) => { + match new_cfg.check_interval_seconds { + Some(new_interval) => format!("Check interval in config.toml changed from {old_interval}s to {new_interval}s"), + None => format!("Check interval in config.toml changed from {old_interval}s to 60s"), + } + }, + None => { + match new_cfg.check_interval_seconds { + Some(new_interval) => format!("Check interval in config.toml changed from 60s to {new_interval}s"), + None => "This is a unicorn error, congratulations.".to_owned(), + } + } + }; + match connected_to_journal() { + true => info!("[INFO] {info_msg}"), + false => println!("[INFO] {info_msg}"), + } + } + + if config.uptime_url != new_cfg.uptime_url { + let info_msg = match &config.uptime_url { + Some(old_url) => { + match &new_cfg.uptime_url { + Some(new_url) => format!("Uptime URL in config.toml changed from '{old_url}' to '{new_url}'"), + None => "Uptime URL in config.toml was removed".to_owned(), + } + }, + None => { + match &new_cfg.uptime_url { + Some(new_url) => format!("Uptime URL '{new_url}' was added to config.toml"), + None => "This is a unicorn error, congratulations.".to_owned(), + } + } + }; + match connected_to_journal() { + true => info!("[INFO] {info_msg}"), + false => println!("[INFO] {info_msg}"), + } + } + + config = new_cfg + } + } + Err(e) => { + let err_msg = format!("Unable to load config.toml with error: {e}"); match connected_to_journal() { true => error!("[ERROR] {err_msg}"), false => eprintln!("[ERROR] {err_msg}"), @@ -506,7 +559,7 @@ fn main() { ips.update(); for zone in &zone_cfgs { - let cf_zone = match CloudflareZone::new(zone) { + let cf_zone = match CloudflareZone::new(zone, &config) { Ok(data) => data, Err(e) => { let err_msg = format!("Cloudflare Token likely not set. Error: {}", e); -- 2.39.2 From 1c0bb6457256bbcd6a65141980c98b931ad01d19 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:36:12 +0100 Subject: [PATCH 17/38] Remove outdated .json files --- cloudflare.json | 74 ------------------------------------------------- config.json | 38 ------------------------- 2 files changed, 112 deletions(-) delete mode 100644 cloudflare.json delete mode 100644 config.json diff --git a/cloudflare.json b/cloudflare.json deleted file mode 100644 index f9a7f05..0000000 --- a/cloudflare.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "AAAA": [ - "books", - "calibre", - "docs.gitlab", - "element", - "files", - "gitlab", - "*.gitpages", - "gitpages", - "hentai", - "ipv6", - "jellyfin", - "komga", - "manga", - "mastodon", - "matrix", - "minecraft", - "monitoring", - "mstreaming", - "music", - "navidrome", - "neshura-server.net", - "nextcloud", - "nginx", - "picard", - "porn", - "portainer", - "readyornot", - "registry.gitlab", - "temp1", - "temp2", - "tube", - "video", - "www", - "zomboid" - ], - "A": [ - "books", - "calibre", - "docs.gitlab", - "element", - "files", - "gitlab", - "*.gitpages", - "gitpages", - "hentai", - "ipv4", - "jellyfin", - "komga", - "manga", - "mastodon", - "matrix", - "minecraft", - "monitoring", - "mstreaming", - "music", - "navidrome", - "neshura-server.net", - "nextcloud", - "nginx", - "picard", - "porn", - "portainer", - "readyornot", - "registry.gitlab", - "temp1", - "temp2", - "tube", - "video", - "www", - "zomboid" - ] - } \ No newline at end of file diff --git a/config.json b/config.json deleted file mode 100644 index 59e0356..0000000 --- a/config.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ipv6_interface": ":da5e:d3ff:feeb:4346", - "zones": [ - { - "email": "neshura@proton.me", - "name": "neshura.net", - "id": "0183f167a051f1e432c0d931478638b5", - "dns_entries": [ - { - "name": "*.neshura.net", - "type4": false, - "type6": true, - "interface": ":da5e:d3ff:feeb:4346" - }, - { - "name": "neshura.net", - "type4": false, - "type6": true, - "interface": ":da5e:d3ff:feeb:4346" - } - ] - }, - { - "email": "neshura@proton.me", - "name": "neshura-server.net", - "id": "146d4cd6a1777376b423aaedc6824818", - "dns_entries": [ - ] - }, - { - "email": "neshura@proton.me", - "name": "neshweb.net", - "id": "75b0d52229357478b734ae0f6d075c15", - "dns_entries": [ - ] - } - ] -} \ No newline at end of file -- 2.39.2 From ee2b49285122e17470d018ba468ed9bd42ffadfa Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:38:27 +0100 Subject: [PATCH 18/38] Updated Readme --- README.md | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index d4ad4bc..fa0e4bd 100644 --- a/README.md +++ b/README.md @@ -7,23 +7,18 @@ The application necessarily requires a valid Cloudflare API Token. Further the application must be located in the same network as the configured zones. -| Environment Variable | Required | Usage | -|:--------------------:|:--------:|:----------------------------------:| -| CF_API_TOKEN | x | Cloudflare API Token | -| STATUS_POST_URL | | Post Endpoint for a Uptime Monitor | -*Note: Variables can be stored in a .env file* - -The actual configuration happens in two or more files: +The actual configuration happens in three or more files: +`config.toml` contains general configuration parameters for the application `interfaces.toml` contains all IPv6 interfaces available/used by the zone config files. `.toml` files in `zone.d` contain settings for individual zones. Example: -*.env* -```text -CF_API_TOKEN=0123456789abcdef0123456789abcdef01234 -CHECK_INTERVAL_SECONDS=30 // Defaults to 60 if missing -UPTIME_URL=https://example.org/uptime/id12 // Entirely optional +*config.toml* +```toml +cf_api_token = "0123456789abcdef0123456789abcdef01234" # Cloudflare API Token +check_interval_seconds = 30 # Defaults to 60 if missing +uptime_url = "https://example.org/uptime/id12" # Post Endpoint for a Uptime Monitor ``` *interfaces.toml* -- 2.39.2 From 5aa2f62c66bfb6bb6b7b019e5e9041dc48c87828 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:38:52 +0100 Subject: [PATCH 19/38] Add systemd unit to debian package --- Cargo.toml | 9 +++++++++ unit-scripts/cloudflare-dns-updater.service | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 1da0418..e513855 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,16 @@ description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" [package.metadata.deb] +extended-description = "Application for automatically updating Cloudflare DNS records" +maintainer-scripts = "" revision = "1" + +[package.metadata.deb.systemd-units] +enable = true +start = true +restart-after-upgrade = true +stop-on-upgrde = true + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/unit-scripts/cloudflare-dns-updater.service b/unit-scripts/cloudflare-dns-updater.service index e69de29..cf21d93 100644 --- a/unit-scripts/cloudflare-dns-updater.service +++ b/unit-scripts/cloudflare-dns-updater.service @@ -0,0 +1,13 @@ +[Unit] +Description="Application for automatically updating Cloudflare DNS records" +After=syslog.target +After=network-online.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/cloudflare-dns-updater +Restart=always +RestartSec=3 + +[Install] +WantedBy=multi-user.target \ No newline at end of file -- 2.39.2 From 6e385d7f870e47cf115f0c8de90fc29b887bcc9d Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:39:26 +0100 Subject: [PATCH 20/38] Release Candidate 1.1.1-rc.3 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2afbe43..876bbe0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.2" +version = "1.1.1-rc.3" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index e513855..5829c8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.2" +version = "1.1.1-rc.3" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From 62945286fd56a6324b9abe6f6915228f0ce369c8 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:43:04 +0100 Subject: [PATCH 21/38] Remove no longer needed dependency install for cargo deb --- .forgejo/workflows/build+release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 34ddd5e..f28083e 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -51,9 +51,6 @@ jobs: - name: Checking Out Repository Code uses: https://code.forgejo.org/actions/checkout@v3 - - - name: Installing cargo-deb dependencies - run: apt install -y liblzma-dev - name: Prepare build environment run: mkdir dist -- 2.39.2 From c7a4e68e8f1a566e2ec62ca1dd573d7e1953af07 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:43:59 +0100 Subject: [PATCH 22/38] Fix debian revision extraction --- .forgejo/workflows/build+release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index f28083e..bc49d2d 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -65,7 +65,7 @@ jobs: cargo deb DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo "DEBIAN_REF=$DEBIAN_REF" >> dist/build.env - DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " ") + DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "DEBIAN_REV=$DEBIAN_REV" >> dist/build.env mv target/debian/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb dist/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb - -- 2.39.2 From f74a37ac2438765b74991ed3ffc24d844ff5f2da Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:44:14 +0100 Subject: [PATCH 23/38] Release Candidate 1.1.1-rc.2 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 876bbe0..2afbe43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.3" +version = "1.1.1-rc.2" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index 5829c8c..e513855 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.3" +version = "1.1.1-rc.2" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From 03453a332723855642ed9ffa31ae9a238bd6ad8d Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:46:51 +0100 Subject: [PATCH 24/38] Fix cargo deb config --- Cargo.toml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e513855..ba79ed7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,14 +8,9 @@ license = "GPL-3.0-or-later" [package.metadata.deb] extended-description = "Application for automatically updating Cloudflare DNS records" -maintainer-scripts = "" +maintainer-scripts = "debian-scripts/" revision = "1" - -[package.metadata.deb.systemd-units] -enable = true -start = true -restart-after-upgrade = true -stop-on-upgrde = true +systemd-units = { enable = false } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -- 2.39.2 From dba934ab415ebe0c5966e47730cd9eb65f4e75a8 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:55:17 +0100 Subject: [PATCH 25/38] Move systemd unit to correct directory --- Cargo.toml | 2 +- {unit-scripts => debian}/cloudflare-dns-updater.service | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {unit-scripts => debian}/cloudflare-dns-updater.service (100%) diff --git a/Cargo.toml b/Cargo.toml index ba79ed7..e141675 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0-or-later" [package.metadata.deb] extended-description = "Application for automatically updating Cloudflare DNS records" -maintainer-scripts = "debian-scripts/" +maintainer-scripts = "debian/" revision = "1" systemd-units = { enable = false } diff --git a/unit-scripts/cloudflare-dns-updater.service b/debian/cloudflare-dns-updater.service similarity index 100% rename from unit-scripts/cloudflare-dns-updater.service rename to debian/cloudflare-dns-updater.service -- 2.39.2 From e1dd7c00461ea338bb99f804eef355569647e9c6 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 00:55:39 +0100 Subject: [PATCH 26/38] Release Candidate 1.1.1-rc.3 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2afbe43..876bbe0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.2" +version = "1.1.1-rc.3" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index e141675..91fbf25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.2" +version = "1.1.1-rc.3" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From 6b847ba34e5088bb6a6d4c3b1bc320b5d75ed59f Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 01:18:36 +0100 Subject: [PATCH 27/38] Convert systemd unit to user script via custom install scripts --- debian/postinst | 33 +++++++++++++++++++++++++++++++++ debian/postrm | 24 ++++++++++++++++++++++++ debian/prerm | 8 ++++++++ 3 files changed, 65 insertions(+) create mode 100644 debian/postinst create mode 100644 debian/postrm create mode 100644 debian/prerm diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..e7a0c28 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,33 @@ +#!/bin/sh +set -e +# Automatically added by cargo-deb +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then + if deb-systemd-helper --user debian-installed cloudflare-dns-updater.service; then + # This will only remove masks created by d-s-h on package removal. + deb-systemd-helper --user unmask cloudflare-dns-updater.service >/dev/null || true + + if deb-systemd-helper --user --quiet was-enabled cloudflare-dns-updater.service; then + # Create new symlinks, if any. + deb-systemd-helper --user enable cloudflare-dns-updater.service >/dev/null || true + fi + fi + + # Update the statefile to add new symlinks (if any), which need to be cleaned + # up on purge. Also remove old symlinks. + deb-systemd-helper --user update-state cloudflare-dns-updater.service >/dev/null || true +fi +# End automatically added section +# Automatically added by cargo-deb +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then + if [ -d /run/systemd/system ]; then + USER="$(who | head -1 | awk '{print $1;}')" + runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) systemctl --user daemon-reload >/dev/null || true" + if [ -n "$2" ]; then + _dh_action=restart + else + _dh_action=start + fi + runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-invoke --user $_dh_action cloudflare-dns-updater.service >/dev/null || true" + fi +fi +# End automatically added section diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..4d419ee --- /dev/null +++ b/debian/postrm @@ -0,0 +1,24 @@ +#!/bin/sh +set -e +# Automatically added by cargo-deb +if [ -d /run/systemd/system ]; then + USER="$(who | head -1 | awk '{print $1;}')" + runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) systemctl --user daemon-reload >/dev/null || true" +fi +# End automatically added section +# Automatically added by cargo-deb +if [ "$1" = "remove" ]; then + if [ -x "/usr/bin/deb-systemd-helper" ]; then + USER="$(who | head -1 | awk '{print $1;}')" + runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-helper --user mask cloudflare-dns-updater.service >/dev/null || true" + fi +fi + +if [ "$1" = "purge" ]; then + if [ -x "/usr/bin/deb-systemd-helper" ]; then + USER="$(who | head -1 | awk '{print $1;}')" + runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-helper --user purge cloudflare-dns-updater.service >/dev/null || true" + runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-helper --user unmask cloudflare-dns-updater.service >/dev/null || true" + fi +fi +# End automatically added section diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 0000000..3e14f92 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +# Automatically added by cargo-deb +if [ -d /run/systemd/system ] && [ "$1" = remove ]; then + USER="$(who | head -1 | awk '{print $1;}')" + runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-invoke --user stop cloudflare-dns-updater.service >/dev/null || true" +fi +# End automatically added section -- 2.39.2 From 7738c8b366ce6a31568b28b7b449fec063c1f6bc Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 01:18:59 +0100 Subject: [PATCH 28/38] Release Candidate 1.1.1-rc.4 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 876bbe0..adcb04d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.3" +version = "1.1.1-rc.4" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index 91fbf25..ad13bb5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.3" +version = "1.1.1-rc.4" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From b727a3714ebab83ef218c1b2f7ada82e218f571c Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 01:26:09 +0100 Subject: [PATCH 29/38] Fix cargo deb missing #DEBHELPER# variable --- debian/postinst | 5 ++++- debian/postrm | 5 ++++- debian/prerm | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/postinst b/debian/postinst index e7a0c28..8a473f8 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,5 +1,8 @@ #!/bin/sh -set -e +#DEBHELPER# + +# Also enable User Service + # Automatically added by cargo-deb if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then if deb-systemd-helper --user debian-installed cloudflare-dns-updater.service; then diff --git a/debian/postrm b/debian/postrm index 4d419ee..9f6feef 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,5 +1,8 @@ #!/bin/sh -set -e +#DEBHELPER# + +# Also enable User Service + # Automatically added by cargo-deb if [ -d /run/systemd/system ]; then USER="$(who | head -1 | awk '{print $1;}')" diff --git a/debian/prerm b/debian/prerm index 3e14f92..967f973 100644 --- a/debian/prerm +++ b/debian/prerm @@ -1,5 +1,8 @@ #!/bin/sh -set -e +#DEBHELPER# + +# Also enable User Service + # Automatically added by cargo-deb if [ -d /run/systemd/system ] && [ "$1" = remove ]; then USER="$(who | head -1 | awk '{print $1;}')" -- 2.39.2 From 00ea82e12ccecf01e4281da60ad27de1440ac840 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 01:41:41 +0100 Subject: [PATCH 30/38] Add systemd user unit --- Cargo.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index ad13bb5..ed9bfd3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,13 @@ license = "GPL-3.0-or-later" extended-description = "Application for automatically updating Cloudflare DNS records" maintainer-scripts = "debian/" revision = "1" +assets = [ + [ + "debian/cloudflare-dns-updater.service", + "/lib/systemd/user/cloudflare-dns-updater.service", + "755", + ], +] systemd-units = { enable = false } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -- 2.39.2 From 6588bf20a59661dd48effab9851fc0940fdcaa72 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 01:43:06 +0100 Subject: [PATCH 31/38] Release Candidate 1.1.1-rc.5 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index adcb04d..6a15fa4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.4" +version = "1.1.1-rc.5" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index ed9bfd3..13c9fed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.4" +version = "1.1.1-rc.5" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From 0a9eba9732c6038de3e1b36ef1b446fe6bce058b Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 01:56:48 +0100 Subject: [PATCH 32/38] Potential Bugfix whereby the code threw an otherwise unexplained error --- src/cloudflare.rs | 7 +++---- src/config.rs | 1 - src/main.rs | 12 +----------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/cloudflare.rs b/src/cloudflare.rs index 700788f..0a56378 100644 --- a/src/cloudflare.rs +++ b/src/cloudflare.rs @@ -1,5 +1,4 @@ use std::collections::HashMap; -use std::env::VarError; use std::error::Error; use std::net::{Ipv4Addr, Ipv6Addr}; use log::{error, warn}; @@ -33,14 +32,14 @@ pub(crate) struct CloudflareZone { } impl CloudflareZone { - pub(crate) fn new(zone: &ZoneConfig, config: &AppConfig) -> Result { + pub(crate) fn new(zone: &ZoneConfig, config: &AppConfig) -> Self { let key = config.cloudflare_api_token.clone(); - Ok(Self { + Self { name: zone.name.clone(), email: zone.email.clone(), key, id: zone.id.clone(), - }) + } } fn generate_auth_headers(&self) -> HeaderMap { diff --git a/src/config.rs b/src/config.rs index 2652cfa..3d5a8ea 100644 --- a/src/config.rs +++ b/src/config.rs @@ -142,7 +142,6 @@ impl Default for ZoneConfig { #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] pub(crate) struct AppConfig { - #[serde(alias="cf_api_token")] pub(crate) cloudflare_api_token: String, pub(crate) check_interval_seconds: Option, pub(crate) uptime_url: Option, diff --git a/src/main.rs b/src/main.rs index f549057..10ad192 100644 --- a/src/main.rs +++ b/src/main.rs @@ -559,17 +559,7 @@ fn main() { ips.update(); for zone in &zone_cfgs { - let cf_zone = match CloudflareZone::new(zone, &config) { - Ok(data) => data, - Err(e) => { - let err_msg = format!("Cloudflare Token likely not set. Error: {}", e); - match connected_to_journal() { - true => error!("[ERROR] {err_msg}"), - false => eprintln!("[ERROR] {err_msg}"), - } - continue - } - }; + let cf_zone = CloudflareZone::new(zone, &config); let cf_entries = match cf_zone.get_entries() { Ok(entries) => entries, -- 2.39.2 From 3657754fd7aa409ce90c2bb114fdacf3abb94356 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 01:56:57 +0100 Subject: [PATCH 33/38] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1feddad..eb9840d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,5 @@ venv/ .idea/ .vscode/ -/.env /interfaces.toml /zones.d \ No newline at end of file -- 2.39.2 From 2412ad16666281eda9a3a81fd26c104ffc5a9ce5 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 01:57:10 +0100 Subject: [PATCH 34/38] Dependecy Version bump --- Cargo.lock | 27 ++++++++------------------- Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a15fa4..0b8f80a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -620,7 +620,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] @@ -821,7 +821,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] @@ -868,26 +868,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", + "syn", ] [[package]] @@ -962,7 +951,7 @@ checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] @@ -1140,7 +1129,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn", "wasm-bindgen-shared", ] @@ -1174,7 +1163,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index 13c9fed..f027180 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ reqwest = { version = "^0.11.14", features = ["blocking", "json"] } serde = "^1.0.152" serde_derive = "^1.0.152" serde_json = "^1.0.93" -strum_macros = "^0.24.3" +strum_macros = "^0.25.3" log = "^0.4.20" systemd-journal-logger = "^2.1.1" confy = "^0.5.1" -- 2.39.2 From a1092be60cbc34fb0c03e3cacc87c3924f06d43d Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 01:57:45 +0100 Subject: [PATCH 35/38] Release Candidate 1.1.1-rc.6 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b8f80a..3e980ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.5" +version = "1.1.1-rc.6" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index f027180..c01c677 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.5" +version = "1.1.1-rc.6" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From 6ec4b1b48c781a0583ba97d9612d4b1b2a8fdf84 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 02:01:36 +0100 Subject: [PATCH 36/38] Add binary to debian package. It went missing after adding the user systemd unit --- Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index c01c677..dddd6d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,11 @@ extended-description = "Application for automatically updating Cloudflare DNS re maintainer-scripts = "debian/" revision = "1" assets = [ + [ + "target/release/cloudflare-dns-updater", + "/usr/local/bin/cloudflare-dns-updater", + "755", + ], [ "debian/cloudflare-dns-updater.service", "/lib/systemd/user/cloudflare-dns-updater.service", -- 2.39.2 From ffcaeb9d4b31e5934cb504418030e294fe85eaf8 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 02:02:02 +0100 Subject: [PATCH 37/38] Release Candidate 1.1.1-rc.7 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3e980ce..37506b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "cloudflare-dns-updater" -version = "1.1.1-rc.6" +version = "1.1.1-rc.7" dependencies = [ "chrono", "confy", diff --git a/Cargo.toml b/Cargo.toml index dddd6d9..aa7de25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "cloudflare-dns-updater" -version = "1.1.1-rc.6" +version = "1.1.1-rc.7" edition = "2021" description = "Application for automatically updating Cloudflare DNS records" license = "GPL-3.0-or-later" -- 2.39.2 From b9419a544609a075229c36579cbdfdc487bae034 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 02:08:07 +0100 Subject: [PATCH 38/38] Different install target for user systemd service unit --- Cargo.toml | 2 +- debian/cloudflare-dns-updater-user.service | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 debian/cloudflare-dns-updater-user.service diff --git a/Cargo.toml b/Cargo.toml index aa7de25..8488986 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ assets = [ "755", ], [ - "debian/cloudflare-dns-updater.service", + "debian/cloudflare-dns-updater-user.service", "/lib/systemd/user/cloudflare-dns-updater.service", "755", ], diff --git a/debian/cloudflare-dns-updater-user.service b/debian/cloudflare-dns-updater-user.service new file mode 100644 index 0000000..e83260c --- /dev/null +++ b/debian/cloudflare-dns-updater-user.service @@ -0,0 +1,13 @@ +[Unit] +Description="Application for automatically updating Cloudflare DNS records" +After=syslog.target +After=network-online.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/cloudflare-dns-updater +Restart=always +RestartSec=3 + +[Install] +WantedBy=default.target \ No newline at end of file -- 2.39.2