Skip to content

Commit

Permalink
11495 Remove dokuwiki from standard Checkmk packages
Browse files Browse the repository at this point in the history
Dokuwiki has been delivered with Checkmk since the introduction of OMD. It has
certainly helped some users to quickly create documentation in their monitoring
site. But for Checkmk 2.0 we decided to remove Dokuwiki from the standard
packages.

The Dokuwiki package causes increased effort and complexity because it has to
be maintained by us, including the plugins that have been selected and
implemented. The main problem here is: We support different Linux distros in
different versions. These platforms provide different PHP versions by default
(currently PHP 5.4 to 7). To all these versions we have to keep Dokuwiki and
the plugins compatible. Upstream, however, Dokuwiki has removed support for
such old PHP versions. This would increase the effort for us significantly if
we want to support all platforms equally well.

If you have been using Dokuwiki in a Checkmk site so far, there are ways to do
so. Dokuwiki can be installed into the local hierarchy of a site and run from
there. You are responsible for the installation and maintenance of the
installation yourself. It would even be possible to create an MKP to share the
installation with other users.

The Checkmk sidebar snapin "Wiki" has also been removed from Checkmk. If
you want to use it, you can find it at
"share/doc/check_mk/treasures/wiki_sidebar_snapin.py" in your site. Copy
the file to "local/share/check_mk/web/plugins/sidebar/" and restart your
site apache to make the snapin available to the GUI.

Change-Id: I95b709eac4bdf6df545963f82c6e3d5407582211
  • Loading branch information
LarsMichelsen committed Sep 29, 2020
1 parent abf7ad5 commit 44e4b1a
Show file tree
Hide file tree
Showing 64 changed files with 48 additions and 996 deletions.
35 changes: 35 additions & 0 deletions .werks/11495
@@ -0,0 +1,35 @@
Title: Remove dokuwiki from standard Checkmk packages
Class: feature
Compatible: compat
Component: packages
Date: 1601359706
Edition: cre
Knowledge: undoc
Level: 2
Version: 2.0.0i1

Dokuwiki has been delivered with Checkmk since the introduction of OMD. It has
certainly helped some users to quickly create documentation in their monitoring
site. But for Checkmk 2.0 we decided to remove Dokuwiki from the standard
packages.

The Dokuwiki package causes increased effort and complexity because it has to
be maintained by us, including the plugins that have been selected and
implemented. The main problem here is: We support different Linux distros in
different versions. These platforms provide different PHP versions by default
(currently PHP 5.4 to 7). To all these versions we have to keep Dokuwiki and
the plugins compatible. Upstream, however, Dokuwiki has removed support for
such old PHP versions. This would increase the effort for us significantly if
we want to support all platforms equally well.

If you have been using Dokuwiki in a Checkmk site so far, there are ways to do
so. Dokuwiki can be installed into the local hierarchy of a site and run from
there. You are responsible for the installation and maintenance of the
installation yourself. It would even be possible to create an MKP to share the
installation with other users.

The Checkmk sidebar snapin "Wiki" has also been removed from Checkmk. If
you want to use it, you can find it at
"share/doc/check_mk/treasures/wiki_sidebar_snapin.py" in your site. Copy
the file to "local/share/check_mk/web/plugins/sidebar/" and restart your
site apache to make the snapin available to the GUI.
File renamed without changes.
1 change: 0 additions & 1 deletion omd/.gitignore
Expand Up @@ -11,7 +11,6 @@ boost_[0-9]_[0-9][0-9]_[0-9]/
build-stamp
debian/changelog
destdir
dokuwiki-20[12][0-9]-[01][0-9]-[0-3][0-9][a-z]/
dpkg.topdir
freetds-[0-9].[0-9][0-9].[0-9][0-9]/
mk-livestatus-1.7.0i1/
Expand Down
1 change: 0 additions & 1 deletion omd/Makefile
Expand Up @@ -37,7 +37,6 @@ PACKAGES := \
check_mysql_health \
check_oracle_health \
Webinject \
dokuwiki \
jmx4perl \
mk-livestatus \
stunnel \
Expand Down
18 changes: 0 additions & 18 deletions omd/packages/check_mk/MULTISITE_COOKIE_AUTH
Expand Up @@ -21,7 +21,6 @@ case "$1" in
APACHE_CFG=${OMD_ROOT}/etc/apache/conf.d/cookie_auth.conf
NAGVIS_CFG=${OMD_ROOT}/etc/nagvis/conf.d/cookie_auth.ini.php
PNP_CFG=${OMD_ROOT}/etc/pnp4nagios/config.d/cookie_auth.php
WIKI_CFG=${OMD_ROOT}/etc/dokuwiki/cookie_auth.php
if [ "$2" == "on" ]; then
cat > $APACHE_CFG <<EOF
<LocationMatch ^/${OMD_SITE}/(omd|wiki|nagvis|check_mk|pnp4nagios)>
Expand All @@ -41,22 +40,6 @@ logon_multisite_serials="/omd/sites/$OMD_SITE/etc/auth.serials"
EOF
fi

