Small fix for packaging

perfsonar · Oct 24, 2023 · 069307c · 069307c
1 parent b7e2e17
commit 069307c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/perfsonar-logstash/perfsonar-logstash/pipeline_etc/logstash_sysconfig b/perfsonar-logstash/perfsonar-logstash/pipeline_etc/logstash_sysconfig
diff --git a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.install b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.install
@@ -2,5 +2,4 @@ pipeline/* /usr/lib/perfsonar/logstash/pipeline/
 prometheus_pipeline/* /usr/lib/perfsonar/logstash/prometheus_pipeline/
 scripts/* /usr/lib/perfsonar/logstash/scripts/
 ruby/* /usr/lib/perfsonar/logstash/ruby/
-java/* /usr/lib/perfsonar/logstash/java/
-pipeline_etc/logstash_sysconfig /etc/perfsonar/logstash/
+java/* /usr/lib/perfsonar/logstash/java/
diff --git a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec
@@ -70,7 +70,6 @@ fi
 %config(noreplace) %{pipeline_base}/01-inputs.conf
 %config(noreplace) %{pipeline_base}/99-outputs.conf
 %config(noreplace) %{prometheus_base}/99-outputs.conf
-%config(noreplace) %{config_base}/logstash_sysconfig
 %config(noreplace) %{_sysconfdir}/systemd/system/logstash.service.d/*
 %attr(0755, perfsonar, perfsonar) %{scripts_base}/*
 #Use globs so don't dupicate config files above