Rename cascaded.service to cascade.service

Cargo.toml

@@ -254,7 +254,7 @@ assets = [
 ["doc/manual/build/man/cascaded-config.toml.5", "usr/share/man/man5/cascaded-config.toml.5", "644"],
 ["doc/manual/build/man/cascaded-policy.toml.5", "usr/share/man/man5/cascaded-policy.toml.5", "644"],
 ["etc/config.system.toml", "etc/cascade/config.toml", "644"],
-["pkg/common/service.preset","usr/lib/systemd/service-preset/50-cascaded.preset", "644"],
+["pkg/common/service.preset","usr/lib/systemd/service-preset/50-cascade.preset", "644"],
 ]
 name = "cascade"
 maintainer = "NLnet Labs <cascade@nlnetlabs.nl>"
@@ -271,16 +271,16 @@ maintainer-scripts = "pkg/debian"
 changelog = "target/debian/changelog" # this will be generated by the pkg workflow
 copyright = "Copyright (c) 2025, NLnet Labs. All rights reserved."
 conf-files = ["/etc/cascade/config.toml"]
-systemd-units = { unit-name = "cascaded", unit-scripts = "pkg/common", enable = false, usr-merge = true } # usr-merge is needed for Bookworm/Noble and later
+systemd-units = { unit-name = "cascade", unit-scripts = "pkg/common", enable = false, usr-merge = true } # usr-merge is needed for Bookworm/Noble and later
 
 [package.metadata.deb.variants.debian-buster]
-systemd-units = { unit-name = "cascaded", unit-scripts = "pkg/common", enable = false, usr-merge = false }
+systemd-units = { unit-name = "cascade", unit-scripts = "pkg/common", enable = false, usr-merge = false }
 
 [package.metadata.deb.variants.debian-bullseye]
-systemd-units = { unit-name = "cascaded", unit-scripts = "pkg/common", enable = false, usr-merge = false }
+systemd-units = { unit-name = "cascade", unit-scripts = "pkg/common", enable = false, usr-merge = false }
 
 [package.metadata.deb.variants.ubuntu-jammy]
-systemd-units = { unit-name = "cascaded", unit-scripts = "pkg/common", enable = false, usr-merge = false }
+systemd-units = { unit-name = "cascade", unit-scripts = "pkg/common", enable = false, usr-merge = false }
 
 [package.metadata.generate-rpm]
 name = "cascade"