if [ -d ${WIKI_CFG%/*} ]; then
cat > $WIKI_CFG <<EOF
<?php
// Created by OMD hook MULTISITE_COOKIE_AUTH
//
\$conf['useacl'] = 1;
\$conf['authtype'] = 'authmultisite';
\$conf['superuser'] = '@admin';
\$conf['multisite']['authfile'] = '/omd/sites/$OMD_SITE/var/check_mk/wato/auth/auth.php';
\$conf['multisite']['auth_secret'] = '/omd/sites/$OMD_SITE/etc/auth.secret';
\$conf['multisite']['auth_serials'] = '/omd/sites/$OMD_SITE/etc/auth.serials';
\$conf['multisite']['htpasswd'] = '/omd/sites/$OMD_SITE/etc/htpasswd';
?>
EOF
fi

if [ -d ${PNP_CFG%/*} ]; then
cat > $PNP_CFG <<EOF
<?php
Expand All @@ -78,7 +61,6 @@ EOF
[ -f $APACHE_CFG ] && rm $APACHE_CFG
[ -f $NAGVIS_CFG ] && rm $NAGVIS_CFG
[ -f $PNP_CFG ] && rm $PNP_CFG
[ -f $WIKI_CFG ] && rm $WIKI_CFG
fi
true
;;
Expand Down
3 changes: 0 additions & 3 deletions omd/packages/dokuwiki/.gitignore

This file was deleted.

26 changes: 0 additions & 26 deletions omd/packages/dokuwiki/DOKUWIKI_AUTH

This file was deleted.

100 changes: 0 additions & 100 deletions omd/packages/dokuwiki/authmultisite/auth.php

This file was deleted.

7 changes: 0 additions & 7 deletions omd/packages/dokuwiki/authmultisite/plugin.info.txt

This file was deleted.

Binary file removed omd/packages/dokuwiki/dokuwiki-2018-04-22b.tgz
Binary file not shown.
62 changes: 0 additions & 62 deletions omd/packages/dokuwiki/dokuwiki.make

This file was deleted.

17 changes: 0 additions & 17 deletions omd/packages/dokuwiki/patches/0001-style-arctic.dif

This file was deleted.

12 changes: 0 additions & 12 deletions omd/packages/dokuwiki/patches/0002-pdflink.dif

This file was deleted.

12 changes: 0 additions & 12 deletions omd/packages/dokuwiki/patches/0003-style-dokuwiki.dif

This file was deleted.

9 changes: 0 additions & 9 deletions omd/packages/dokuwiki/patches/0010-acl.auth.php.skel_patch

This file was deleted.

Binary file removed omd/packages/dokuwiki/plugins/plugin-bookcreator.tgz
Binary file not shown.
Binary file removed omd/packages/dokuwiki/plugins/plugin-changes.tgz
Binary file not shown.
Binary file removed omd/packages/dokuwiki/plugins/plugin-dokuteaser.tgz
Binary file not shown.
Binary file removed omd/packages/dokuwiki/plugins/plugin-include.tgz
Binary file not shown.
Binary file removed omd/packages/dokuwiki/plugins/plugin-indexmenu.tgz
Binary file not shown.
Binary file removed omd/packages/dokuwiki/plugins/plugin-pagelist.tgz
Binary file not shown.

0 comments on commit 44e4b1a

Please sign in to comment.