Fixes #11153: sysconfig/apache2 modifications get removed #1509
Conversation
| if ! grep -qE "^. /etc/sysconfig/rudder-relay-apache$" /etc/sysconfig/apache2; then | ||
| nextline=$(grep -A1 -E "^. /etc/sysconfig/rudder-relay-apache$" /etc/sysconfig/apache2 | tail -n1) | ||
| if [ "${nextline}" = "" ]; then | ||
| # No include currently | ||
| echo -e '# This sources the modules/defines needed by Rudder\n. /etc/sysconfig/rudder-relay-apache' >> /etc/sysconfig/apache2 |
There was a problem hiding this comment.
Why don' we do 2 lines instead of one for each echo ? this makes it completely unreadable
There was a problem hiding this comment.
echo -e '# This sources the modules/defines needed by Rudder' >> /etc/sysconfig/apache2
echo -e '. /etc/sysconfig/rudder-relay-apache' >> /etc/sysconfig/apache2
instead of
echo -e '# This sources the modules/defines needed by Rudder\n. /etc/sysconfig/rudder-relay-apache' >> /etc/sysconfig/apache2
| echo -e '# This line is necessary for fillup not to remove any lines above. See #11153\nAPACHE_RUDDER_RELAY_CUSTOMIZED="true"' >> /etc/sysconfig/apache2 | ||
| elif [ "${nextline}" != "# This line is necessary for fillup not to remove any lines above. See #11153" ]; then | ||
| # Old include without comment | ||
| sed -i 's|. /etc/sysconfig/rudder-relay-apache|. /etc/sysconfig/rudder-relay-apache\n# This line is necessary for fillup not to remove any lines above. See #11153\nAPACHE_RUDDER_RELAY_CUSTOMIZED="true"|' /etc/sysconfig/apache2 |
There was a problem hiding this comment.
Whye not the same echo as above ? and a complex sed ... because you need to have the line just below ?
There was a problem hiding this comment.
yes, we want to insert the line just after the Rudder include.and keep a consistent file across versions.
amousset
force-pushed
the
bug_11153/sysconfig_apache2_modifications_get_removed
branch
from
89683f6
to
3f0b905
Compare
|
PR rebased |
|
OK, merging this PR |
https://www.rudder-project.org/redmine/issues/11153