Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deb and rpm packages to create and assign permissions for /var/tempo #3657

Merged
merged 7 commits into from
May 8, 2024
Merged

Update deb and rpm packages to create and assign permissions for /var/tempo #3657

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
804e29d
test deb stuff
mdisibio May 8, 2024
6016fe2
more stuff
mdisibio May 8, 2024
0862529
create /var/tempo and assign perms
mdisibio May 8, 2024
d9641c3
Create and assign permissions of /var/tempo after creating user
mdisibio May 8, 2024
b711a47
More precise dir perms
mdisibio May 8, 2024
5289e41
whitespace
mdisibio May 8, 2024
8f78a5a
changelog
mdisibio May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tools/packaging/tempo-postinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ cleanInstall() {
adduser --system --shell /bin/false "tempo"
fi

# Create and assign permissions for default storage
mkdir /var/tempo
mdisibio marked this conversation as resolved.
Show resolved Hide resolved
chown tempo /var/tempo

# rhel/centos7 cannot use ExecStartPre=+ to specify the pre start should be run as root
# even if you want your service to run as non root.
if [ "${systemd_version}" -lt 231 ]; then
Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/verify-deb-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cat <<EOF | docker exec --interactive "${image}" sh
# Install tempo and check it's running
dpkg -i ${dir}/dist/tempo*_amd64.deb
[ "\$(systemctl is-active tempo)" = "active" ] || (echo "tempo is inactive" && exit 1)

# Wait for tempo to be ready. The script is cat-ed because it is passed to docker exec
apt update && apt install -y curl
$(cat ${dir}/tools/packaging/wait-for-ready.sh)
Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/verify-rpm-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cat <<EOF | docker exec --interactive "${image}" sh
# Import the Grafana GPG key
rpm --import https://packages.grafana.com/gpg.key

# Install loki and check it's running
# Install tempo and check it's running
rpm -i ${dir}/dist/tempo*_amd64.rpm
[ "\$(systemctl is-active tempo)" = "active" ] || (echo "tempo is inactive" && exit 1)

Expand Down
Loading