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

Jump to bottom

Fixes #21361: unescaped percent in specfile #2637

Merged
merged 1 commit into from
Jul 5, 2022
Merged

Fixes #21361: unescaped percent in specfile #2637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions rudder-agent/SPECS/rudder-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,25 +480,25 @@ set -e
# Keep a backup copy of uuid.hive
if [ -f /opt/rudder/etc/uuid.hive ]; then
mkdir -p /var/backups/rudder
cp -f /opt/rudder/etc/uuid.hive /var/backups/rudder/uuid.hive-$(date +%Y%m%d)
cp -f /opt/rudder/etc/uuid.hive /var/backups/rudder/uuid.hive-$(date +%%Y%%m%%d)
fi

# Keep a backup copy of policy_server.dat
if [ -f /var/rudder/cfengine-community/policy_server.dat ]; then
mkdir -p /var/backups/rudder
cp -f /var/rudder/cfengine-community/policy_server.dat /var/backups/rudder/policy_server.dat-$(date +%Y%m%d)
cp -f /var/rudder/cfengine-community/policy_server.dat /var/backups/rudder/policy_server.dat-$(date +%%Y%%m%%d)
fi

# Keep a backup copy of ppkeys
if [ -d /var/rudder/cfengine-community/ppkeys/ ]; then
mkdir -p /var/backups/rudder
cp -rf /var/rudder/cfengine-community/ppkeys/ /var/backups/rudder/ppkeys-$(date +%Y%m%d)
cp -rf /var/rudder/cfengine-community/ppkeys/ /var/backups/rudder/ppkeys-$(date +%%Y%%m%%d)
fi

# Keep a backup copy of agent certificate
if [ -f /opt/rudder/etc/ssl/agent.cert ]; then
mkdir -p /var/backups/rudder
cp -f /opt/rudder/etc/ssl/agent.cert /var/backups/rudder/agent.cert-$(date +%Y%m%d)
cp -f /opt/rudder/etc/ssl/agent.cert /var/backups/rudder/agent.cert-$(date +%%Y%%m%%d)
fi

echo "INFO: A backup copy of Rudder agent credentials and id has been done in /var/backups/rudder"
Expand Down
2 changes: 1 addition & 1 deletion rudder-relay/SPECS/rudder-relay.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ cd rudder-sources-*/rudder/relay/sources/

%if 0%{?suse_version}
# On SLES, change the Apache DocumentRoot to the OS default
sed -i "s%^DocumentRoot /var/www$%DocumentRoot /srv/www%" apache/rudder-apache-relay-common.conf
sed -i "s|^DocumentRoot /var/www$|DocumentRoot /srv/www|" apache/rudder-apache-relay-common.conf
%endif

%if 0%{?rhel} == 7
Expand Down
6 changes: 3 additions & 3 deletions rudder-server/SPECS/rudder-server.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#####################################################################################
%#####################################################################################
# Copyright 2011- Normation SAS
#####################################################################################
#
Expand Down Expand Up @@ -280,7 +280,7 @@ fi
if [ -f /etc/sysconfig/apache2 ] && grep -q 'APACHE_MODULES="${APACHE_MODULES} rewrite dav dav_fs proxy proxy_http' /etc/sysconfig/apache2
then
echo "INFO: Upgrading the /etc/sysconfig/apache2 file, Rudder needed modules for Apache are now listed in /etc/sysconfig/rudder-webapp-apache"
sed -i 's%APACHE_MODULES="${APACHE_MODULES} rewrite dav dav_fs proxy proxy_http.*%# This sources the Rudder needed by Rudder\n. /etc/sysconfig/rudder-webapp-apache%' /etc/sysconfig/apache2
sed -i 's|APACHE_MODULES="${APACHE_MODULES} rewrite dav dav_fs proxy proxy_http.*|# This sources the Rudder needed by Rudder\n. /etc/sysconfig/rudder-webapp-apache|' /etc/sysconfig/apache2
fi

if ! /opt/rudder/share/package-scripts/rudder-server-postinst "${RUDDER_FIRST_INSTALL}" "%{apache}" "${DB_NOT_INITIALIZED}"; then
Expand All @@ -294,7 +294,7 @@ if ! /opt/rudder/share/package-scripts/rudder-server-postinst "${RUDDER_FIRST_IN
echo " Such errors should not happen, please open an issue for this problem on "
echo " https://issues.rudder.io/projects/rudder/issues/new"
echo "**************************************************************************************"
LOG_FILE="/var/log/rudder/install/rudder-webapp-fail-$(date +%Y%m%d%H%M%S).log"
LOG_FILE="/var/log/rudder/install/rudder-webapp-fail-$(date +%%Y%%m%%d%%H%%M%%S).log"
/opt/rudder/bin/rudder-fix-repository-permissions >> ${LOG_FILE}
fi

Expand Down