.forgejo/workflows/build+release.yml

@@ -1,4 +1,4 @@
-name: 'Build and release binary file and packages'
+name: 'Build and Release Binary File'
 author: 'Neshura'
 
 on: 
@@ -51,32 +51,20 @@ jobs:
             -
                 name: Checking Out Repository Code
                 uses: https://code.forgejo.org/actions/checkout@v3
-            -
-                name: Prepare build environment
-                run: mkdir dist
             -
                 name: Compiling To Linux Target
                 run: |
                     cargo build -r
-                    mv target/release/${{ github.event.repository.name }} dist/${{ github.event.repository.name }}-linux-amd64
+                    mv target/release/cloudflare-dns-updater cloudflare-dns-updater-linux-amd64                    
-            -
-                name: Bundle .deb package
-                run: |
-                    cargo deb
-                    DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~)
-                    echo "DEBIAN_REF=$DEBIAN_REF" >> dist/build.env
-                    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
             -
                 name: Uploading Build Artifact
                 uses: actions/upload-artifact@v3
                 with:
-                    name: release_blobs
+                    name: cloudflare-dns-updater-linux-amd64
-                    path: dist
+                    path: cloudflare-dns-updater-linux-amd64
                     if-no-files-found: error
 
-    upload-generic-package:
+    upload-release:
         needs: build
         if: success()
         runs-on: docker
@@ -85,62 +73,25 @@ jobs:
                 name: Downloading All Build Artifacts
                 uses: actions/download-artifact@v3
             -
-                name: Upload Binary
+                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
                 run: |
                     echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
