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.

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

Fixes #21093: rudder-server-relay must be renamed rudder-relay in rudder repo #4268

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions relay/sources/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ target/man/rudder-relayd.1.gz:

CACHE=cache() { [ -x ../../../../../build-caching ] && ../../../../../build-caching "$$@"; [ -x ../../../../../../build-caching ] && ../../../../../../build-caching "$$@" ; } ; cache
build: man rudder-pkg/rudder_plugins_key.pub autocomplete/rudder-pkg.sh
# Build relayd
# Build relayd
mkdir -p ../../../../../.cargo/ relayd/target/
$(CACHE) get ../../../../../.cargo/ name=cargo major=$(RUDDER_MAJOR_VERSION) || true
$(CACHE) get relayd/target/ --with-env name=relayd major=$(RUDDER_MAJOR_VERSION) || true
Expand Down Expand Up @@ -107,15 +107,15 @@ install: build

# Install man pages
install -m 644 target/man/rudder-relayd.1.gz $(DESTDIR)/opt/rudder/share/man/man1/

# rudder packaging
install -m 755 rudder-pkg/rudder-pkg $(DESTDIR)/opt/rudder/share/commands/package
ln -ns ../share/commands/package $(DESTDIR)/opt/rudder/bin/rudder-pkg
install -m 755 rudder-pkg/rudder-pkg.conf $(DESTDIR)/opt/rudder/etc/rudder-pkg/rudder-pkg.conf
install -m 755 rudder-pkg/rudder_plugins_key.pub $(DESTDIR)/opt/rudder/etc/rudder-pkg/rudder_plugins_key.pub
install -m 644 autocomplete/rudder-pkg.sh $(DESTDIR)/etc/bash_completion.d/
cp -r rudder-pkg/lib/* $(DESTDIR)/opt/rudder/share/python/

# Apache
install -m 644 apache/rudder-vhost.conf $(DESTDIR)/etc/$(APACHE_VHOSTDIR)/rudder.conf
install -m 644 apache/rudder-apache-relay-common.conf $(DESTDIR)/opt/rudder/etc/rudder-apache-relay-common.conf
Expand All @@ -126,14 +126,14 @@ install: build
install -m 644 openssl.cnf $(DESTDIR)/opt/rudder/etc/ssl/openssl.cnf
install -m 644 rudder-relay-apache $(DESTDIR)/etc/sysconfig/rudder-relay-apache
install -m 644 rudder-relay.sudo $(DESTDIR)/etc/sudoers.d/rudder-relay

# Copy stub rudder-networks*.conf
install -m 644 apache/rudder-networks-24.conf $(DESTDIR)/opt/rudder/etc/
install -m 644 apache/rudder-networks-policy-server-24.conf $(DESTDIR)/opt/rudder/etc/
install -m 755 rudder-server-relay-postinst $(DESTDIR)/opt/rudder/share/package-scripts/
install -m 755 rudder-server-relay-prerm $(DESTDIR)/opt/rudder/share/package-scripts/

install -m 755 rudder-relay-postinst $(DESTDIR)/opt/rudder/share/package-scripts/
install -m 755 rudder-relay-prerm $(DESTDIR)/opt/rudder/share/package-scripts/

ifeq ($(SELINUX),true)
# Install SELinux policy
install -m 644 selinux/rudder-relay.pp $(DESTDIR)/opt/rudder/share/selinux/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ APACHE_VHOSTDIR="$5"
SELINUX="$6"

BACKUP_DIR="/var/backups/rudder/"
LOG_FILE="/var/log/rudder/install/rudder-server-relay-$(date +%Y%m%d%H%M%S).log"
LOG_FILE="/var/log/rudder/install/rudder-relay-$(date +%Y%m%d%H%M%S).log"

echo "$(date) - Starting rudder-server-relay post installation script" >> ${LOG_FILE}
echo "$(date) - Starting rudder-relay post installation script" >> ${LOG_FILE}

# Create groups ans users before managing the services
if ! getent group rudder > /dev/null; then
Expand Down Expand Up @@ -144,4 +144,4 @@ fi
systemctl start rudder-relayd >> ${LOG_FILE}
systemctl start "${APACHE}" >> ${LOG_FILE}

echo "$(date) - Ending rudder-server-relay post installation script" >> ${LOG_FILE}
echo "$(date) - Ending rudder-relay post installation script" >> ${LOG_FILE}