Make documentation files installable.

diff --git a/configure.ac b/configure.ac
index eb4acbcace30c9f61fdccfcd04a394919e997988..82e51814edb7f4bdc0ea65befb5bc3c32a4e37ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,8 @@ components/livestatus/Makefile
 components/notification/Makefile
 doc/Doxyfile
 doc/Makefile
+doc/strapdownjs/Makefile
+doc/strapdownjs/themes/Makefile
 etc/Makefile
 etc/icinga/Makefile
 etc/icinga2/Makefile

diff --git a/doc/.gitignore b/doc/.gitignore
index 1dce93ba6f7b00261005a88de51f0100ead148e7..55924dadc4563e91249382237e7386d359250b4e 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,5 +1,4 @@
 Doxyfile
-icinga2.html
-icinga2-*.html
 icinga2.8
 .directory
+index.html

diff --git a/doc/9-vagrant-demo-vm.md b/doc/9-vagrant-demo-vm.md
new file mode 100644 (file)
index 0000000..550168a
--- /dev/null
+++ b/doc/9-vagrant-demo-vm.md
@@ -0,0 +1,21 @@
+# <a id="vagrant"></a> Vagrant Demo VM
+
+The Icinga 2 Git repository contains support for Vagrant. In order to build the
+Vagrant VM first you will have to check out the Git repository:
+
+    $ git clone git://git.icinga.org/icinga2.git
+
+Once you have checked out the Git repository you can build the VM using the
+following command:
+
+    $ vagrant up
+
+The Vagrant VM is based on CentOS 6.4 and uses the official Icinga 2 RPM
+packages from `packages.icinga.org`.
+
+In addition to installing Icinga 2 the Vagrant script also installs the Icinga
+1.x Classic UI and the check plugins that are available from the Nagios Plugins
+project.
+
+The Classic UI is available at [http://localhost:8080/icinga](http://localhost:8080/icinga).
+By default both the username and password are `icingaadmin`.
\ No newline at end of file

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 61255f3c1b4657c94ba863901e4f94395aed8fba..11f09fe2c48019edab9cfdbd82e139c5adb4aa3d 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,7 @@
-.PHONY: clean
+SUBDIRS = \
+       strapdownjs
 
-EXTRA_DIST = \
+MARKDOWN_FILES = \
        1-about.md \
        2.0-getting-started.md \
        2.1-setting-up-icinga-2.md \
@@ -32,10 +33,26 @@ EXTRA_DIST = \
        6-advanced-topics.md \
        7-migrating-from-icinga-1x.md \
        8-differences-between-icinga-1x-and-2.md \
+       9-vagrant-demo-vm.md
+
+EXTRA_DIST = \
+       $(MARKDOWN_FILES) \
        icinga2.8
 
+CLEANFILES = \
+       index.html
+
 icinga2docdir = ${docdir}
-icinga2doc_DATA =
+icinga2doc_DATA = \
+       index.html \
+       jquery.min.js \
+       jquery.toc.min.js \
+       toc.css \
+       toc-margin.css \
+       toc-print.css
+
+index.html: $(MARKDOWN_FILES)
+       ./mkdoc.sh > $@.tmp && mv $@.tmp $@
 
 man8_MANS = \
        icinga2.8

diff --git a/doc/strapdownjs/Makefile.am b/doc/strapdownjs/Makefile.am
new file mode 100644 (file)
index 0000000..2b8e895
--- /dev/null
+++ b/doc/strapdownjs/Makefile.am
@@ -0,0 +1,8 @@
+SUBDIRS = \
+       themes
+
+icinga2docdir = ${docdir}/strapdownjs
+icinga2doc_DATA = \
+       strapdown.js \
+       strapdown.css
+

diff --git a/doc/strapdownjs/themes/Makefile.am b/doc/strapdownjs/themes/Makefile.am
new file mode 100644 (file)
index 0000000..4a37c7a
--- /dev/null
+++ b/doc/strapdownjs/themes/Makefile.am
@@ -0,0 +1,7 @@
+icinga2docdir = ${docdir}/strapdownjs/themes
+icinga2doc_DATA = \
+       bootstrap.min.css \
+       bootstrap-responsive.min.css \
+       cerulean.min.css \
+       LICENSE
+

diff --git a/icinga2.spec.in b/icinga2.spec.in
index bfd2a09fda84215c90d25f9484881f986f0a6df1..d45fc43c0891dcc38ccc2307877703607671efee 100644 (file)
--- a/icinga2.spec.in
+++ b/icinga2.spec.in
@@ -203,7 +203,6 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc README AUTHORS ChangeLog COPYING COPYING.Exceptions
 %attr(755,-,-) %{_sysconfdir}/init.d/%{name}
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/conf.d
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-available
@@ -239,6 +238,7 @@ fi
 
 %files doc
 %doc README AUTHORS ChangeLog COPYING COPYING.Exceptions
+%doc %{_datadir}/doc/%{name}
 
 %files ido-mysql
 %{_libdir}/%{name}/libdb_ido_mysql*