undo mods to Makefile and README per suggestion

This commit is contained in:
graysky 2014-08-19 14:57:42 -04:00
parent df00fe8ecb
commit cabb909a0f
3 changed files with 36 additions and 15 deletions

View File

@ -1,5 +1,3 @@
VERSION = 3.5.2
RELEASEDATE = 20-Aug-2014
PN = monitorix
PREFIX ?= /usr
@ -24,11 +22,6 @@ INSTALL_DIR = $(INSTALL) -d
Q = @
$(PN): $(PN).in
$(Q)echo -e '\033[1;32mSetting version info\033[0m'
$(Q)$(SED) -e 's/@VERSION@/'$(VERSION)'/' $(PN).in \
-e 's/@RELEASEDATE@/'$(RELEASEDATE)'/' > $(PN)
help: install
install:
@ -216,7 +209,4 @@ uninstall:
$(Q)echo
$(Q)echo "or check out the Makefile for specific rules"
clean:
$(RM) $(PN)
.PHONY: help install-bin install-docs install-man install-systemd install-upstart install-debian install-redhat install-systemd-all install-upstart-all install-debian-all install-redhat-all install uninstall-bin uninstall-docs uninstall-man uninstall-systemd uninstall-upstart uninstall-debian uinstall-redhat uninstall-systemd-all uninstall-upstart-all uninstall-debian-all uninstall-redhat-all uninstall clean
.PHONY: help install-bin install-docs install-man install-systemd install-upstart install-debian install-redhat install-systemd-all install-upstart-all install-debian-all install-redhat-all install uninstall-bin uninstall-docs uninstall-man uninstall-systemd uninstall-upstart uninstall-debian uinstall-redhat uninstall-systemd-all uninstall-upstart-all uninstall-debian-all uninstall-redhat-all uninstall

35
README
View File

@ -91,8 +91,6 @@ You can download RRDtool from different places:
INSTALLATION
===============================================================================
Setup the via a make.
Running a `make install-xxx` as root will distribute the files to the file
system. Most users will want to select from three options depending on target
init system (do not run all four)!
@ -106,6 +104,39 @@ Alternatively, users may override any of the in make targets. For example:
$ make DESTDIR=~/pub BASEDIR=/srv/http/monitorix install-systemd-all
The file tree for the Monitorix application is:
File Recommended location Description
-------------------------------------------------------------------------------
monitorix /usr/bin/ main program (daemon)
monitorix.cgi <base_dir>/cgi/ CGI (viewer)
monitorix.conf /etc/monitorix/ configuration file
lib/*.pm /usr/lib/monitorix/ modules
Changes /usr/share/doc/monitorix/ changes log file
COPYING /usr/share/doc/monitorix/ license
logo_bot.png <base_dir> bottom logo
logo_top.png <base_dir> top logo
monitorixico.png <base_dir> favicon
monitorix-alert.sh /usr/share/doc/monitorix/ alert example script
monitorix-apache.conf /etc/httpd/conf.d/ apache configuration
monitorix.service /usr/lib/systemd/system/ systemd service template
monitorix.init /etc/init.d/ redhat SysV init script
monitorix-deb.init /etc/init.d/ debian SysV init script
monitorix.logrotate /etc/logrotate.d/ logrotate script
monitorix.spec /usr/share/doc/monitorix/ RPM spec file
monitorix.sysconfig /etc/sysconfig/ pre-run config file
monitorix.lighttpd.conf /etc/lighttpd/ lighttpd configuration
htpasswd.pl /usr/share/doc/monitorix/ documentation
README /usr/share/doc/monitorix/ documentation
README.FreeBSD /usr/share/doc/monitorix/ documentation
README.nginx /usr/share/doc/monitorix/ documentation
README.OpenBSD /usr/share/doc/monitorix/ documentation
README.NetBSD /usr/share/doc/monitorix/ documentation
man/man5/monitorix.conf.5 /usr/share/man/man5/ monitorix.conf manpage
man/man8/monitorix.8 /usr/share/man/man8/ monitorix manpage
reports/*.html <base_lib>/reports/ traffacct reports i18n
usage/ <base_lib>/usage/ traffacct usage data
Once succesfully installed, please take a look into the configuration file to
setup the options according your system and enable or disable graphs.

View File

@ -46,8 +46,8 @@ $SIG{'TERM'} = 'INT_handler';
$SIG{'CHLD'} = 'CHLD_handler';
$SIG{'HUP' } = 'HUP_handler';
use constant VERSION => "@VERSION@";
use constant RELDATE => "@RELEASEDATE@";
use constant VERSION => "3.5.1";
use constant RELDATE => "06-May-2014";
my @suppsys = ("Linux", "FreeBSD", "OpenBSD", "NetBSD");
our %config;