Update references to dnst to use cascade-dnst.

Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "cascade"
 default-run = "cascaded"
@@ -114,7 +114,7 @@
 ["README.md","usr/share/doc/cascade/","644"],
 #["doc/cascade.1", "usr/share/man/man1/cascade.1", "644"],
 #["doc/cascaded.1", "usr/share/man/man1/cascaded.1", "644"],
-["etc/config.toml.system-service", "etc/cascade/config.toml", "644"],
+["etc/config.system.toml", "etc/cascade/config.toml", "644"],
 ["pkg/common/service.preset","usr/lib/systemd/service-preset/50-cascaded.preset", "644"],
 ]
 name = "cascade"
@@ -124,7 +124,7 @@
 Cascade is a friendly DNSSEC signing solution, offering sensible defaults,
 controllability, observability and flexibility.
 """
-depends = "$auto, adduser, dnst"
+depends = "$auto, adduser, cascade-dnst"
 recommends = "kmip2pkcs11"
 section = "net"
 priority = "optional"
@@ -157,14 +157,14 @@
 { source = "target/rpm/cascaded.socket", dest = "/usr/lib/systemd/system/cascaded.socket", mode = "644" },
 #{ source = "doc/cascade.1", dest = "/usr/share/man/man1/cascade.1", mode = "644", doc = true },
 #{ source = "doc/cascaded.1", dest = "/usr/share/man/man1/cascaded.1", mode = "644", doc = true },
-{ source = "etc/config.toml.system-service", dest = "/etc/cascade/config.toml", mode = "644", config = true },
+{ source = "etc/config.system.toml", dest = "/etc/cascade/config.toml", mode = "644", config = true },
 { source = "pkg/common/service.preset", dest = "/usr/lib/systemd/system-preset/50-cascaded.preset", mode = "644" },
 ]
 
 # ensure that the useradd tools are present by installing their respective packages
 [package.metadata.generate-rpm.requires]
 shadow-utils = "*"
-dnst = "*"
+cascade-dnst = "*"
 
 [package.metadata.generate-rpm.recommends]
 kmip2pkcs11 = "*"

etc/config.system.toml

@@ -13,7 +13,7 @@ tsig-store-path = "/var/lib/cascade/tsig-keys.db"
 kmip-credentials-store-path = "/var/lib/cascade/kmip/credentials.db"
 keys-dir = "/var/lib/cascade/keys"
 kmip-server-state-dir = "/var/lib/cascade/kmip"
-dnst-binary-path = "dnst"
+dnst-binary-path = "/usr/libexec/cascade/cascade-dnst"
 
 [daemon]
 log-level = "info"

etc/config.template.toml

@@ -71,7 +71,7 @@ kmip-server-state-dir = "/var/lib/cascade/kmip"
 # Cascade relies on the 'dnst' program (<https://github.com/NLnetLabs/dnst>) in
 # order to perform DNSSEC key rollovers.  You can specify an absolute path here,
 # or just 'dnst' if it is in $PATH.
-dnst-binary-path = "dnst"
+dnst-binary-path = "/usr/libexec/cascade/cascade-dnst"
 
 
 # Settings relevant to any daemon program.

pkg/debian/postinst

@@ -5,13 +5,6 @@ USER_ID="cascade"
 create_user() {
     if id ${USER_ID} > /dev/null 2>&1; then return; fi
     adduser --system --home /var/cascade --group ${USER_ID}
-
-    # Create the empty default directories as Cascade will fail to start
-    # without them.
-    mkdir -p /etc/cascade/policies
-    mkdir -p /var/lib/cascade/{zone-state,keys}
-    chown ${USER_ID}: /etc/cascade/policies
-    chown -R ${USER_ID}: /var/lib/cascade
 }
 
 case "$1" in

pkg/rpm/scriptlets.toml

@@ -15,13 +15,6 @@ if [ $1 -eq 1 ] ; then
         # According to the CentOS 7 useradd man page:
         # --user-group causes a group by the same name as the user to be created
         useradd --system --user-group ${USER_ID} --home-dir /var/${USER_ID} --create-home
-
-        # Create the empty default directories as Cascade will fail to start
-        # without them.
-        mkdir -p /etc/cascade/policies
-        mkdir -p /var/lib/cascade/{zone-state,keys}
-        chown ${USER_ID}: /etc/cascade/policies
-        chown -R ${USER_ID}: /var/lib/cascade
     fi
 
     # Run commands equivalent to what the RPM systemd macros would do

pkg/test-scripts/test-cascade.sh

@@ -12,7 +12,7 @@ case $1 in
     cascaded --version
 
     echo -e "\nDNST VERSION:"
-    dnst --version
+    /usr/libexec/cascade/cascade-dnst --version
 
     echo -e "\nCASCADED CONF:"
     cat /etc/cascade/config.toml

src/config/file/v1.rs

@@ -124,12 +124,12 @@ impl Spec {
 
     /// The default value for `dnst_binary_path`.
     fn dnst_binary_path_default() -> Box<Utf8Path> {
-        "dnst".into()
+        "/usr/libexec/cascade/cascade-dnst".into()
     }
 
     /// The default value for `dnst_keyset_dir`.
     fn keys_dir_default() -> Box<Utf8Path> {
-        "/var/db/cascade/keys".into()
+        "/var/lib/cascade/keys".into()
     }
 
     /// The default value for `kmip_credentials_store_path`.

src/config/mod.rs

@@ -75,7 +75,7 @@ impl Default for Config {
             zone_state_dir: "/var/lib/cascade/zone-state".into(),
             tsig_store_path: "/var/lib/cascade/tsig-keys.db".into(),
             keys_dir: "/var/lib/cascade/keys".into(),
-            dnst_binary_path: "dnst".into(),
+            dnst_binary_path: "/usr/libexec/cascade/cascade-dnst".into(),
             kmip_credentials_store_path: "/var/lib/cascade/kmip/credentials.db".into(),
             kmip_server_state_dir: "/var/lib/cascade/kmip".into(),
             remote_control: Default::default(),

src/units/key_manager.rs

@@ -529,7 +529,7 @@ impl TryFrom<&Utf8PathBuf> for KeySetInfo {
         let keyset_state_modified = file_modified(state_path)?;
 
         /// Persistent state for the keyset command.
-        /// Copied frmo the keyset branch of dnst.
+        /// Copied from the keyset branch of dnst.
         #[allow(dead_code)]
         #[derive(Deserialize)]
         struct KeySetState {