From 74f0641e086d6bb7db2660c77eb1691831f1220b Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Wed, 8 May 2024 10:46:00 +0100 Subject: [PATCH 1/5] service name normalized to rhel9 --- resources/bin/rb_clean_zookeeper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/bin/rb_clean_zookeeper.sh b/resources/bin/rb_clean_zookeeper.sh index 45619f6..9495612 100644 --- a/resources/bin/rb_clean_zookeeper.sh +++ b/resources/bin/rb_clean_zookeeper.sh @@ -5,7 +5,7 @@ consumersdata=0 startservices=1 kafkaclean=0 ds_services_stop="chef-client f2k n2klocd redborder-monitor" -ds_services_start="zookeeper kafka k2http f2k rb-sociald rb-snmp nmspd n2klocd freeradius redborder-monitor chef-client sfacctd logstash rb-ale redborder-scanner" +ds_services_start="zookeeper kafka k2http f2k rb-sociald rb-snmp nmspd n2klocd freeradius redborder-monitor chef-client sfacctd logstash redborder-ale redborder-scanner" function usage() { echo "rb_clean_zookeeper.sh [-h][-f][-c][-l][-k]" From 1367463a6fa8a8fc65ab2f2b6d515de7f4c4260e Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Fri, 10 May 2024 11:01:42 +0100 Subject: [PATCH 2/5] add clean operation to makefile --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 099afc4..c994118 100644 --- a/Makefile +++ b/Makefile @@ -5,4 +5,7 @@ rpm: $(MAKE) -C packaging/rpm rpmtest: - $(MAKE) LATEST=`git stash create` -C packaging/rpm \ No newline at end of file + $(MAKE) LATEST=`git stash create` -C packaging/rpm + +clean: + rm -rf SOURCES pkgs \ No newline at end of file From d5257a11ef2b67456a5c829bd650e2db902c91a5 Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Fri, 10 May 2024 11:05:48 +0100 Subject: [PATCH 3/5] no change in origin. Is the previous merge --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 099afc4..c994118 100644 --- a/Makefile +++ b/Makefile @@ -5,4 +5,7 @@ rpm: $(MAKE) -C packaging/rpm rpmtest: - $(MAKE) LATEST=`git stash create` -C packaging/rpm \ No newline at end of file + $(MAKE) LATEST=`git stash create` -C packaging/rpm + +clean: + rm -rf SOURCES pkgs \ No newline at end of file From b1d3a97fac481f7fd37823f89983cc51ba320b80 Mon Sep 17 00:00:00 2001 From: nilsver Date: Fri, 17 May 2024 15:17:44 +0100 Subject: [PATCH 4/5] add redborder-ale --- VERSION | 2 +- packaging/rpm/redborder-proxy.spec | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d917d3e..0ea3a94 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.2 +0.2.0 diff --git a/packaging/rpm/redborder-proxy.spec b/packaging/rpm/redborder-proxy.spec index d7c4fe6..82a340f 100644 --- a/packaging/rpm/redborder-proxy.spec +++ b/packaging/rpm/redborder-proxy.spec @@ -70,6 +70,8 @@ update-alternatives --set java $(find /usr/lib/jvm/*java-1.8.0-openjdk* -name "j %doc %changelog +* Fri May 17 2024 Luis Blanco - 0.2.0-1 +- Integrate redborder-ale * Thu Dec 14 2023 Miguel Álvarez - 0.1.0-1 - Add cgroups * Tue Nov 21 2023 Vicente Mesa - 0.0.9-1 From 88515c21308baae4162fc39d9bf211eb19b0f61f Mon Sep 17 00:00:00 2001 From: nilsver <139124949+nilsver@users.noreply.github.com> Date: Fri, 17 May 2024 15:24:14 +0100 Subject: [PATCH 5/5] Update redborder-proxy.spec --- packaging/rpm/redborder-proxy.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/packaging/rpm/redborder-proxy.spec b/packaging/rpm/redborder-proxy.spec index 82a340f..d7c4fe6 100644 --- a/packaging/rpm/redborder-proxy.spec +++ b/packaging/rpm/redborder-proxy.spec @@ -70,8 +70,6 @@ update-alternatives --set java $(find /usr/lib/jvm/*java-1.8.0-openjdk* -name "j %doc %changelog -* Fri May 17 2024 Luis Blanco - 0.2.0-1 -- Integrate redborder-ale * Thu Dec 14 2023 Miguel Álvarez - 0.1.0-1 - Add cgroups * Tue Nov 21 2023 Vicente Mesa - 0.0.9-1