Remove td-agent-ruby.conf (#529)

It was used for prelink. We don't use it since 66116d5. Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
fluent · Jul 18, 2023 · 4b595e0 · 4b595e0
1 parent 35aebdc
commit 4b595e0
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 6 deletions.
diff --git a/fluent-package/Rakefile b/fluent-package/Rakefile
@@ -482,7 +482,6 @@ class BuildTask
         configs = [fluentd_conf]
         configs.concat([
           "etc/logrotate.d/#{SERVICE_NAME}",
-          "opt/#{PACKAGE_DIR}/share/#{COMPAT_SERVICE_NAME}-ruby.conf",
           fluentd_conf_default,
         ]) unless windows? || macos?
         configs.each do |config|

diff --git a/fluent-package/apt/install-test.sh b/fluent-package/apt/install-test.sh
@@ -13,13 +13,11 @@ apt install -V -y \
 td-agent --version
 test -e /etc/logrotate.d/fluentd
 test -e /opt/fluent/share/td-agent.conf.tmpl
-test -e /opt/fluent/share/td-agent-ruby.conf
 
 apt remove -y fluent-package
 
 test -e /etc/logrotate.d/fluentd
 ! test -e /opt/fluent/share/td-agent.conf.tmpl
-! test -e /opt/fluent/share/td-agent-ruby.conf
 
 if ! getent passwd _fluentd >/dev/null; then
     echo "_fluentd user must be kept"

diff --git a/fluent-package/templates/opt/fluent/share/td-agent-ruby.conf b/fluent-package/templates/opt/fluent/share/td-agent-ruby.conf
diff --git a/fluent-package/yum/install-test.sh b/fluent-package/yum/install-test.sh
@@ -65,14 +65,12 @@ ${DNF} install -y \
 td-agent --version
 test -e /etc/logrotate.d/fluentd
 test -e /opt/fluent/share/td-agent.conf.tmpl
-test -e /opt/fluent/share/td-agent-ruby.conf
 
 echo "UNINSTALL TEST"
 ${DNF} remove -y fluent-package
 
 ! test -e /etc/logrotate.d/fluentd
 ! test -e /opt/fluent/share/td-agent.conf.tmpl
-! test -e /opt/fluent/share/td-agent-ruby.conf
 
 for conf_path in /etc/td-agent/td-agent.conf /etc/fluent/fluentd.conf; do
     if [ -e $conf_path ]; then