From 446c715404af8bcd965eb70d0940363ae8b97785 Mon Sep 17 00:00:00 2001 From: vimesa Date: Tue, 25 Jul 2023 08:45:11 +0100 Subject: [PATCH 1/7] Modify kafka.service in /etc/hosts --- resources/bin/rb_register_url.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/bin/rb_register_url.sh b/resources/bin/rb_register_url.sh index 50c79c2..4763563 100644 --- a/resources/bin/rb_register_url.sh +++ b/resources/bin/rb_register_url.sh @@ -119,6 +119,11 @@ sed -i '/kafka.service/d' /etc/hosts echo "127.0.0.1 kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" >> /etc/hosts #fi +if [ $TYPE -eq "ips" ] + sed -i '/kafka.service/d' /etc/hosts + [ "x$RBDOMAINIP" != "x" ] && echo "$RBDOMAINIP data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service kafka.service" >> /etc/hosts +fi + if [ $START -eq 1 ]; then if [ -f /etc/chef/client.pem ]; then systemctl status chef-client &>/dev/null From 06eb10f751f4ea3244081923197a5194b2529a32 Mon Sep 17 00:00:00 2001 From: vimesa Date: Wed, 26 Jul 2023 10:56:33 +0100 Subject: [PATCH 2/7] Modify Type --- resources/bin/rb_register_url.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/bin/rb_register_url.sh b/resources/bin/rb_register_url.sh index 4763563..af09754 100644 --- a/resources/bin/rb_register_url.sh +++ b/resources/bin/rb_register_url.sh @@ -119,7 +119,7 @@ sed -i '/kafka.service/d' /etc/hosts echo "127.0.0.1 kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" >> /etc/hosts #fi -if [ $TYPE -eq "ips" ] +if [ $TYPE == "ips" ] sed -i '/kafka.service/d' /etc/hosts [ "x$RBDOMAINIP" != "x" ] && echo "$RBDOMAINIP data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service kafka.service" >> /etc/hosts fi From 7d4b58f1642a034ee63add646cdcfb930defdc9c Mon Sep 17 00:00:00 2001 From: vimesa Date: Wed, 26 Jul 2023 11:41:33 +0100 Subject: [PATCH 3/7] Modify type ips --- resources/bin/rb_register_url.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/bin/rb_register_url.sh b/resources/bin/rb_register_url.sh index af09754..b108010 100644 --- a/resources/bin/rb_register_url.sh +++ b/resources/bin/rb_register_url.sh @@ -119,7 +119,8 @@ sed -i '/kafka.service/d' /etc/hosts echo "127.0.0.1 kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" >> /etc/hosts #fi -if [ $TYPE == "ips" ] +if [ $TYPE == "ips" ]; then +echo "Configuring IPS..." sed -i '/kafka.service/d' /etc/hosts [ "x$RBDOMAINIP" != "x" ] && echo "$RBDOMAINIP data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service kafka.service" >> /etc/hosts fi From 51c7fe076c7ea38832709a6d58ad5348a47ce7a0 Mon Sep 17 00:00:00 2001 From: vimesa Date: Wed, 26 Jul 2023 11:52:52 +0100 Subject: [PATCH 4/7] Modify hosts --- resources/bin/rb_register_url.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/bin/rb_register_url.sh b/resources/bin/rb_register_url.sh index b108010..15ecef6 100644 --- a/resources/bin/rb_register_url.sh +++ b/resources/bin/rb_register_url.sh @@ -113,16 +113,21 @@ fi sed -i '/data.redborder.cluster/d' /etc/hosts sed -i '/rbookshelf.s3.redborder.cluster/d' /etc/hosts -[ "x$RBDOMAINIP" != "x" ] && echo "$RBDOMAINIP data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service" >> /etc/hosts - sed -i '/kafka.service/d' /etc/hosts -echo "127.0.0.1 kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" >> /etc/hosts + #fi +if [ $TYPE == "proxy" ]; then + sed -i '/kafka.service/d' /etc/hosts + [ "x$RBDOMAINIP" != "x" ] && echo "$RBDOMAINIP data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service" >> /etc/hosts + echo "127.0.0.1 kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" >> /etc/hosts +fi + + if [ $TYPE == "ips" ]; then -echo "Configuring IPS..." sed -i '/kafka.service/d' /etc/hosts [ "x$RBDOMAINIP" != "x" ] && echo "$RBDOMAINIP data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service kafka.service" >> /etc/hosts + echo "127.0.0.1 kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" >> /etc/hosts fi if [ $START -eq 1 ]; then From c97fcdf1416b5c4bbafd0bbb43c73898d0fcd0cd Mon Sep 17 00:00:00 2001 From: vimesa Date: Wed, 26 Jul 2023 12:27:49 +0100 Subject: [PATCH 5/7] Modify ips/proxy type --- resources/bin/rb_register_url.sh | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/resources/bin/rb_register_url.sh b/resources/bin/rb_register_url.sh index 15ecef6..8fe3f5e 100644 --- a/resources/bin/rb_register_url.sh +++ b/resources/bin/rb_register_url.sh @@ -117,18 +117,23 @@ sed -i '/kafka.service/d' /etc/hosts #fi -if [ $TYPE == "proxy" ]; then - sed -i '/kafka.service/d' /etc/hosts - [ "x$RBDOMAINIP" != "x" ] && echo "$RBDOMAINIP data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service" >> /etc/hosts - echo "127.0.0.1 kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" >> /etc/hosts -fi - - -if [ $TYPE == "ips" ]; then - sed -i '/kafka.service/d' /etc/hosts - [ "x$RBDOMAINIP" != "x" ] && echo "$RBDOMAINIP data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service kafka.service" >> /etc/hosts - echo "127.0.0.1 kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" >> /etc/hosts -fi +case $TYPE in + "proxy") + SERVICES_LOCAL = "kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" + SERVICES_GLOBAL = "data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service" + ;; + "ips") + SERVICES_LOCAL = "zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" + SERVICES_GLOBAL = "data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service kafka.service" + ;; + *) + echo "Tipo desconocido: $TYPE" + exit 1 + ;; +esac + +[ "x$RBDOMAINIP" != "x" ] && echo "$RBDOMAINIP $SERVICES_GLOBAL" >> /etc/hosts +echo "127.0.0.1 $SERVICES_LOCAL" >> /etc/hosts if [ $START -eq 1 ]; then if [ -f /etc/chef/client.pem ]; then From 5b44818d37821b205781c0faea53053f9f093af5 Mon Sep 17 00:00:00 2001 From: vimesa Date: Wed, 26 Jul 2023 12:37:12 +0100 Subject: [PATCH 6/7] Modify variables --- resources/bin/rb_register_url.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/bin/rb_register_url.sh b/resources/bin/rb_register_url.sh index 8fe3f5e..69467b2 100644 --- a/resources/bin/rb_register_url.sh +++ b/resources/bin/rb_register_url.sh @@ -119,12 +119,12 @@ sed -i '/kafka.service/d' /etc/hosts case $TYPE in "proxy") - SERVICES_LOCAL = "kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" - SERVICES_GLOBAL = "data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service" + SERVICES_LOCAL="kafka.service zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" + SERVICES_GLOBAL="data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service" ;; "ips") - SERVICES_LOCAL = "zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" - SERVICES_GLOBAL = "data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service kafka.service" + SERVICES_LOCAL="zookeeper.service f2k.service logstash.service freeradius.service n2klocd.service rb-ale.service rb-nmsp.service rsyslog.service" + SERVICES_GLOBAL="data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service kafka.service" ;; *) echo "Tipo desconocido: $TYPE" From 726c992ed7b02680fc2537e960c1d5e432dd57c8 Mon Sep 17 00:00:00 2001 From: vimesa Date: Tue, 1 Aug 2023 08:55:01 +0100 Subject: [PATCH 7/7] Modify register url --- resources/bin/rb_register_url.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/bin/rb_register_url.sh b/resources/bin/rb_register_url.sh index 69467b2..c61eaf7 100644 --- a/resources/bin/rb_register_url.sh +++ b/resources/bin/rb_register_url.sh @@ -127,7 +127,7 @@ case $TYPE in SERVICES_GLOBAL="data.redborder.cluster rbookshelf.s3.redborder.cluster redborder.cluster s3.service erchef.service http2k.service webui.service kafka.service" ;; *) - echo "Tipo desconocido: $TYPE" + echo "Unknown type: $TYPE" exit 1 ;; esac