-                    --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \
+                    --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 }}/${{ 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/${{ github.event.repository.name }}-linux-amd64 \
+                    --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 }}/${{ 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                    
-
-    upload-debian-package:
-        needs: build
-        if: success()
-        runs-on: docker
-        steps:
-            -
-                name: Downloading All Build Artifacts
-                uses: actions/download-artifact@v3
-            -
-                name: Upload Debian Package to staging
-                run: |
-                    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""$DEBIAN_REV"'_amd64.deb \
-                    https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/staging/upload'
-                    curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
-                    --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/staging/upload
-            -
-                name: Upload Debian Package to main
-                if: (! contains(github.ref_name, '-rc'))
-                run: |
-                    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""$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""$DEBIAN_REV"_amd64.deb \
-                    https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload
-
-    create-release:
-        needs: build
-        if: success()
-        runs-on: docker
-        steps:
-            -
-                name: Downloading All Build Artifacts
-                uses: actions/download-artifact@v3
-            -
-                name: Filter out env files
-                run: rm release_blobs/build.env
             -
                 name: Release New Version
-                uses: actions/forgejo-release@v2
+                uses: actions/forgejo-release@v1
                 with:
                     direction: upload
                     url: https://forgejo.neshweb.net
-                    release-dir: release_blobs
+                    release-dir: release
                     token: ${{ secrets.FORGEJO_TOKEN }}
-                    tag: ${{ github.ref_name }}
+                    tag: ${{  github.ref_name }}

.forgejo/workflows/pull-requests.yml

@@ -1,67 +0,0 @@
-name: 'Build binary file and bundle packages'
-author: 'Neshura'
-
-on:
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  test:
-    runs-on: docker
-    container: forgejo.neshweb.net/ci-docker-images/rust-node:latest
-    steps:
-      -
-        name: Add Clippy
-        run: rustup component add clippy
-      -
-        name: Checking Out Repository Code
-        uses: https://code.forgejo.org/actions/checkout@v3
-      -
-        name: Set Up Cargo Cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      -
-        name: Run Clippy
-        run: cargo clippy
-
-  build:
-    needs: test
-    if: success()
-    runs-on: docker
-    container: forgejo.neshweb.net/ci-docker-images/rust-node:latest
-    steps:
-      -
-        name: Checking Out Repository Code
-        uses: https://code.forgejo.org/actions/checkout@v3
-      -
-        name: Prepare build environment
-        run: mkdir dist
-      -
-        name: Compiling To Linux Target
-        run: |
-          cargo build -r
-          mv target/release/${{ github.event.repository.name }} dist/${{ github.event.repository.name }}-linux-amd64
-      -
-        name: Bundle .deb package
-        run: |
-          cargo deb
-          DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~)
-          echo "DEBIAN_REF=$DEBIAN_REF" >> dist/build.env
-          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
-      -
-        name: Uploading Build Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: release_blobs
-          path: dist
-          if-no-files-found: error

.gitignore

@@ -4,5 +4,6 @@ venv/
 .idea/
 .vscode/
 
+/.env
 /interfaces.toml
 /zones.d

COPYING

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU 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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU 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 <https://www.gnu.org/licenses/>.
-
-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:
-
-    <program>  Copyright (C) <year>  <name of author>
-    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
-<https://www.gnu.org/licenses/>.
-
-  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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

Cargo.lock

@@ -114,10 +114,11 @@ dependencies = [
 
 [[package]]
 name = "cloudflare-dns-updater"
-version = "1.1.9"
+version = "1.0.0"
 dependencies = [
  "chrono",
  "confy",
+ "dotenv",
  "ipnet",
  "log",
  "reqwest",
@@ -177,6 +178,12 @@ 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"
@@ -620,7 +627,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -821,7 +828,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -868,15 +875,26 @@ dependencies = [
 
 [[package]]
 name = "strum_macros"
-version = "0.25.3"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn",
+ "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",
 ]
 
 [[package]]
@@ -951,7 +969,7 @@ checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -1129,7 +1147,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.43",
  "wasm-bindgen-shared",
 ]
 
@@ -1163,7 +1181,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.43",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

Cargo.toml

@@ -1,24 +1,7 @@
 [package]
-authors = ["Neshura"]
 name = "cloudflare-dns-updater"
-version = "1.1.9"
+version = "1.0.0"
 edition = "2021"
-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 = "debian/"
-revision = "1"
-depends = ["libc6", "libssl3", "systemd"]
-assets = [
-    [
-        "target/release/cloudflare-dns-updater",
-        "/usr/local/bin/cloudflare-dns-updater",
-        "755",
-    ]
-]
-systemd-units = { enable = false }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -28,9 +11,10 @@ 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.25.3"
+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"

README.md

@@ -7,45 +7,38 @@
 The application necessarily requires a valid Cloudflare API Token.
 Further the application must be located in the same network as the configured zones.
 
-The actual configuration happens in three or more files located in `~/.config/cloudflare-dns-updater/`:
+| Environment Variable | Required |               Usage                |
-`config.toml` contains general configuration parameters for the application
+|:--------------------:|:--------:|:----------------------------------:|
+|     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:  
 `interfaces.toml` contains all IPv6 interfaces available/used by the zone config files.  
-`.toml` files in `zones.d` contain settings for individual zones.
+`.toml` files in `zone.d` contain settings for individual zones.
 
 Example:
 
-*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*
 ```toml
 host_address = "::edcb:a098:7654:3210"
 
-[interfaces]
+[[interface]]
-example-interface = "::0123:4567:890a:bcde"   # static part of the IP, the rest will be dynamically generated using the host
+name = "example-interface-1"     # this is what a user inputs in the zone.toml
+address = "::0123:4567:890a:bcde"  # static part of the IP, the rest will be dynamically generated using the host
 ```
 
-*zones.d/example.org.toml*
+*zone.d/example.org.toml*
 ```toml
 email = "owner@example.org"             # Email of User owning the Zone
 zone = "example.org"                    # Zone Name
 id = "01234567890abcdefghijklmnopqrstu" # Zone ID
 
 [[entry]]
-name = "example.org"                # "@" Symbol is not currently supported 
+name = "example.org"              # "@" Symbol is not currently supported 
-type = ["AAAA", "A"]                # Options are: "A" (IPv4/A Record) and/or "AAAA" (IPv6/AAAA Record) 
+type = ["AAAA", "A"]                  # Options are: "A" (IPv4/A Record) and/or "AAAA" (IPv6/AAAA Record) 
-interface = "example-interface"     # Only required on type values 6 and 10
+interface = "example-interface-1" # Only required on type values 6 and 10
 ```
 
 ## Debian Repository
-
+TODO!
-Currently supported:
-- Debian 12 'Bookworm'
-
-Includes systemd system and user unit files
-
-For more details see [the package registry](https://forgejo.neshweb.net/Neshura/-/packages/debian/cloudflare-dns-updater)

cloudflare.json

@@ -0,0 +1,74 @@
+{
+    "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"
+    ]
+  }

config.json

@@ -0,0 +1,38 @@
+{
+  "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": [
+      ]
+    }
+  ]
+}

debian/cloudflare-dns-updater@.service

@@ -1,14 +0,0 @@
-[Unit]
-Description="Application for automatically updating Cloudflare DNS records"
-After=syslog.target
-After=network-online.target
-
-[Service]
-Type=simple
-User=%i
-ExecStart=/usr/local/bin/cloudflare-dns-updater
-Restart=always
-RestartSec=3
-
-[Install]
-WantedBy=multi-user.target

src/cloudflare.rs

@@ -1,4 +1,6 @@
 use std::collections::HashMap;
+use std::env;
+use std::env::VarError;
 use std::error::Error;
 use std::net::{Ipv4Addr, Ipv6Addr};
 use log::{error, warn};
