Project

General

Profile

« Previous | Next » 

Revision 0463cc4a

Added by Benoît PECCATTE about 6 years ago

Fixes #6758: rudder-webapp upgrade doesn't commit updates to ncf hooks

View differences:

rudder-webapp/SPECS/rudder-webapp.spec
find %{ruddervardir}/configuration-repository/.git %{ruddervardir}/configuration-repository/ncf %{ruddervardir}/configuration-repository/techniques -type d -exec chmod g+s "{}" \;
## Add execution permission for ncf-api on pre/post-hooks
chmod -R 2750 %{ruddervardir}/configuration-repository/ncf/ncf-hooks.d/
chmod -R 2750 %{ruddervardir}/configuration-repository/ncf/ncf-hooks.d
cd %{ruddervardir}/configuration-repository/ncf/
git add ncf-hooks.d
git commit --allow-empty --message "Add ncf hooks to repository"
# Create a symlink to the Jetty context if necessary
if [ -d "%{rudderdir}/jetty7/contexts" ]; then
rudder-webapp/debian/postinst
find /var/rudder/configuration-repository/.git /var/rudder/configuration-repository/ncf /var/rudder/configuration-repository/techniques -type d -exec chmod g+s "{}" \;
## Add execution permission for ncf-api on pre/post-hooks
chmod -R 2750 /var/rudder/configuration-repository/ncf/ncf-hooks.d/
chmod -R 2750 %{ruddervardir}/configuration-repository/ncf/ncf-hooks.d
cd %{ruddervardir}/configuration-repository/ncf/
git add ncf-hooks.d
git commit --allow-empty --message "Add ncf hooks to repository"
RUDDER_WEB_PROPERTIES="/opt/rudder/etc/rudder-web.properties"
# Only for Ubuntu:
## Change rsyslog port number since Ubuntu 12.04 doesn't allow to use standard
## rsyslog port number (https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/789174)
CHECK_DIST=`/usr/bin/lsb_release -is`
CHECK_UBUNTU_VERSION=`/usr/bin/lsb_release -rs | cut -d. -f1`
CHECK_RSYSLOG_PORT=`grep -E "^rudder.syslog.port\s*=\s*[0-9]+\s*$" /opt/rudder/etc/rudder-web.properties | cut -d "=" -f2`
if [ "z${CHECK_DIST}" = "zUbuntu" -a ${CHECK_UBUNTU_VERSION} -ge 12 -a ${CHECK_RSYSLOG_PORT} -lt 1024 ]; then
echo "INFO: Since Ubuntu 12.04, rsyslog port number used by Rudder needs to be >1024"
sed -i "s/^rudder.syslog.port\w*=.*$/rudder.syslog.port=5514/" "${RUDDER_WEB_PROPERTIES}"
echo "INFO: rsyslog port number changed to 5514"
fi
# Only for Ubuntu:
## Change rsyslog port number since Ubuntu 12.04 doesn't allow to use standard
## rsyslog port number (https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/789174)
CHECK_DIST=`/usr/bin/lsb_release -is`
CHECK_UBUNTU_VERSION=`/usr/bin/lsb_release -rs | cut -d. -f1`
CHECK_RSYSLOG_PORT=`grep -E "^rudder.syslog.port\s*=\s*[0-9]+\s*$" /opt/rudder/etc/rudder-web.properties | cut -d "=" -f2`
if [ "z${CHECK_DIST}" = "zUbuntu" -a ${CHECK_UBUNTU_VERSION} -ge 12 -a ${CHECK_RSYSLOG_PORT} -lt 1024 ]; then
echo "INFO: Since Ubuntu 12.04, rsyslog port number used by Rudder needs to be >1024"
sed -i "s/^rudder.syslog.port\w*=.*$/rudder.syslog.port=5514/" "${RUDDER_WEB_PROPERTIES}"
echo "INFO: rsyslog port number changed to 5514"
fi
# Create a symlink to the Jetty context if necessary
if [ -d "/opt/rudder/jetty7/contexts" ]; then

Also available in: Unified diff