diff --git a/CHANGELOG.md b/CHANGELOG.md index c336705..961cbf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,8 @@ All notable changes to this project will be documented in this file. - Multiple bug fixing on recap. - Refactor of recaplog. - Fix plesk mysql bug. -- Install recaptool man page. -- Adding specific requirements for bash(>=4) and sysstat(>=9). -- Removing rpm spec requirements: elinks. -- Obsoletes and provides rs-sysmon. +- Include recaptool man page. +- RPM spec file specifics: modified to update requirements, obsoletes, provides rs-sysmon. - Better support for multiple mysql instances. - Makefile updated to allow multiple distros alignment and to include new man pages. - Adjust spec for Makefile. diff --git a/README.md b/README.md index ccfb3ef..39a5c47 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,14 @@ various information about the server. ## Dependencies * git - Installation * bc - arithmetic calculations -* elinks (or another cli web browser) - apache fullstatus * net-tools - netstat report * sysstat - provides 'iostat' for I/O statistics * iotop - simple top-like I/O monitor ## Installation 1. Install the required dependencies: - * Debian/Ubuntu - `apt-get install git bc elinks net-tools sysstat iotop` - * RHEL/CentOS - `yum install git bc elinks net-tools sysstat iotop` + * Debian/Ubuntu - `apt-get install bc gawk git iotop make net-tools psmisc sysstat` + * RHEL/CentOS - `yum install bc gawk git iotop make net-tools psmisc sysstat` 2. Clone this repository: `git clone https://github.com/rackerlabs/recap.git` 3. Change into the new directory: `cd recap` 4. Install the program: `make install` diff --git a/util/packaging/rpm/recap.spec b/util/packaging/rpm/recap.spec index a321d93..55008f2 100644 --- a/util/packaging/rpm/recap.spec +++ b/util/packaging/rpm/recap.spec @@ -55,20 +55,10 @@ make install-man %changelog * Mon May 15 2017 Tony Garcia - 1.0.0-1.rs -- Record point-in-time CPU. -- Multiple bug fixing on recaptool. -- Multiple bug fixing on recap. -- Refactor of recaplog. -- Fix plesk mysql bug. -- Install recaptool man page. -- Adding specific requirements for bash(>=4) and sysstat(>=9). -- Removing rpm spec requirements: elinks. +- Update to version 1.0.0 +- Include recaptool man page. +- Clean up requirements. - Obsoletes and provides rs-sysmon. -- Better support for multiple mysql instances. -- Makefile updated to allow multiple distros alignment and to include new man pages. -- Adjust spec for Makefile. -- Makefile now uses /usr/local as default for DESTDIR. -- fdisk warnings(stderr) are now included in the logs(stdin). * Wed May 11 2016 Ben Harper - 0.9.14-1.rs - Latest version diff --git a/util/recap-installer b/util/recap-installer deleted file mode 100755 index 83194d8..0000000 --- a/util/recap-installer +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash -# -# Package name: recapinstaller -# Author: Benjamin H. Graham -# -# Maintainer: Brent Oswald -# Benjamin Graham -# Simone Soldateschi -# -# License: GPL 2.0 -# -# Homepage: https://github.com/rackerlabs/recap/ -# -# Installer for Debian and MacOSX currently. -# - -#Name: recap -#Requires: sysstat, coreutils, procps, grep, gawk - -# Force the shell to exit immediately if something goes wrong -set -e - -VERSION="0.9.14" -LOGDIR="/var/log" -MANPATH="/usr/share/man" -SBINDIR="/usr/sbin" -SYSCONFDIR="/etc" -DATADIR="/usr/share" -ROOT_UID=0 -OSTYPE=$(uname -s) - -if [ "$UID" -ne "$ROOT_UID" ]; then - echo "You must be root to run this script." - exit -fi - -echo -echo "Installing recap and recaptool to $SBINDIR" -echo - -mkdir -p -m0755 $SBINDIR -mkdir -p -m0755 $DATADIR/doc/recap-$VERSION -mkdir -p -m0755 $SYSCONFDIR/cron.d -mkdir -p -m0700 $LOGDIR/recap -mkdir -p -m0700 $LOGDIR/recap/backups -mkdir -p -m0700 $LOGDIR/recap/snapshots -mkdir -p -m0755 $MANPATH/man5 -mkdir -p -m0755 $MANPATH/man8 - -install -m 0755 ../src/recap $SBINDIR/ -install -m 0755 ../src/recaplog $SBINDIR/ -install -m 0755 ../src/recaptool $SBINDIR/ - -install -m 0644 ../README.md $DATADIR/doc/recap-$VERSION/ -install -m 0644 ../CHANGELOG.md $DATADIR/doc/recap-$VERSION/ -install -m 0644 ../COPYING $DATADIR/doc/recap-$VERSION/ - -install -m 0644 ../src/recap.5 $MANPATH/man5 -install -m 0644 ../src/recap.8 $MANPATH/man8 -install -m 0644 ../src/recaplog.8 $MANPATH/man8 -gzip $MANPATH/man5/recap.5 -gzip $MANPATH/man8/recap.8 -gzip $MANPATH/man8/recaplog.8 - -install -m 0644 ../src/recap.conf $SYSCONFDIR/recap - -# if macosx uname -s contains Darwin -if [[ $OSTYPE =~ "Darwin" ]]; then - install -m 0700 ../util/recap.plist /Library/LaunchDaemons/recap.plist - launchctl load -w /Library/LaunchDaemons/recap.plist -else - install -m 0644 ../src/recap.cron $SYSCONFDIR/cron.d/recap -fi - - -if [ -d $SYSCONFDIR/apache2/conf.d ]; then - install -m 0644 ../src/recap.httpd.conf $SYSCONFDIR/apache2/conf.d/recap.conf - echo "To enable webbased stats, see $SYSCONFDIR/apache2/conf.d/recap.conf" -elif [ -d $SYSCONFDIR/httpd/conf.d ]; then - install -m 0644 ../src/recap.httpd.conf $SYSCONFDIR/httpd/conf.d/recap.conf - echo "To enable webbased stats, see $SYSCONFDIR/httpd/conf.d/recap.conf" -else - echo "No /etc/apache2 or /etc/httpd found. Skipping apache configuration installation." -fi - -echo -echo "The cron execution of recap is set to run every 10 minutes and at reboot by default." -echo "Edit /etc/cron.d/recap to change cron execution." - -echo -echo "recap installation complete." diff --git a/util/recap.plist b/util/recap.plist deleted file mode 100644 index 03de8df..0000000 --- a/util/recap.plist +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Label - recap - ProgramArguments - - /usr/sbin/recap - - StartInterval - 600 - Debug - - RunAtLoad - - - \ No newline at end of file