.forgejo/workflows/build+release.yml

@@ -63,7 +63,7 @@ jobs:
                 name: Bundle .deb package
                 run: |
                     cargo deb
-                    DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~)
+                    DEBIAN_REF=$(echo ${{ github.ref_name }} | 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
@@ -137,7 +137,7 @@ jobs:
                 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

Cargo.lock

@@ -114,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "cloudflare-dns-updater"
-version = "1.1.9"
+version = "1.1.7"
 dependencies = [
  "chrono",
  "confy",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Neshura"]
 name = "cloudflare-dns-updater"
-version = "1.1.9"
+version = "1.1.7"
 edition = "2021"
 description = "Application for automatically updating Cloudflare DNS records"
 license = "GPL-3.0-or-later"

src/config.rs

@@ -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}"),

src/main.rs

@@ -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(),
-            ipv6_uri: "http://ip6only.me/api/".to_owned(),
+            ipv4_uri: "https://am.i.mullvad.net/ip".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)
         };
@@ -122,7 +122,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 +145,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"))
                     },
                     _ => {