Skip to content

Commit

Permalink
Rename systemd startup script
Browse files Browse the repository at this point in the history
Signed-off-by: Heinz N. Gies <heinz@licenser.net>
  • Loading branch information
Licenser committed Mar 3, 2021
1 parent 565dffc commit 73349b3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 64 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ assets = [
["packaging/distribution/etc/tremor/config/*", "/etc/tremor/config/", "644"], # TODO enable this after some example cleanup
#["demo/examples/*", "/etc/tremor/config/examples/", "644"],
# TODO ideally, we should need to copy only the root tremor-script/lib directory
["packaging/distribution/usr/lib/tremor/tremor.service", "/usr/lib/tremor/", "755"],
["packaging/distribution/usr/lib/tremor/tremor.sh", "/usr/lib/tremor/", "755"],
["tremor-script/lib/*", "/usr/lib/tremor/tremor-script/", "644"],
["tremor-script/lib/std/*", "/usr/lib/tremor/tremor-script/std/", "644"],
["tremor-script/lib/tremor/*", "/usr/lib/tremor/tremor-script/tremor/", "644"], # copying systemd service to standard location for debian packages
Expand Down Expand Up @@ -185,7 +185,7 @@ tremor = {path = "/usr/bin/tremor"}
"../packaging/distribution/etc/tremor/" = {path = "/etc/tremor/"}
# TODO enable this after some example cleanup
#"../demo/examples/" = { path = "/etc/tremor/config/examples/" }
"../packaging/distribution/usr/lib/tremor/tremor.service" = {path = "/usr/lib/tremor/tremor.service", mode = "755"}
"../packaging/distribution/usr/lib/tremor/tremor.sh" = {path = "/usr/lib/tremor/tremor.sh", mode = "755"}
"../tremor-script/lib/" = {path = "/usr/lib/tremor/tremor-script/"}
# copying systemd service to standard location for rpm packages
"../packaging/distribution/etc/systemd/system/tremor.service" = {path = "/usr/lib/systemd/system/tremor.service"}
2 changes: 1 addition & 1 deletion packaging/distribution/etc/systemd/system/tremor.service
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Requires=network-online.target
[Service]
User=tremor
Group=tremor
ExecStart=/usr/lib/tremor/tremor.service
ExecStart=/usr/lib/tremor/tremor.sh
Restart=always
SyslogIdentifier=tremor

Expand Down
60 changes: 0 additions & 60 deletions packaging/distribution/usr/lib/tremor/tremor.service

This file was deleted.

2 changes: 1 addition & 1 deletion packaging/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function package_archive {
# TREMOR_PATH needs to be set to wherever this folder gets extracted to
mkdir -p "${temp_archive_dir}/lib/tremor"
cp -vR "${ROOT_DIR}/tremor-script/lib/" "${temp_archive_dir}/lib/tremor/tremor-script/"
cp -vR "${ROOT_DIR}/packaging/distribution/usr/lib/tremor/tremor.service" "${temp_archive_dir}/lib/tremor/tremor.service"
cp -vR "${ROOT_DIR}/packaging/distribution/usr/lib/tremor/tremor.sh" "${temp_archive_dir}/lib/tremor/tremor.sh"

echo "Creating archive file: ${archive_file}"
tar czf $archive_file -C "$TARGET_BUILD_DIR" "$archive_name"
Expand Down

0 comments on commit 73349b3

Please sign in to comment.