Index: /trunk/nagios-velvice/Makefile =================================================================== --- /trunk/nagios-velvice/Makefile (revision 262) +++ /trunk/nagios-velvice/Makefile (revision 263) @@ -5,4 +5,5 @@ MANDIR=/usr/share/man/man1 SHAREDOCDIR=/usr/share/doc/nagios-velvice +STYLEDIR=/etc/nagios3/stylesheets .PHONY: all ignore install update sync upload stat help pkg @@ -19,9 +20,13 @@ @install -d -m 0755 -o root -g root $(DESTDIR)/$(MANDIR) @install -d -m 0755 -o root -g root $(DESTDIR)/$(SHAREDOCDIR) + @install -d -m 0755 -o root -g root $(DESTDIR)/$(STYLEDIR) install -m 0755 -o root -g root velvice.cgi $(DESTDIR)/$(CGIDIR) + install -m 0644 -o root -g root velvice.sample.yml $(DESTDIR)/$(ETCDIR) install -m 0644 -o root -g root velvice.1.gz $(DESTDIR)/$(MANDIR) - install -m 0644 -o root -g root velvice.sample.yml $(DESTDIR)/$(ETCDIR) install -m 0644 -o root -g root LICENSE.txt $(DESTDIR)/$(SHAREDOCDIR) + install -m 0644 -o root -g root velvice.html $(DESTDIR)/$(SHAREDOCDIR) + install -m 0644 -o root -g root velvice.sample.yml $(DESTDIR)/$(SHAREDOCDIR) + install -m 0644 -o root -g root velvice.css $(DESTDIR)/$(STYLEDIR) sync: Index: /trunk/nagios-velvice/make-package-debian =================================================================== --- /trunk/nagios-velvice/make-package-debian (revision 262) +++ /trunk/nagios-velvice/make-package-debian (revision 263) @@ -17,12 +17,15 @@ # Create future tree -mkdir -p ${tmp_folder}/etc/nagios3 +mkdir -p ${tmp_folder}/etc/nagios3/stylesheets mkdir -p ${tmp_folder}/usr/lib/cgi-bin/nagios3 mkdir -p ${tmp_folder}/usr/share/doc/nagios3-velvice mkdir -p ${tmp_folder}/usr/share/man/man1 cp LICENSE.txt ${tmp_folder}/usr/share/doc/nagios3-velvice/ +cp velvice.html ${tmp_folder}/usr/share/doc/nagios3-velvice/ +cp velvice.sample.yml ${tmp_folder}/usr/share/doc/nagios3-velvice/ cp velvice.1.gz ${tmp_folder}/usr/share/man/man1/ cp velvice.cgi ${tmp_folder}/usr/lib/cgi-bin/nagios3/ cp velvice.sample.yml ${tmp_folder}/etc/nagios3/ +cp velvice.css ${tmp_folder}/etc/nagios3/stylesheets/ chmod ugo+rx ${tmp_folder}/usr/lib/cgi-bin/nagios3/velvice.cgi chmod -R a+rX,go-w ${tmp_folder}/usr Index: /trunk/nagios-velvice/velvice.cgi =================================================================== --- /trunk/nagios-velvice/velvice.cgi (revision 262) +++ /trunk/nagios-velvice/velvice.cgi (revision 263) @@ -15,5 +15,5 @@ use strict; use warnings; -use version; our $VERSION = version->declare('0.6.6'); +use version; our $VERSION = version->declare('0.7.1'); use CGI; @@ -28,4 +28,5 @@ my $cgi_script_name = $query->script_name(); my $cgi_path = $cgi_script_name =~ s{/[^/]+\.cgi$}{}r; +undef $query; my $config = {}; @@ -36,4 +37,5 @@ $config->{'nagios-server'}{'portal-url'} ||= $cgi_path =~ s{/cgi-bin/}{/}r . '/'; $config->{'nagios-server'}{'status-cgi'} ||= "$cgi_path/status.cgi"; +$config->{'nagios-server'}{'stylesheets'} ||= $config->{'nagios-server'}{'portal-url'} =~ s{/?$}{/stylesheets}r; $config->{'host-mapping'} ||= {}; $config->{'color-downtime'} ||= {}; @@ -111,18 +113,6 @@