From f6c5b777d9f199fb946f57ccbc93727b975939e7 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 15 Oct 2013 13:05:49 +0200 Subject: [PATCH] Move html documentation to /usr/share/doc/icinga2/htdocs. Fixes #4876 --- .vagrant-puppet/files/etc/httpd/conf.d/icinga2-doc.conf | 2 +- doc/Makefile.am | 2 +- doc/strapdownjs/Makefile.am | 2 +- doc/strapdownjs/themes/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vagrant-puppet/files/etc/httpd/conf.d/icinga2-doc.conf b/.vagrant-puppet/files/etc/httpd/conf.d/icinga2-doc.conf index ece268944..50bb2f620 100644 --- a/.vagrant-puppet/files/etc/httpd/conf.d/icinga2-doc.conf +++ b/.vagrant-puppet/files/etc/httpd/conf.d/icinga2-doc.conf @@ -1,4 +1,4 @@ -Alias /icinga2-doc "/usr/share/doc/icinga2" +Alias /icinga2-doc "/usr/share/doc/icinga2/htdocs" RewriteEngine On RewriteRule ^/$ /icinga2-doc/#vagrant [NE,L,R=301] diff --git a/doc/Makefile.am b/doc/Makefile.am index 129647a5b..5db2009f9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -52,7 +52,7 @@ EXTRA_DIST = \ CLEANFILES = \ index.html -icinga2docdir = ${docdir} +icinga2docdir = ${docdir}/htdocs icinga2doc_DATA = \ index.html \ $(DOCVIEWER_FILES) diff --git a/doc/strapdownjs/Makefile.am b/doc/strapdownjs/Makefile.am index 653833cda..7800b5f56 100644 --- a/doc/strapdownjs/Makefile.am +++ b/doc/strapdownjs/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = \ themes -icinga2docdir = ${docdir}/strapdownjs +icinga2docdir = ${docdir}/htdocs/strapdownjs icinga2doc_DATA = \ strapdown.js \ strapdown.css diff --git a/doc/strapdownjs/themes/Makefile.am b/doc/strapdownjs/themes/Makefile.am index c66621009..d891deb39 100644 --- a/doc/strapdownjs/themes/Makefile.am +++ b/doc/strapdownjs/themes/Makefile.am @@ -1,4 +1,4 @@ -icinga2docdir = ${docdir}/strapdownjs/themes +icinga2docdir = ${docdir}/htdocs/strapdownjs/themes icinga2doc_DATA = \ bootstrap.min.css \ bootstrap-responsive.min.css \