@@ -9,7 +11,7 @@ use serde_derive::{Deserialize, Serialize};
 use strum_macros::{Display, IntoStaticStr};
 use systemd_journal_logger::connected_to_journal;
 use url::ParseError;
-use crate::config::{AppConfig, ZoneConfig, ZoneEntry};
+use crate::config::{ZoneConfig, ZoneEntry};
 
 const API_BASE: &str = "https://api.cloudflare.com/client/v4";
 
@@ -25,21 +27,19 @@ struct CloudflareApiResult {
 }
 
 pub(crate) struct CloudflareZone {
-    name: String,
     email: String,
     key: String,
     id: String,
 }
 
 impl CloudflareZone {
-    pub(crate) fn new(zone: &ZoneConfig, config: &AppConfig) -> Self {
+    pub(crate) fn new(zone: &ZoneConfig) -> Result<Self, VarError> {
-        let key = config.cloudflare_api_token.clone();
+        let key = env::var("CF_API_TOKEN")?;
-        Self {
+        Ok(Self {
-            name: zone.name.clone(),
             email: zone.email.clone(),
             key,
             id: zone.id.clone(),
-        }
+        })
     }
 
     fn generate_auth_headers(&self) -> HeaderMap {
@@ -64,7 +64,7 @@ impl CloudflareZone {
                     let entries = match response.json::<CloudflareApiResults>() {
                         Ok(data) => data,
                         Err(e) => {
-                            let err_msg = format!("Unable to parse API response: {e}");
+                            let err_msg = format!("Unable to parse API response. Error: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -75,7 +75,7 @@ impl CloudflareZone {
 
                     Ok(entries.result)
                 } else {
-                    let err_msg = format!("Unable to fetch Cloudflare Zone Entries for {}: {}",self.name ,response.status());
+                    let err_msg = format!("Unable to fetch Cloudflare Zone Entries. Error: {}", response.status());
                     match connected_to_journal() {
                         true => error!("[ERROR] {err_msg}"),
                         false => eprintln!("[ERROR] {err_msg}"),
@@ -84,7 +84,7 @@ impl CloudflareZone {
                 }
             }
             Err(e) => {
-                let err_msg = format!("Unable to access Cloudflare API: {e}");
+                let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
                 match connected_to_journal() {
                     true => error!("[ERROR] {err_msg}"),
                     false => eprintln!("[ERROR] {err_msg}"),
@@ -107,7 +107,7 @@ impl CloudflareZone {
                             self.validate_response(response)
                         },
                         Err(e) => {
-                            let err_msg = format!("Unable to access Cloudflare API: {e}");
+                            let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -133,7 +133,7 @@ impl CloudflareZone {
                             self.validate_response(response)
                         },
                         Err(e) => {
-                            let err_msg = format!("Unable to access Cloudflare API: {e}");
+                            let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -174,7 +174,7 @@ impl CloudflareZone {
                             self.validate_response(response)
                         },
                         Err(e) => {
-                            let err_msg = format!("Unable to access Cloudflare API: {e}");
+                            let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -200,7 +200,7 @@ impl CloudflareZone {
                             self.validate_response(response)
                         },
                         Err(e) => {
-                            let err_msg = format!("Unable to access Cloudflare API: {e}");
+                            let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -270,7 +270,7 @@ impl CloudflareZone {
         match Url::parse(input) {
             Ok(url) => Ok(url),
             Err(e) => {
-                let err_msg = format!("Unable to parse URL: {}", e);
+                let err_msg = format!("Unable to parse URL. Error: {}", e);
                 match connected_to_journal() {
                     true => error!("[ERROR] {err_msg}"),
                     false => eprintln!("[ERROR] {err_msg}"),
@@ -293,7 +293,7 @@ impl CloudflareZone {
             let data = match response.json::<CloudflareApiResult>() {
                 Ok(data) => data,
                 Err(e) => {
-                    let err_msg = format!("Unable to parse API response: {e}");
+                    let err_msg = format!("Unable to parse API response. Error: {e}");
                     match connected_to_journal() {
                         true => error!("[ERROR] {err_msg}"),
                         false => eprintln!("[ERROR] {err_msg}"),
@@ -305,7 +305,7 @@ impl CloudflareZone {
             match data.success {
                 true => Ok(()),
                 false => {
-                    let err_msg = format!("Unexpected error while updating DNS record: {:?}", data);
+                    let err_msg = format!("Unexpected error while updating DNS record. Info: {:?}", data);
                     match connected_to_journal() {
                         true => error!("[ERROR] {err_msg}"),
                         false => eprintln!("[ERROR] {err_msg}"),
@@ -314,7 +314,7 @@ impl CloudflareZone {
                 }
             }
         } else {
-            let err_msg = format!("Unable to post/put Cloudflare DNS entry: {}", response.status());
+            let err_msg = format!("Unable to post/put Cloudflare DNS entry. Error: {}", response.status());
             match connected_to_journal() {
                 true => error!("[ERROR] {err_msg}"),
                 false => eprintln!("[ERROR] {err_msg}"),

src/config.rs

@@ -10,7 +10,7 @@ use systemd_journal_logger::connected_to_journal;
 use crate::cloudflare::DnsRecordType;
 use crate::cloudflare::DnsRecordType::{A, AAAA};
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub(crate) struct InterfaceConfig {
     pub(crate) host_address: Ipv6Addr,
     pub(crate) interfaces: HashMap<String, Ipv6Addr>,
@@ -37,7 +37,7 @@ impl InterfaceConfig {
         let interface_address = match self.interfaces.get(interface_name) {
             Some(address) => *address,
             None => {
-                let err_msg = format!("Malformed or missing IP in interfaces.toml for interface {}", interface_name);
+                let err_msg = "Malformed IP in interfaces.toml";
                 match connected_to_journal() {
                     true => error!("[ERROR] {err_msg}"),
                     false => eprintln!("[ERROR] {err_msg}"),
@@ -45,7 +45,8 @@ impl InterfaceConfig {
                 return Err(());
             }
         };
-        Ok(host_range.bitor(interface_address))
+        let interface_ip = host_range.bitor(interface_address);
+        Ok(interface_ip)
     }
 }
 
@@ -60,7 +61,7 @@ impl Default for InterfaceConfig {
 
 ///////////////
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub(crate) struct ZoneEntry {
     pub(crate) name: String,
     pub(crate) r#type: Vec<DnsRecordType>,
@@ -77,7 +78,7 @@ impl Default for ZoneEntry {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub(crate) struct ZoneConfig {
     pub(crate) email: String,
     pub(crate) name: String,
@@ -91,8 +92,7 @@ impl ZoneConfig {
         let path = confy::get_configuration_file_path(env!("CARGO_PKG_NAME"), "interfaces").expect("Something went wrong with confy");
         let zones_dir = path.parent().expect("Something went wrong with confy").join("zones.d/");
 
-        let zones = fs::read_dir(zones_dir).expect("Directory creation handling does not yet exist");
+        let zones = fs::read_dir(zones_dir).unwrap();
-
 
         let mut zone_configs: Vec<Self> = vec![];
 
@@ -106,9 +106,7 @@ impl ZoneConfig {
                     false => eprintln!("[WARN] {warn_msg}"),
                 }
             }
-            else if !path.file_name().expect("Directories should have been filtered out by the leading if")
+            else {
-                .to_str().expect("Conversion to str should not fail for a file name")
-                .starts_with('.') {
                 let zone_config_path = format!("zones.d/{}", path.file_stem()
                     .expect("stem could not be extracted from filename").to_str()
                     .expect("&OsStr could not be converted to &str"));
@@ -140,46 +138,3 @@ impl Default for ZoneConfig {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
-pub(crate) struct AppConfig {
-    pub(crate) cloudflare_api_token: String,
-    pub(crate) check_interval_seconds: Option<u16>,
-    pub(crate) uptime_url: Option<String>,
-}
-
-impl AppConfig {
-    pub(crate) fn load() -> Result<Self, Box<dyn Error>> {
-        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
-        }
-    }
-}
-

src/main.rs

@@ -5,11 +5,11 @@ 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::{AppConfig, InterfaceConfig, ZoneConfig, ZoneEntry};
 
 mod config;
 mod cloudflare;
@@ -24,8 +24,8 @@ struct Addresses {
 impl Addresses {
     fn new() -> Result<Self, Box<dyn Error>> {
         let mut ret = Self {
-            ipv4_uri: "http://ip4only.me/api/".to_owned(),
+            ipv4_uri: "https://am.i.mullvad.net/ip".to_owned(),
-            ipv6_uri: "http://ip6only.me/api/".to_owned(),
+            ipv6_uri: "https://ipv6.am.i.mullvad.net/ip".to_owned(),
             ipv4: Ipv4Addr::new(0, 0, 0, 0),
             ipv6: Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)
         };
@@ -61,28 +61,19 @@ impl Addresses {
         match self.get_v4() {
             Ok(ip) => {
                 if ip != self.ipv4 {
-                    if ip == Ipv4Addr::new(0,0,0,0) {
+                    let info_msg = format!("IPv4 changed from '{}' to '{}'", self.ipv4, ip);
-                        let warn_msg = "'0.0.0.0' detected as new IPv4, skipping changes".to_owned();
+                    match connected_to_journal() {
-                        match connected_to_journal() {
+                        true => info!("[INFO] {info_msg}"),
-                            true => warn!("[WARN] {warn_msg}"),
+                        false => println!("[INFO] {info_msg}"),
-                            false => println!("[WARN] {warn_msg}"),
-                        }
-                    }
-                    else {
-                        let info_msg = format!("IPv4 changed from '{}' to '{}'", self.ipv4, ip);
-                        match connected_to_journal() {
-                            true => info!("[INFO] {info_msg}"),
-                            false => println!("[INFO] {info_msg}"),
-                        }
-                        self.ipv4 = ip;
                     }
+                    self.ipv4 = ip;
                 }
             }
             Err(e) => {
-                let error_msg = format!("Unable to fetch IPv4 from '{}': {}", self.ipv4_uri, e);
+                let warn_msg = format!("Unable to fetch IPv4 from '{}'. Error: {}", self.ipv4_uri, e);
                 match connected_to_journal() {
-                    true => error!("[ERROR] {error_msg}"),
+                    true => warn!("[WARN] {warn_msg}"),
-                    false => eprintln!("[ERROR] {error_msg}"),
+                    false => println!("[WARN] {warn_msg}"),
                 }
             }
         }
@@ -90,28 +81,19 @@ impl Addresses {
         match self.get_v6() {
             Ok(ip) => {
                 if ip != self.ipv6 {
-                    if ip == Ipv6Addr::new(0,0,0,0,0,0,0,0) {
+                    let info_msg = format!("IPv6 changed from '{}' to '{}'", self.ipv6, ip);
-                        let warn_msg = "'::' detected as new IPv6, skipping changes".to_owned();
+                    match connected_to_journal() {
-                        match connected_to_journal() {
+                        true => info!("[INFO] {info_msg}"),
-                            true => warn!("[WARN] {warn_msg}"),
+                        false => println!("[INFO] {info_msg}"),
-                            false => println!("[WARN] {warn_msg}"),
-                        }
-                    }
-                    else {
-                        let info_msg = format!("IPv6 changed from '{}' to '{}'", self.ipv6, ip);
-                        match connected_to_journal() {
-                            true => info!("[INFO] {info_msg}"),
-                            false => println!("[INFO] {info_msg}"),
-                        }
-                        self.ipv6 = ip;
                     }
+                    self.ipv6 = ip;
                 }
             }
             Err(e) => {
-                let error_msg = format!("Unable to fetch IPv6 from '{}': {}", self.ipv6_uri, e);
+                let warn_msg = format!("Unable to fetch IPv6 from '{}'. Error: {}", self.ipv6_uri, e);
                 match connected_to_journal() {
-                    true => error!("[ERROR] {error_msg}"),
+                    true => warn!("[WARN] {warn_msg}"),
-                    false => eprintln!("[ERROR] {error_msg}"),
+                    false => println!("[WARN] {warn_msg}"),
                 }
             }
         }
@@ -122,7 +104,7 @@ impl Addresses {
             Ok(res) => {
                 match res.status() {
                     StatusCode::OK => {
-                        let ip_string = res.text().expect("Returned data should always contain text").trim_end().split(',').collect::<Vec<&str>>()[1].to_owned();
+                        let ip_string = res.text().expect("Returned data should always contain text").trim_end().to_owned();
                         Ok(Ipv4Addr::from_str(ip_string.as_str()).expect("Returned IP should always be parseable"))
                     },
                     _ => {
@@ -145,7 +127,7 @@ impl Addresses {
             Ok(res) => {
                 match res.status() {
                     StatusCode::OK => {
-                        let ip_string: String = res.text().expect("Returned data should always contain text").trim_end().split(',').collect::<Vec<&str>>()[1].to_owned();
+                        let ip_string = res.text().expect("Returned data should always contain text").trim_end().to_owned();
                         Ok(Ipv6Addr::from_str(ip_string.as_str()).expect("Returned IP should always be parseable"))
                     },
                     _ => {
@@ -163,99 +145,13 @@ impl Addresses {
     }
 }
 
-fn compare_zones(old_zone: &ZoneConfig, new_zone: &ZoneConfig) -> Vec<String> {
-    let mut info_pieces = vec![];
-    if old_zone.id != new_zone.id || old_zone.email != new_zone.email {
-        let msg = "changed id or email".to_owned();
-        info_pieces.push(msg);
-    }
-
-    if old_zone.entries != new_zone.entries {
-        let mut added: Vec<&ZoneEntry> = vec![];
-        let mut modified: Vec<&ZoneEntry> = vec![];
-
-        new_zone.entries.iter().for_each(|entry| {
-            let matches: Vec<&ZoneEntry> = old_zone.entries.iter().filter(|old_entry| {
-                if old_entry.name == entry.name {
-                    if old_entry != &entry {
-                        modified.push(entry);
-                    }
-                    true
-                }
-                else {
-                    false
-                }
-            }).collect();
-
-            if matches.is_empty() {
-                added.push(entry);
-            }
-        });
-
-        let deleted: Vec<&ZoneEntry> = old_zone.entries.iter().filter(|old_entry| {
-            !new_zone.entries.contains(old_entry) &&
-                !new_zone.entries.iter().any(|changed_entry| { changed_entry.name == old_entry.name })
-        }).collect();
-
-        if !deleted.is_empty() {
-            let mut deleted_entries_vec = vec![];
-
-            for entry in deleted {
-                deleted_entries_vec.push(entry.name.clone());
-            }
-
-            let deleted_entries = match deleted_entries_vec.len() {
-                1 => deleted_entries_vec[0].clone(),
-                2 => deleted_entries_vec.join(" & "),
-                _ => deleted_entries_vec.join(", "),
-            };
-            let msg = format!("deleted {deleted_entries}");
-            info_pieces.push(msg);
-        }
-
-        if !added.is_empty() {
-            let mut added_entries_vec = vec![];
-
-            for entry in added {
-                added_entries_vec.push(entry.name.clone());
-            }
-
-            let added_entries = match added_entries_vec.len() {
-                1 => added_entries_vec[0].clone(),
-                2 => added_entries_vec.join(" & "),
-                _ => added_entries_vec.join(", "),
-            };
-            let msg = format!("added {added_entries}");
-            info_pieces.push(msg);
-        }
-
-        if !modified.is_empty() {
-            let mut modified_entries_vec = vec![];
-
-            for entry in modified {
-                modified_entries_vec.push(entry.name.clone());
-            }
-
-            let modified_entries = match modified_entries_vec.len() {
-                1 => modified_entries_vec[0].clone(),
-                2 => modified_entries_vec.join(" & "),
-                _ => modified_entries_vec.join(", "),
-            };
-            let msg = format!("modified {modified_entries}");
-            info_pieces.push(msg);
-        }
-    }
-
-    info_pieces
-}
-
 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 = config::InterfaceConfig::load().unwrap();
-    let mut ifaces = InterfaceConfig::load().unwrap();
+    let mut zone_cfgs= config::ZoneConfig::load().unwrap();
-    let mut zone_cfgs = ZoneConfig::load().unwrap();
 
     let mut now = Utc::now() - Duration::seconds(59);
     let mut start = now;
@@ -265,104 +161,15 @@ fn main() {
         Err(e) => panic!("{}", e)
     };
 
-    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) {
+        if now >= start + Duration::seconds(60) {
             start = now;
 
-            if let Some(uptime_url) = &config.uptime_url {
+            match config::InterfaceConfig::load() {
-                let _ = get(uptime_url);
+                Ok(new) => ifaces = new,
-            }
-
-            match InterfaceConfig::load() {
-                Ok(new_cfg) => {
-                    if ifaces != new_cfg {
-                        if ifaces.host_address != new_cfg.host_address {
-                            let info_msg = format!("Host address in interfaces.toml changed from '{}' to '{}'", ifaces.host_address, new_cfg.host_address);
-                            match connected_to_journal() {
-                                true => info!("[INFO] {info_msg}"),
-                                false => println!("[INFO] {info_msg}"),
-                            }
-                        }
-
-                        if ifaces.interfaces != new_cfg.interfaces {
-                            let mut new: Vec<(&String, &Ipv6Addr)> = vec![];
-                            let mut modified: Vec<(&String, &Ipv6Addr)> = vec![];
-
-                            new_cfg.interfaces.iter().for_each(|(interface, address)| {
-                                if ifaces.interfaces.contains_key(interface) {
-                                    if ifaces.interfaces.get(interface) != Some(address) {
-                                        modified.push((interface, address));
-                                    }
-                                }
-                                else {
-                                    let matches: Vec<&Ipv6Addr> = ifaces.interfaces.values().filter(|addr| {
-                                        addr == &address
-                                    }).collect();
-
-                                    if matches.is_empty() {
-                                        new.push((interface, address));
-                                    }
-                                    else {
-                                        modified.push((interface, address));
-                                    }
-                                }
-                            });
-
-                            let deleted: Vec<(&String, &Ipv6Addr)> = ifaces.interfaces.iter().filter(|(interface, address)| {
-                                !new_cfg.interfaces.contains_key(*interface) && !modified.iter().any(|(_, new_addr)| { new_addr == address })
-                            }).collect();
-
-                            for (name, addr) in deleted {
-                                let info_msg = format!("Deleted interface '{name}' with address '{addr}'");
-                                match connected_to_journal() {
-                                    true => info!("[INFO] {info_msg}"),
-                                    false => println!("[INFO] {info_msg}"),
-                                }
-                            }
-
-                            for (name, addr) in new {
-                                let info_msg = format!("Added interface '{name}' with address '{addr}'");
-                                match connected_to_journal() {
-                                    true => info!("[INFO] {info_msg}"),
-                                    false => println!("[INFO] {info_msg}"),
-                                }
-                            }
-
-                            for (name, addr) in modified {
-                                let info_msg= if ifaces.interfaces.contains_key(name) {
-                                    let old_addr = ifaces.interfaces.get(name).expect("contains check on ifaces was successful");
-                                    format!("Changed interface address of '{name}' from '{old_addr}' to '{addr}'")
-                                }
-                                else {
-                                    let old_name = ifaces.interfaces.iter()
-                                        .find(|(_, old_addr)| { old_addr == &addr })
-                                        .expect("modified entry should not exist if this fails")
-                                        .0;
-                                    format!("Changed interface name for '{addr}' from '{old_name}' to '{name}'")
-                                };
-
-                                match connected_to_journal() {
-                                    true => info!("[INFO] {info_msg}"),
-                                    false => println!("[INFO] {info_msg}"),
-                                }
-                            }
-                        }
-
-                        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}"),
@@ -370,204 +177,10 @@ fn main() {
                 }
             }
 
-            match ZoneConfig::load() {
+            match config::ZoneConfig::load() {
-                Ok(new_cfgs) => {
+                Ok(new) => zone_cfgs = new,
-                    if zone_cfgs != new_cfgs {
-                        if zone_cfgs.len() != new_cfgs.len() {
-                            let new_zones: Vec<&ZoneConfig> = new_cfgs.iter().filter(|zone_cfg| {
-                                !zone_cfgs.contains(zone_cfg)
-                            }).collect();
-
-                            let deleted_zones: Vec<&ZoneConfig> = zone_cfgs.iter().filter(|zone_cfg| {
-                                !new_cfgs.contains(zone_cfg)
-                            }).collect();
-
-                            for new_zone in new_zones {
-                                let name = new_zone.name.as_str();
-                                let entry_count = new_zone.entries.len();
-                                let info_msg = format!("Added Zone '{name}' with {entry_count} entries");
-                                match connected_to_journal() {
-                                    true => info!("[INFO] {info_msg}"),
-                                    false => println!("[INFO] {info_msg}"),
-                                }
-                            }
-
-                            for deleted_zone in deleted_zones {
-                                let name = deleted_zone.name.as_str();
-                                let entry_count = deleted_zone.entries.len();
-                                let info_msg = format!("Deleted Zone '{name}' with {entry_count} entries");
-                                match connected_to_journal() {
-                                    true => info!("[INFO] {info_msg}"),
-                                    false => println!("[INFO] {info_msg}"),
-                                }
-                            }
-                        }
-                        else {
-                            let changed_zones: Vec<&ZoneConfig> = new_cfgs.iter().filter(|new_cfg| {
-                                zone_cfgs.iter().any(|old_cfg| {
-                                    old_cfg.name == new_cfg.name && &old_cfg != new_cfg
-                                })
-                            }).collect();
-
-                            let deleted_zones: Vec<&ZoneConfig> = zone_cfgs.iter().filter(|old_cfg| {
-                                !new_cfgs.iter().any(|new_cfg| {
-                                    old_cfg.name == new_cfg.name
-                                })
-                            }).collect();
-
-                            let added_zones: Vec<&ZoneConfig> = new_cfgs.iter().filter(|new_cfg| {
-                                !zone_cfgs.iter().any(|old_cfg| {
-                                    old_cfg.name == new_cfg.name
-                                })
-                            }).collect();
-
-                            if deleted_zones.len() == 1 && added_zones.len() == 1 {
-                                let new_zone = added_zones[0];
-                                let old_zone = deleted_zones[0];
-
-                                let mut info_pieces = vec![];
-
-                                {
-                                    let msg = format!("name from '{}' to '{}'", old_zone.name, new_zone.name);
-                                    info_pieces.push(msg);
-                                }
-
-                                let info_pieces = [info_pieces, compare_zones(old_zone, new_zone)].concat();
-
-                                println!("{}", info_pieces.join(", "));
-                            }
-                            else {
-                                if !deleted_zones.is_empty() {
-                                    let mut info_pieces = vec![];
-                                    for deleted_zone in deleted_zones {
-                                        info_pieces.push(deleted_zone.name.clone());
-                                    }
-                                    let deleted_info = match info_pieces.len() {
-                                        1 => info_pieces[0].clone(),
-                                        2 => info_pieces.join(" & "),
-                                        _ => info_pieces.join(", "),
-                                    };
-                                    let info_msg = format!("Deleted {deleted_info}");
-                                    match connected_to_journal() {
-                                        true => info!("[INFO] {info_msg}"),
-                                        false => println!("[INFO] {info_msg}"),
-                                    }
-                                }
-
-                                if !added_zones.is_empty() {
-                                    let mut info_pieces = vec![];
-                                    for added_zone in added_zones {
-                                        info_pieces.push(added_zone.name.clone());
-                                    }
-                                    let added_info = match info_pieces.len() {
-                                        1 => info_pieces[0].clone(),
-                                        2 => info_pieces.join(" & "),
-                                        _ => info_pieces.join(", "),
-                                    };
-                                    let info_msg = format!("Added {added_info}");
-                                    match connected_to_journal() {
-                                        true => info!("[INFO] {info_msg}"),
-                                        false => println!("[INFO] {info_msg}"),
-                                    }
-                                }
-                            }
-
-                            for changed_zone in changed_zones {
-                                // try find element where one of these is unchanged
-                                let old_zone = zone_cfgs.iter().find(|zone_cfg| {
-                                        zone_cfg.name == changed_zone.name
-                                }).expect("This element should exist because it was added to the changed_zones vector");
-
-                                let info_pieces = compare_zones(old_zone, changed_zone);
-
-                                let changed_info = match info_pieces.len() {
-                                    1 => info_pieces[0].clone(),
-                                    2 => info_pieces.join(" & "),
-                                    _ => info_pieces.join(", "),
-                                };
-                                let info_msg_raw = format!("{changed_info} for {}", changed_zone.name);
-                                let mut info_msg_chars = info_msg_raw.chars();
-                                let info_msg = match info_msg_chars.next() {
-                                    None => String::new(),
-                                    Some(first) => first.to_uppercase().collect::<String>() + info_msg_chars.as_str(),
-                                };
-                                match connected_to_journal() {
-                                    true => info!("[INFO] {info_msg}"),
-                                    false => println!("[INFO] {info_msg}"),
-                                }
-                            }
-                        }
-
-                        zone_cfgs = new_cfgs
-                    }
-                }
                 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}"),
@@ -577,7 +190,17 @@ fn main() {
 
             ips.update();
             for zone in &zone_cfgs {
-                let cf_zone = CloudflareZone::new(zone, &config);
+                let cf_zone = match CloudflareZone::new(zone) {
+                    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_entries = match cf_zone.get_entries() {
                     Ok(entries) => entries,
@@ -636,27 +259,27 @@ fn main() {
                             cf_entry.name == entry.name && &cf_entry.r#type == r#type
                         });
 
-                        if let Some(cf_entry) = cf_entry {
+                        match cf_entry.unwrap().r#type {
-                            match cf_entry.r#type {
+                            DnsRecordType::A => {
-                                DnsRecordType::A => {
+                                let cf_ip = Ipv4Addr::from_str(cf_entry.unwrap().content.as_str()).expect("Cloudflare return should always be valid IP");
-                                    let cf_ip = Ipv4Addr::from_str(cf_entry.content.as_str()).expect("Cloudflare return should always be valid IP");
+                                if Some(cf_ip) == ipv4 {
-                                    if Some(cf_ip) == ipv4 {
+                                    continue
-                                        continue
+                                }
-                                    }
+                            },
-                                },
+                            DnsRecordType::AAAA => {
-                                DnsRecordType::AAAA => {
+                                let cf_ip = Ipv6Addr::from_str(cf_entry.unwrap().content.as_str()).expect("Cloudflare return should always be valid IP");
-                                    let cf_ip = Ipv6Addr::from_str(cf_entry.content.as_str()).expect("Cloudflare return should always be valid IP");
+                                if Some(cf_ip) == ipv6 {
-                                    if Some(cf_ip) == ipv6 {
+                                    continue
-                                        continue
+                                }
-                                    }
+                            },
-                                },
+                            _ => {},
-                                _ => {},
+                        }
-                            }
 
+                        if let Some(cf_entry) = cf_entry {
                             if cf_zone.update(entry, r#type, &cf_entry.id, ipv6, ipv4).is_ok() {
                                 let info_msg = format!("Updated {} DNS Record for entry '{}' in zone '{}'", r#type, entry.name, zone.name);
                                 match connected_to_journal() {
-                                    true => info!("[INFO] {info_msg}"),
+                                    true => warn!("[INFO] {info_msg}"),
                                     false => println!("[INFO] {info_msg}"),
                                 }
                             }