@@ -290,7 +290,7 @@ summary = "Friendly DNSSEC signing solution"
 assets = [
 { source = "target/release/cascade", dest = "/usr/bin/cascade", mode = "755" },
 { source = "target/release/cascaded", dest = "/usr/bin/cascaded", mode = "755" },
-{ source = "target/rpm/cascaded.service", dest = "/usr/lib/systemd/system/cascaded.service", mode = "644" },
+{ source = "target/rpm/cascade.service", dest = "/usr/lib/systemd/system/cascade.service", mode = "644" },
 { source = "README.md", dest = "/usr/share/doc/cascade/README.md", mode = "644", doc = true },
 { source = "doc/manual/build/man/cascade.1", dest = "/usr/share/man/man1/cascade.1", mode = "644", doc = true },
 { source = "doc/manual/build/man/cascade-debug.1", dest = "/usr/share/man/man1/cascade-debug.1", mode = "644", doc = true },
@@ -307,7 +307,7 @@ assets = [
 { source = "doc/manual/build/man/cascaded-config.toml.5", dest = "/usr/share/man/man5/cascaded-config.toml.5", mode = "644", doc = true },
 { source = "doc/manual/build/man/cascaded-policy.toml.5", dest = "/usr/share/man/man5/cascaded-policy.toml.5", mode = "644", doc = 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" },
+{ source = "pkg/common/service.preset", dest = "/usr/lib/systemd/system-preset/50-cascade.preset", mode = "644" },
 ]
 
 # ensure that the useradd tools are present by installing their respective packages

doc/manual/source/installation.rst

@@ -86,25 +86,25 @@ started.
 
        .. code-block:: bash
 
-          sudo systemctl start cascaded
+          sudo systemctl start cascade
 
        You can also configure Cascade to start at boot:
 
        .. code-block:: bash
 
-          sudo systemctl enable cascaded
+          sudo systemctl enable cascade
 
        You can check the status of Cascade with:
 
        .. code-block:: bash 
 
-          sudo systemctl status cascaded
+          sudo systemctl status cascade
 
        You can view the logs with: 
 
        .. code-block:: bash
 
-          sudo journalctl --unit=cascaded
+          sudo journalctl --unit=cascade
 
    .. group-tab:: Ubuntu
 
@@ -165,25 +165,25 @@ started.
 
        .. code-block:: bash
 
-          sudo systemctl start cascaded
+          sudo systemctl start cascade
 
        You can also configure Cascade to start at boot:
 
        .. code-block:: bash
 
-          sudo systemctl enable cascaded
+          sudo systemctl enable cascade
 
        You can check the status of Cascade with:
 
        .. code-block:: bash 
 
-          sudo systemctl status cascaded
+          sudo systemctl status cascade
 
        You can view the logs with: 
 
        .. code-block:: bash
 
-          sudo journalctl --unit=cascaded
+          sudo journalctl --unit=cascade
 
    .. group-tab:: RHEL
 
@@ -232,25 +232,25 @@ started.
 
        .. code-block:: bash
 
-          sudo systemctl start cascaded
+          sudo systemctl start cascade
 
        You can also configure Cascade to start at boot:
 
        .. code-block:: bash
 
-          sudo systemctl enable cascaded
+          sudo systemctl enable cascade
 
        You can check the status of Cascade with:
 
        .. code-block:: bash 
 
-          sudo systemctl status cascaded
+          sudo systemctl status cascade
 
        You can view the logs with: 
 
        .. code-block:: bash
 
-          sudo journalctl --unit=cascaded
+          sudo journalctl --unit=cascade
 
    .. group-tab:: Docker
 
@@ -277,7 +277,7 @@ Updating
 
    .. code-block:: bash
 
-      sudo systemctl stop cascaded.service
+      sudo systemctl stop cascade.service
 
    Or by killing the Cascade daemon process otherwise:
 

doc/manual/source/nethsm.rst

@@ -317,7 +317,7 @@ Start the Cascade daemon:
 
 .. code-block:: bash
 
-   # systemctl start cascaded
+   # systemctl start cascade
    # cascade policy reload
    Policies reloaded:
    - nethsm added

doc/manual/source/quick-start.rst

@@ -46,12 +46,12 @@ systemd features should be used instead.
         To support binding to privileged ports without requiring elevated
         privileges Cascade supports the systemd `socket activation feature <https://www.freedesktop.org/software/systemd/man/latest/systemd.socket.html#>`_.
         To use this you will need to create a ``socket`` unit. An example
-        ``cascaded.socket`` unit might look as follows:
+        ``cascade.socket`` unit might look as follows:
 
         .. code-block::
 
           [Unit]
-          Description=Cascaded Sockets
+          Description=Cascade Sockets
 
           [Socket]
           # To prevent listening on localhost replace 127.0.0.1:53 with a
@@ -72,15 +72,15 @@ systemd features should be used instead.
         .. code-block::
 
            [Unit]
-           Requires=cascaded.socket
+           Requires=cascade.socket
 
         To start Cascade use the following command: (you may need elevated
         privileges to run this command, e.g. run it as ``root`` or use a
         command such as ``sudo``)
 
         .. code-block::
 
-           systemctl start cascaded
+           systemctl start cascade
 
    .. group-tab:: Without systemd
 

doc/manual/source/smartcard-hsm.rst

@@ -120,7 +120,7 @@ Start the Cascade daemon:
 
 .. code-block:: bash
 
-   # systemctl start cascaded
+   # systemctl start cascade
    # cascade policy reload
    Policies reloaded:
    - smartcard added

doc/manual/source/softhsm.rst

@@ -53,7 +53,7 @@ Start the Cascade daemon:
 
 .. code-block:: bash
 
-   # systemctl start cascaded
+   # systemctl start cascade
    # cascade policy reload
 
 Configure a HSM in Cascade called ``cascade-hsm-bridge`` that will connect to

pkg/common/service.preset

@@ -1 +1 @@
-disable cascaded.service
+disable cascade.service

pkg/rpm/scriptlets.toml

@@ -20,7 +20,7 @@ if [ $1 -eq 1 ] ; then
     mkdir -p /etc/cascade/policies
 
     # Run commands equivalent to what the RPM systemd macros would do
-    systemd_post cascaded.service
+    systemd_post cascade.service
     systemd_triggers
 fi
 '''
@@ -32,7 +32,7 @@ pre_uninstall_script = '''
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     # Run commands equivalent to what the RPM systemd macros would do
-    systemd_preun cascaded.service
+    systemd_preun cascade.service
     systemd_triggers
 fi
 '''
@@ -43,7 +43,7 @@ post_uninstall_script = '''
 
 if [ $1 -ge 1 ] ; then
     # Run commands equivalent to what the RPM systemd macros would do
-    systemd_postun_with_restart cascaded.service
+    systemd_postun_with_restart cascade.service
     systemd_triggers
 
     # TODO: Remove the user account and home dir?

pkg/rules/packages-to-build.yml

@@ -27,15 +27,15 @@ test-image:
 extra_build_args: '--config env.CASCADE_SKIP_VERSION_COMMIT="1"'
 include:
   - image: 'almalinux:9'
-    systemd_service_unit_file: pkg/common/cascaded.s*
+    systemd_service_unit_file: pkg/common/cascade.s*
     rpm_rpmlint_check_filters: bad-manual-page-folder
 
   - image: 'almalinux:8'
-    systemd_service_unit_file: pkg/common/cascaded.s*
+    systemd_service_unit_file: pkg/common/cascade.s*
     rpm_rpmlint_check_filters: bad-manual-page-folder
 
   - image: 'almalinux:10'
-    systemd_service_unit_file: pkg/common/cascaded.s*
+    systemd_service_unit_file: pkg/common/cascade.s*
     rpm_rpmlint_check_filters: bad-manual-page-folder
 
 # 'mode' is not used by the package building workflow job, but is used by the package testing workflow job.

pkg/test-scripts/test-cascade.sh

@@ -17,31 +17,31 @@ case $1 in
     echo -e "\nCASCADED CONF:"
     cat /etc/cascade/config.toml
 
-    echo -e "\nCASCADED SERVICE STATUS:"
-    systemctl status cascaded || true
+    echo -e "\nCASCADE SERVICE STATUS:"
+    systemctl status cascade || true
 
     echo -e "\nCASCADE MAN PAGE (first 20 lines only):"
     man -P cat cascade | head -n 20 || true
 
     echo -e "\nCASCADED MAN PAGE (first 20 lines only):"
     man -P cat cascaded | head -n 20 || true
 
-    echo -e "\nCASCADED SERVICE SHOULD BE STOPPED BY DEFAULT:"
-    if systemctl is-active cascaded; then
-      echo "Systemd 'cascaded' service is unexpectedly active"
+    echo -e "\nCASCADE SERVICE SHOULD BE STOPPED BY DEFAULT:"
+    if systemctl is-active cascade; then
+      echo "Systemd 'cascade' service is unexpectedly active"
       exit 1
     fi
 
     echo -e "\nTEST SYSTEMD SERVICE STARTUP:"
-    systemctl start cascaded
+    systemctl start cascade
 
     # Give it time to start
     sleep 3s
 
     # Dump the status
-    systemctl status cascaded
+    systemctl status cascade
 
     # Check that the service is active
-    systemctl is-active cascaded
+    systemctl is-active cascade
     ;;
 esac