diff --git a/kurzlink.yml b/kurzlink.yml index 573379217bf64acbb36201454cc8362b3f36b480..1759111e96dfdf57500585fa108f0eb2cba02b32 100644 --- a/kurzlink.yml +++ b/kurzlink.yml @@ -1,6 +1,7 @@ # Configuration for Kurzlink, a static site generator for your shortlinks network: timeout: 1000 + check: true tags: feuer: diff --git a/serve.sh b/serve.sh index 5333b381a3765493a77bd0f890fcb16e2042d7bd..366c9659216159358877f9eba92a068ba9a1603c 100755 --- a/serve.sh +++ b/serve.sh @@ -4,8 +4,7 @@ KL_PWD="$(pwd)" KL_BASEPATH="${KL_PWD}/servetest" KL_VANITYPATH="${KL_BASEPATH}/vanitymap.json" -cargo build -./target/debug/kurzlink -g -o "${KL_BASEPATH}" -m "${KL_VANITYPATH}" +cargo run -- -g -o "${KL_BASEPATH}" -m "${KL_VANITYPATH}" || exit cd "${KL_BASEPATH}" python3 -m http.server cd "${KL_PWD}" diff --git a/src/config/mod.rs b/src/config/mod.rs index 671bc0a93ce8b882ca7b3f571f0cda52ba8c4de8..6f5769f0be4e24b6d05c74cbd73ea27cd5e1cb98 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -51,7 +51,7 @@ impl Config { let links = self .shortlinks .iter() - .filter(|v| v.check.unwrap_or(true)) + .filter(|v| v.check.unwrap_or(self.network.check)) .map(|v| v.destination.as_str()) .collect::<Vec<&str>>(); diff --git a/src/config/network.rs b/src/config/network.rs index fd5a2c360930bce1b6c3ab456bc1a6094507a0c0..09bba2532799b92254009a86186391053fbba86e 100644 --- a/src/config/network.rs +++ b/src/config/network.rs @@ -1,6 +1,7 @@ -use serde::{Serialize, Deserialize}; +use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize)] pub struct Network { - pub timeout: u64 -} \ No newline at end of file + pub timeout: u64, + pub check: bool, +}