Rev to 2.1.7

hubblestack · Apr 7, 2017 · 93f1f83 · 93f1f83
1 parent 8c718f1
commit 93f1f83
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 24 deletions.
diff --git a/hubblestack/__init__.py b/hubblestack/__init__.py
@@ -1 +1 @@
-__version__ = '2.1.6'
+__version__ = '2.1.7'
diff --git a/pkg/build_debs.sh b/pkg/build_debs.sh
@@ -22,14 +22,14 @@ mkdir -p dist
 bash ./init_pkg.sh -y
 cp ../hubble.tar.gz dist/hubble.tar.gz
 mv ../hubble.tar.gz build/hubble.tar.gz
-mkdir build/hubblestack-2.1.6
-tar -xzvf build/hubble.tar.gz -C build/hubblestack-2.1.6
-mkdir -p build/hubblestack-2.1.6/etc/init.d
-cp ./hubble build/hubblestack-2.1.6/etc/init.d
-mkdir -p build/hubblestack-2.1.6/usr/lib/systemd/system
-cp ./hubble.service build/hubblestack-2.1.6/usr/lib/systemd/system
-cp -f ../conf/hubble build/hubblestack-2.1.6/etc/hubble/hubble
-cd build/hubblestack-2.1.6
+mkdir build/hubblestack-2.1.7
+tar -xzvf build/hubble.tar.gz -C build/hubblestack-2.1.7
+mkdir -p build/hubblestack-2.1.7/etc/init.d
+cp ./hubble build/hubblestack-2.1.7/etc/init.d
+mkdir -p build/hubblestack-2.1.7/usr/lib/systemd/system
+cp ./hubble.service build/hubblestack-2.1.7/usr/lib/systemd/system
+cp -f ../conf/hubble build/hubblestack-2.1.7/etc/hubble/hubble
+cd build/hubblestack-2.1.7
 
 sudo apt-get install -y ruby ruby-dev rubygems gcc make
 sudo gem install --no-ri --no-rdoc fpm
@@ -39,9 +39,9 @@ ln -s /opt/osquery/osqueryd usr/bin/osqueryd
 ln -s /opt/osquery/osqueryi usr/bin/osqueryi
 fpm -s dir -t deb \
     -n hubblestack \
-    -v 2.1.6-1 \
+    -v 2.1.7-1 \
     -d 'git' \
     --config-files /etc/hubble/hubble --config-files /etc/osquery/osquery.conf \
     --deb-no-default-config-files \
     etc/hubble etc/osquery etc/init.d opt usr/bin
-cp hubblestack_2.1.6-1_amd64.deb ../../dist/
+cp hubblestack_2.1.7-1_amd64.deb ../../dist/
diff --git a/pkg/build_rpms.sh b/pkg/build_rpms.sh
@@ -22,23 +22,23 @@ mkdir -p dist
 bash ./init_pkg.sh -y
 cp ../hubble.tar.gz dist/hubble.tar.gz
 mv ../hubble.tar.gz build/hubble.tar.gz
-mkdir build/hubblestack-2.1.6
-tar -xzvf build/hubble.tar.gz -C build/hubblestack-2.1.6
-mkdir -p build/hubblestack-2.1.6/etc/init.d
-cp ./hubble build/hubblestack-2.1.6/etc/init.d
-mkdir -p build/hubblestack-2.1.6/usr/lib/systemd/system
-cp ./hubble.service build/hubblestack-2.1.6/usr/lib/systemd/system
-cp -f ../conf/hubble build/hubblestack-2.1.6/etc/hubble/hubble
+mkdir build/hubblestack-2.1.7
+tar -xzvf build/hubble.tar.gz -C build/hubblestack-2.1.7
+mkdir -p build/hubblestack-2.1.7/etc/init.d
+cp ./hubble build/hubblestack-2.1.7/etc/init.d
+mkdir -p build/hubblestack-2.1.7/usr/lib/systemd/system
+cp ./hubble.service build/hubblestack-2.1.7/usr/lib/systemd/system
+cp -f ../conf/hubble build/hubblestack-2.1.7/etc/hubble/hubble
 cd build
-tar -czvf hubblestack-2.1.6.tar.gz hubblestack-2.1.6/
+tar -czvf hubblestack-2.1.7.tar.gz hubblestack-2.1.7/
 mkdir -p rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS,tmp}
 
-cp hubblestack-2.1.6.tar.gz rpmbuild/SOURCES/
+cp hubblestack-2.1.7.tar.gz rpmbuild/SOURCES/
 cd rpmbuild
 
 cp ../../specs/* SPECS/
 
 rpmbuild --define "_topdir $(pwd)" --define "_tmppath %{_topdir}/tmp" -ba SPECS/hubblestack-el6.spec
-cp RPMS/x86_64/hubblestack-2.1.6-1.x86_64.rpm ../../dist/hubblestack-2.1.6-1.el6.x86_64.rpm
+cp RPMS/x86_64/hubblestack-2.1.7-1.x86_64.rpm ../../dist/hubblestack-2.1.7-1.el6.x86_64.rpm
 rpmbuild --define "_topdir $(pwd)" --define "_tmppath %{_topdir}/tmp" -ba SPECS/hubblestack-el7.spec
-cp RPMS/x86_64/hubblestack-2.1.6-1.x86_64.rpm ../../dist/hubblestack-2.1.6-1.el7.x86_64.rpm
+cp RPMS/x86_64/hubblestack-2.1.7-1.x86_64.rpm ../../dist/hubblestack-2.1.7-1.el7.x86_64.rpm
diff --git a/pkg/specs/hubblestack-el6.spec b/pkg/specs/hubblestack-el6.spec
@@ -9,7 +9,7 @@
 
 Summary: Hubblestack is a module, open-source security compliance framework
 Name: hubblestack
-Version: 2.1.6
+Version: 2.1.7
 Release: 1
 License: Apache 2.0
 Group: Development/Tools
@@ -54,6 +54,10 @@ rm -rf %{buildroot}
 /usr/bin/*
 
 %changelog
+* Fri Apr 7 2017  Colton Myers <[email protected]> 2.1.7-1
+- Force config and logs to 600 permissions to hide tokens
+- Splunk returners: Fix for hosts with misconfigured FQDN (no localhost IPs, please!)
+
 * Mon Apr 3 2017  Colton Myers <[email protected]> 2.1.6-1
 - Fix pulsar loading
 - Fix splay in scheduler

diff --git a/pkg/specs/hubblestack-el7.spec b/pkg/specs/hubblestack-el7.spec
@@ -9,7 +9,7 @@
 
 Summary: Hubblestack is a module, open-source security compliance framework
 Name: hubblestack
-Version: 2.1.6
+Version: 2.1.7
 Release: 1
 License: Apache 2.0
 Group: Development/Tools
@@ -54,6 +54,10 @@ rm -rf %{buildroot}
 /usr/lib/*
 
 %changelog
+* Fri Apr 7 2017  Colton Myers <[email protected]> 2.1.7-1
+- Force config and logs to 600 permissions to hide tokens
+- Splunk returners: Fix for hosts with misconfigured FQDN (no localhost IPs, please!)
+
 * Mon Apr 3 2017  Colton Myers <[email protected]> 2.1.6-1
 - Fix pulsar loading
 - Fix splay in scheduler