Skip to content
This repository has been archived by the owner on Apr 19, 2021. It is now read-only.

Commit

Permalink
pull request #3 from Wes Lambert
Browse files Browse the repository at this point in the history
  • Loading branch information
dougburks committed Feb 27, 2016
1 parent 7209f33 commit 9683282
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 0 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
@@ -1,3 +1,9 @@
securityonion-sostat (20120722-0ubuntu0securityonion52) trusty; urgency=medium

* pull request #3 from Wes Lambert

-- Doug Burks <doug.burks@gmail.com> Sat, 27 Feb 2016 11:01:28 -0500

securityonion-sostat (20120722-0ubuntu0securityonion51) trusty; urgency=medium

* improve time zone check
Expand Down
54 changes: 54 additions & 0 deletions debian/patches/pull-request-#3-from-Wes-Lambert
@@ -0,0 +1,54 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
securityonion-sostat (20120722-0ubuntu0securityonion52) trusty; urgency=medium
.
* pull request #3 from Wes Lambert
Author: Doug Burks <doug.burks@gmail.com>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- securityonion-sostat-20120722.orig/bin/sostat
+++ securityonion-sostat-20120722/bin/sostat
@@ -173,6 +173,14 @@ if [ -f /var/log/apt/history.log ]; then
tail /var/log/apt/history.log
fi

+if (!(/usr/lib/update-notifier/apt-check --human-readable | grep -c '0') > 1); then
+ echo
+ header "Available updates"
+ /usr/lib/update-notifier/apt-check --human-readable
+ echo
+ echo "Run 'sudo soup' to install the latest updates."
+fi
+
if [ -f /etc/nsm/securityonion.conf ] && source /etc/nsm/securityonion.conf && [ "$ELSA" = "YES" ]; then
echo
header "ELSA"
--- securityonion-sostat-20120722.orig/bin/soup
+++ securityonion-sostat-20120722/bin/soup
@@ -79,6 +79,9 @@ if [ $SKIP -ne 1 ]; then
echo "This script will automatically install all available updates"
echo "and remove any old kernels (keeping at least two kernels)."
echo ""
+ echo "For distributed deployments, please ensure this script is"
+ echo "run on the master server before updating sensors."
+ echo ""
echo "If mysql-server updates are available, it will stop sensor processes"
echo "to ensure a clean update."
echo ""
1 change: 1 addition & 0 deletions debian/patches/series
Expand Up @@ -45,3 +45,4 @@ sostat---add-note-regarding-ELSA-Index-Date-Range-and-log_size_limit
soup:-check-for-varrunreboot-required-#2
issues-848-and-858
improve-time-zone-check
pull-request-#3-from-Wes-Lambert

0 comments on commit 9683282

Please sign in to comment.