diff --git a/.werks/11495 b/.werks/11495 new file mode 100644 index 0000000000000..fa6c0de8ffafa --- /dev/null +++ b/.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. diff --git a/cmk/gui/plugins/sidebar/wiki.py b/doc/treasures/wiki_sidebar_snapin.py similarity index 100% rename from cmk/gui/plugins/sidebar/wiki.py rename to doc/treasures/wiki_sidebar_snapin.py diff --git a/omd/.gitignore b/omd/.gitignore index d1ad940aadccb..f6dfb07ccd987 100644 --- a/omd/.gitignore +++ b/omd/.gitignore @@ -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/ diff --git a/omd/Makefile b/omd/Makefile index 22048ddb8740f..e616241f9d7d6 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -37,7 +37,6 @@ PACKAGES := \ check_mysql_health \ check_oracle_health \ Webinject \ - dokuwiki \ jmx4perl \ mk-livestatus \ stunnel \ diff --git a/omd/packages/check_mk/MULTISITE_COOKIE_AUTH b/omd/packages/check_mk/MULTISITE_COOKIE_AUTH index 622fec72f3805..326a74494a8df 100755 --- a/omd/packages/check_mk/MULTISITE_COOKIE_AUTH +++ b/omd/packages/check_mk/MULTISITE_COOKIE_AUTH @@ -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 < @@ -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 - fi - if [ -d ${PNP_CFG%/*} ]; then cat > $PNP_CFG < - */ - -class auth_plugin_authmultisite extends DokuWiki_Auth_Plugin { - - var $success = true; - var $cando = array ( - 'addUser' => false, // can Users be created? - 'delUser' => false, // can Users be deleted? - 'modLogin' => false, // can login names be changed? - 'modPass' => false, // can passwords be changed? - 'modName' => false, // can real names be changed? - 'modMail' => false, // can emails be changed? - 'modGroups' => false, // can groups be changed? - 'getUsers' => false, // can a (filtered) list of users be retrieved? - 'getUserCount'=> false, // can the number of users be retrieved? - 'getGroups' => false, // can a list of available groups be retrieved? - 'external' => true, // does the module do external auth checking? - 'logout' => false, // can the user logout again? (eg. not possible with HTTP auth) - ); - - function auth_basic() { - } - - private function loadAuthFile($path) { - $creds = array(); - foreach(file($path) AS $line) { - if(strpos($line, ':') !== false) { - list($username, $secret) = explode(':', $line, 2); - $creds[$username] = rtrim($secret); - } - } - return $creds; - } - - function trustExternal($user,$pass,$sticky=false){ - global $conf; - global $USERINFO; - foreach(array_keys($_COOKIE) AS $cookieName) - { - if(substr($cookieName, 0, 5) != 'auth_'){ - continue; - } - - if(!isset($_COOKIE[$cookieName]) || $_COOKIE[$cookieName] == ''){ - continue; - } - list($username, $issueTime, $cookieHash) = explode(':', $_COOKIE[$cookieName], 3); - - require_once($conf['multisite']['authfile']); - if(!isset($mk_users[$username])){ - continue; - } - - if(file_exists($conf['multisite']['auth_serials'])) - $authFile = 'serial'; - elseif(file_exists($conf['multisite']['htpasswd'])) - $authFile = 'htpasswd'; - else - continue; - - if($authFile == 'htpasswd') - $users = $this->loadAuthFile($conf['multisite']['htpasswd']); - else - $users = $this->loadAuthFile($conf['multisite']['auth_serials']); - - if(!isset($users[$username])) { - throw new Exception(); - } - $user_secret = $users[$username]; - - $secret = trim(file_get_contents($conf['multisite']['auth_secret'])); - if(md5($username . $issueTime . $user_secret . $secret) == $cookieHash) - { - $USERINFO['name'] = $username; - $USERINFO['grps'] = $mk_users[$username]['roles']; - $_SERVER['REMOTE_USER'] = $username; - $_SESSION[DOKU_COOKIE]['auth']['user'] = $username; - $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO; - return true; - }else - { - continue; - } - } - header('Location:../check_mk/login.py?_origtarget=' . urlencode($_SERVER['REQUEST_URI'])); - return false; - } - - -} -//Setup VIM: ex: et ts=2 : diff --git a/omd/packages/dokuwiki/authmultisite/plugin.info.txt b/omd/packages/dokuwiki/authmultisite/plugin.info.txt deleted file mode 100644 index f2bdb44b82ae0..0000000000000 --- a/omd/packages/dokuwiki/authmultisite/plugin.info.txt +++ /dev/null @@ -1,7 +0,0 @@ -base authmultisite -author Bastian Kuhn -email bk@mathias-kettner.de -date 2012-05-30 -name Multisite authentication plugin -desc authenticate against multisite -url http://mathias-kettner.de diff --git a/omd/packages/dokuwiki/dokuwiki-2018-04-22b.tgz b/omd/packages/dokuwiki/dokuwiki-2018-04-22b.tgz deleted file mode 100644 index a4734965989d8..0000000000000 Binary files a/omd/packages/dokuwiki/dokuwiki-2018-04-22b.tgz and /dev/null differ diff --git a/omd/packages/dokuwiki/dokuwiki.make b/omd/packages/dokuwiki/dokuwiki.make deleted file mode 100644 index 231067b719090..0000000000000 --- a/omd/packages/dokuwiki/dokuwiki.make +++ /dev/null @@ -1,62 +0,0 @@ -DOKUWIKI := dokuwiki -DOKUWIKI_VERS := 2018-04-22b -DOKUWIKI_DIR := $(DOKUWIKI)-$(DOKUWIKI_VERS) - -DOKUWIKI_BUILD := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-build -DOKUWIKI_INSTALL := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-install -DOKUWIKI_UNPACK := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-unpack -DOKUWIKI_UNPACK_ADDITIONAL := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-unpack-additional -DOKUWIKI_PATCHING := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-patching - -#DOKUWIKI_INSTALL_DIR := $(INTERMEDIATE_INSTALL_BASE)/$(DOKUWIKI_DIR) -DOKUWIKI_BUILD_DIR := $(PACKAGE_BUILD_DIR)/$(DOKUWIKI_DIR) -#DOKUWIKI_WORK_DIR := $(PACKAGE_WORK_DIR)/$(DOKUWIKI_DIR) - -$(DOKUWIKI_UNPACK_ADDITIONAL): $(DOKUWIKI_UNPACK) - $(TAR_GZ) $(PACKAGE_DIR)/$(DOKUWIKI)/template-arctictut.tgz -C $(DOKUWIKI_BUILD_DIR)/lib/tpl/ - $(LN) -sf $(DOKUWIKI_BUILD_DIR)/lib/images/fileicons/pdf.png $(DOKUWIKI_BUILD_DIR)/lib/tpl/arctictut/images/tool-pdf.png - $(TAR_GZ) $(PACKAGE_DIR)/$(DOKUWIKI)/template-vector.tgz -C $(DOKUWIKI_BUILD_DIR)/lib/tpl/ - - # ./indexmenu/images/bw.png needs to be excluded because the images in this directory - # are licensed with "Copyright: Creative Commons Attribution Non-Commercial No Derivatives". - for p in $(PACKAGE_DIR)/$(DOKUWIKI)/plugins/*.tgz ; do \ - echo "add plugin $$p..." ; \ - $(TAR_GZ) $$p --exclude 'indexmenu/images/bw.png' -C $(DOKUWIKI_BUILD_DIR)/lib/plugins ; \ - done - $(TOUCH) $@ - -# Additional archives have to be unpacked, before the patching works -$(DOKUWIKI_PATCHING): $(DOKUWIKI_UNPACK_ADDITIONAL) - -$(DOKUWIKI_BUILD): $(DOKUWIKI_PATCHING) - $(FIND) $(DOKUWIKI_BUILD_DIR)/ -name \*.orig -exec rm {} \; - $(TOUCH) $@ - -$(DOKUWIKI_INSTALL): $(DOKUWIKI_BUILD) - $(MKDIR) $(DESTDIR)$(OMD_ROOT)/share/dokuwiki - cp $(PACKAGE_DIR)/$(DOKUWIKI)/preload.php $(DOKUWIKI_BUILD_DIR)/inc/ - cp -r $(PACKAGE_DIR)/$(DOKUWIKI)/authmultisite $(DOKUWIKI_BUILD_DIR)/lib/plugins/ - cp -r $(DOKUWIKI_BUILD_DIR) $(DESTDIR)$(OMD_ROOT)/share/dokuwiki/htdocs - $(MKDIR) $(DESTDIR)$(OMD_ROOT)/share/doc/dokuwiki - install -m 644 $(DOKUWIKI_BUILD_DIR)/README $(DESTDIR)$(OMD_ROOT)/share/doc/dokuwiki - install -m 644 $(DOKUWIKI_BUILD_DIR)/COPYING $(DESTDIR)$(OMD_ROOT)/share/doc/dokuwiki - install -m 644 $(DOKUWIKI_BUILD_DIR)/VERSION $(DESTDIR)$(OMD_ROOT)/share/doc/dokuwiki - install -m 755 $(PACKAGE_DIR)/$(DOKUWIKI)/DOKUWIKI_AUTH $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - - $(MKDIR) $(SKEL)/etc/dokuwiki - $(MKDIR) $(SKEL)/var/dokuwiki/lib/plugins - cp $(DOKUWIKI_BUILD_DIR)/conf/*.conf $(SKEL)/etc/dokuwiki/. - cp $(DOKUWIKI_BUILD_DIR)/conf/*.php$ $(SKEL)/etc/dokuwiki/. - cp $(DOKUWIKI_BUILD_DIR)/conf/acl.auth.php.dist $(SKEL)/etc/dokuwiki/acl.auth.php - cp $(DOKUWIKI_BUILD_DIR)/conf/mysql.conf.php.example $(SKEL)/etc/dokuwiki/mysql.conf.php.example - - for p in $(PACKAGE_DIR)/$(DOKUWIKI)/patches/*.skel_patch ; do \ - echo "applying $$p..." ; \ - ( cd $(SKEL) ; patch -p1 ) < $$p || exit 1; \ - done - - cd $(SKEL)/var/dokuwiki/lib/plugins/ ; \ - for i in `ls -1 $(DESTDIR)$(OMD_ROOT)/share/dokuwiki/htdocs/lib/plugins/` ; do \ - $(LN) -sf ../../../../share/dokuwiki/htdocs/lib/plugins/$$i . ; \ - done - $(TOUCH) $@ diff --git a/omd/packages/dokuwiki/patches/0001-style-arctic.dif b/omd/packages/dokuwiki/patches/0001-style-arctic.dif deleted file mode 100644 index 8266538024baa..0000000000000 --- a/omd/packages/dokuwiki/patches/0001-style-arctic.dif +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur dokuwiki-2013-05-10a/lib/tpl/arctictut/style.ini dokuwiki-2013-05-10a/lib/tpl/arctictut/style.ini.neu ---- a/lib/tpl/arctictut/style.ini 2012-08-04 15:30:05.000000000 +0200 -+++ b/lib/tpl/arctictut/style.ini.neu 2012-08-04 15:30:46.000000000 +0200 -@@ -36,10 +36,10 @@ - ; give your wiki a new look. - [replacements] - ; arctic template LAYOUT --__wiki_width__ = "95%" --__wiki_full_width__="95%" -+__wiki_width__ = "99%" -+__wiki_full_width__= "100%" - __header_height__ = "128px" --__body_margin__ = "1.5em" -+__body_margin__ = "0.5em" - __page_padding__ = "0.5em;" - __footer_padding__ = "0.4em" - diff --git a/omd/packages/dokuwiki/patches/0002-pdflink.dif b/omd/packages/dokuwiki/patches/0002-pdflink.dif deleted file mode 100644 index 65d11847a8a78..0000000000000 --- a/omd/packages/dokuwiki/patches/0002-pdflink.dif +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur dokuwiki-2013-05-10a/lib/tpl/arctictut/style.ini dokuwiki-2013-05-10a/lib/tpl/arctictut/style.ini.neu ---- a/lib/tpl/arctictut/main.php 2013-09-06 08:05:55.000000000 +0200 -+++ b/lib/tpl/arctictut/main.php.neu 2013-11-24 22:14:37.000000000 +0100 -@@ -133,6 +133,7 @@ - break; - case('links'): - if(!tpl_getConf('closedwiki') || (tpl_getConf('closedwiki') && isset($_SERVER['REMOTE_USER']))) { -+ echo 'Export PDF'; - tpl_actionlink('admin'); - tpl_actionlink('revert'); - tpl_actionlink('profile'); - diff --git a/omd/packages/dokuwiki/patches/0003-style-dokuwiki.dif b/omd/packages/dokuwiki/patches/0003-style-dokuwiki.dif deleted file mode 100644 index 066437e3126b8..0000000000000 --- a/omd/packages/dokuwiki/patches/0003-style-dokuwiki.dif +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur dokuwiki/lib/tpl/dokuwiki/style.ini dokuwiki/lib/tpl/dokuwiki/style.ini.neu ---- a/lib/tpl/dokuwiki/style.ini 2015-02-24 21:01:05.000000000 +0100 -+++ b/lib/tpl/dokuwiki/style.ini.neu 2015-07-08 10:16:50.770634674 +0200 -@@ -79,7 +79,7 @@ - __missing__ = "#d30" ; @ini_missing - - ; site and sidebar widths --__site_width__ = "75em" ; @ini_site_width -+__site_width__ = "90%" ; @ini_site_width - __sidebar_width__ = "16em" ; @ini_sidebar_width - ; cut off points for mobile devices - __tablet_width__ = "800px" ; @ini_tablet_width diff --git a/omd/packages/dokuwiki/patches/0010-acl.auth.php.skel_patch b/omd/packages/dokuwiki/patches/0010-acl.auth.php.skel_patch deleted file mode 100644 index f9c58bc635399..0000000000000 --- a/omd/packages/dokuwiki/patches/0010-acl.auth.php.skel_patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/etc/dokuwiki/acl.auth.php 2015-04-22 09:33:05.102772154 +0200 -+++ b/etc/dokuwiki/acl.auth.php 2015-04-22 09:38:15.694770887 +0200 -@@ -18,4 +18,5 @@ - # upload 8 - # delete 16 - --* @ALL 8 -+* @ALL 1 -+* @admin 16 diff --git a/omd/packages/dokuwiki/plugins/plugin-bookcreator.tgz b/omd/packages/dokuwiki/plugins/plugin-bookcreator.tgz deleted file mode 100644 index e5ec4e107d1a9..0000000000000 Binary files a/omd/packages/dokuwiki/plugins/plugin-bookcreator.tgz and /dev/null differ diff --git a/omd/packages/dokuwiki/plugins/plugin-changes.tgz b/omd/packages/dokuwiki/plugins/plugin-changes.tgz deleted file mode 100644 index 6b55c96ff2ca3..0000000000000 Binary files a/omd/packages/dokuwiki/plugins/plugin-changes.tgz and /dev/null differ diff --git a/omd/packages/dokuwiki/plugins/plugin-dokuteaser.tgz b/omd/packages/dokuwiki/plugins/plugin-dokuteaser.tgz deleted file mode 100644 index e0ebdc51e8a77..0000000000000 Binary files a/omd/packages/dokuwiki/plugins/plugin-dokuteaser.tgz and /dev/null differ diff --git a/omd/packages/dokuwiki/plugins/plugin-include.tgz b/omd/packages/dokuwiki/plugins/plugin-include.tgz deleted file mode 100644 index a67fba35cadca..0000000000000 Binary files a/omd/packages/dokuwiki/plugins/plugin-include.tgz and /dev/null differ diff --git a/omd/packages/dokuwiki/plugins/plugin-indexmenu.tgz b/omd/packages/dokuwiki/plugins/plugin-indexmenu.tgz deleted file mode 100644 index c915fb01858c6..0000000000000 Binary files a/omd/packages/dokuwiki/plugins/plugin-indexmenu.tgz and /dev/null differ diff --git a/omd/packages/dokuwiki/plugins/plugin-pagelist.tgz b/omd/packages/dokuwiki/plugins/plugin-pagelist.tgz deleted file mode 100644 index 68825bac8ddaa..0000000000000 Binary files a/omd/packages/dokuwiki/plugins/plugin-pagelist.tgz and /dev/null differ diff --git a/omd/packages/dokuwiki/preload.php b/omd/packages/dokuwiki/preload.php deleted file mode 100644 index 6755519b927c6..0000000000000 --- a/omd/packages/dokuwiki/preload.php +++ /dev/null @@ -1,87 +0,0 @@ - array( - 'default' => array(DOKU_CONF.'dokuwiki.php'), - 'local' => file_exists(DOKU_CONF.'cookie_auth.php') ? array(DOKU_CONF.'cookie_auth.php', DOKU_CONF.'local.php') : array(DOKU_CONF.'local.php'), - 'protected' => array(DOKU_CONF.'local.protected.php'), - ), - 'acronyms' => array( - 'default' => array(DOKU_CONF.'acronyms.conf'), - 'local' => array(DOKU_CONF.'acronyms.local.conf'), - ), - 'entities' => array( - 'default' => array(DOKU_CONF.'entities.conf'), - 'local' => array(DOKU_CONF.'entities.local.conf'), - ), - 'interwiki' => array( - 'default' => array(DOKU_CONF.'interwiki.conf'), - 'local' => array(DOKU_CONF.'interwiki.local.conf'), - ), - 'license' => array( - 'default' => array(DOKU_CONF.'license.php'), - 'local' => array(DOKU_CONF.'license.local.php'), - ), - 'mediameta' => array( - 'default' => array(DOKU_CONF.'mediameta.php'), - 'local' => array(DOKU_CONF.'mediameta.local.php'), - ), - 'mime' => array( - 'default' => array(DOKU_CONF.'mime.conf'), - 'local' => array(DOKU_CONF.'mime.local.conf'), - ), - 'scheme' => array( - 'default' => array(DOKU_CONF.'scheme.conf'), - 'local' => array(DOKU_CONF.'scheme.local.conf'), - ), - 'smileys' => array( - 'default' => array(DOKU_CONF.'smileys.conf'), - 'local' => array(DOKU_CONF.'smileys.local.conf'), - ), - 'wordblock' => array( - 'default' => array(DOKU_CONF.'wordblock.conf'), - 'local' => array(DOKU_CONF.'wordblock.local.conf'), - ), - 'acl' => array( - 'default' => DOKU_CONF.'acl.auth.php', - ), - 'plainauth.users' => array( - 'default' => DOKU_CONF.'users.auth.php', - ), - 'plugins' => array( // needed since Angua - 'default' => array(DOKU_CONF.'plugins.php'), - 'local' => array(DOKU_CONF.'plugins.local.php'), - 'protected' => array( - DOKU_CONF.'plugins.required.php', - DOKU_CONF.'plugins.protected.php', - ), - ), - 'userstyle' => array( - 'screen' => DOKU_CONF.'userstyle.css', - 'print' => DOKU_CONF.'userprint.css', - 'feed' => DOKU_CONF.'userfeed.css', - 'all' => DOKU_CONF.'userall.css', - ), - 'userscript' => array( - 'default' => array( - DOKU_CONF.'userscript.js', - ), - ), -); - -?> diff --git a/omd/packages/dokuwiki/skel.permissions b/omd/packages/dokuwiki/skel.permissions deleted file mode 100644 index ce504b70117e6..0000000000000 --- a/omd/packages/dokuwiki/skel.permissions +++ /dev/null @@ -1,13 +0,0 @@ -var/dokuwiki/data 770 -var/dokuwiki/data/attic 770 -var/dokuwiki/data/cache 770 -var/dokuwiki/data/index 770 -var/dokuwiki/data/locks 770 -var/dokuwiki/data/media 770 -var/dokuwiki/data/meta 770 -var/dokuwiki/data/pages 770 -var/dokuwiki/data/tmp 775 -etc/dokuwiki 770 -etc/dokuwiki/local.php 660 -etc/dokuwiki/acl.auth.php 660 -etc/dokuwiki/users.auth.php 660 diff --git a/omd/packages/dokuwiki/skel/etc/apache/conf.d/dokuwiki.conf b/omd/packages/dokuwiki/skel/etc/apache/conf.d/dokuwiki.conf deleted file mode 120000 index 6b66b2a75ef33..0000000000000 --- a/omd/packages/dokuwiki/skel/etc/apache/conf.d/dokuwiki.conf +++ /dev/null @@ -1 +0,0 @@ -../../dokuwiki/apache.conf \ No newline at end of file diff --git a/omd/packages/dokuwiki/skel/etc/dokuwiki/apache.conf b/omd/packages/dokuwiki/skel/etc/dokuwiki/apache.conf deleted file mode 100644 index 34b7c80d21dd6..0000000000000 --- a/omd/packages/dokuwiki/skel/etc/dokuwiki/apache.conf +++ /dev/null @@ -1,22 +0,0 @@ -# SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER - -Alias /###SITE###/wiki/local "/omd/sites/###SITE###/local/share/dokuwiki/htdocs" - - - Order deny,allow - allow from all - - -Alias /###SITE###/wiki "/omd/sites/###SITE###/share/dokuwiki/htdocs" - - - Order allow,deny - Allow from all - - RewriteEngine on - RewriteCond "/omd/sites/###SITE###/local/share/dokuwiki/htdocs/$1" "-f" - RewriteRule "(.*)" "/###SITE###/wiki/local/$1" - RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L] - - - diff --git a/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php b/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php deleted file mode 100644 index d103e133e19e2..0000000000000 --- a/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/omd/packages/dokuwiki/skel/etc/dokuwiki/local.protected.php b/omd/packages/dokuwiki/skel/etc/dokuwiki/local.protected.php deleted file mode 100644 index 95415f219009e..0000000000000 --- a/omd/packages/dokuwiki/skel/etc/dokuwiki/local.protected.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/omd/packages/dokuwiki/skel/etc/dokuwiki/msg b/omd/packages/dokuwiki/skel/etc/dokuwiki/msg deleted file mode 100644 index 38bbb133c67c9..0000000000000 --- a/omd/packages/dokuwiki/skel/etc/dokuwiki/msg +++ /dev/null @@ -1,8 +0,0 @@ -25 -The first line of this file contains a number, indicating -which notification messages should not be displayed. This -is the only information sent to dokuwiki.org when the -updatecheck option is enabled. You usually don't need to -change this number as it gets updated when you install the -new release - but to ignore a certain message set its -number here. diff --git a/omd/packages/dokuwiki/skel/etc/dokuwiki/plugins.local.php b/omd/packages/dokuwiki/skel/etc/dokuwiki/plugins.local.php deleted file mode 100644 index 7401589f79848..0000000000000 --- a/omd/packages/dokuwiki/skel/etc/dokuwiki/plugins.local.php +++ /dev/null @@ -1,12 +0,0 @@ - -omdadmin:M29dfyFjgy5iA:OMD Admin:admin@example.org:admin,user diff --git a/omd/packages/dokuwiki/skel/local/share/dokuwiki/htdocs/.gitignore b/omd/packages/dokuwiki/skel/local/share/dokuwiki/htdocs/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/tmp/dokuwiki/.gitignore b/omd/packages/dokuwiki/skel/tmp/dokuwiki/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/.htaccess b/omd/packages/dokuwiki/skel/var/dokuwiki/data/.htaccess deleted file mode 100644 index 281d5c33db37c..0000000000000 --- a/omd/packages/dokuwiki/skel/var/dokuwiki/data/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -order allow,deny -deny from all diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/_dummy b/omd/packages/dokuwiki/skel/var/dokuwiki/data/_dummy deleted file mode 100644 index 37ed18a63ba4e..0000000000000 --- a/omd/packages/dokuwiki/skel/var/dokuwiki/data/_dummy +++ /dev/null @@ -1 +0,0 @@ -data directory diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/attic/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/attic/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/attic/_dummy b/omd/packages/dokuwiki/skel/var/dokuwiki/data/attic/_dummy deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/cache/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/cache/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/cache/_dummy b/omd/packages/dokuwiki/skel/var/dokuwiki/data/cache/_dummy deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/index/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/index/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/index/_dummy b/omd/packages/dokuwiki/skel/var/dokuwiki/data/index/_dummy deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/locks/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/locks/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/locks/_dummy b/omd/packages/dokuwiki/skel/var/dokuwiki/data/locks/_dummy deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/media/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/media/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/media/wiki/dokuwiki-128.png b/omd/packages/dokuwiki/skel/var/dokuwiki/data/media/wiki/dokuwiki-128.png deleted file mode 100644 index b2306ac9571f3..0000000000000 Binary files a/omd/packages/dokuwiki/skel/var/dokuwiki/data/media/wiki/dokuwiki-128.png and /dev/null differ diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/media_attic/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/media_attic/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/media_meta/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/media_meta/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/meta/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/meta/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/meta/_dummy b/omd/packages/dokuwiki/skel/var/dokuwiki/data/meta/_dummy deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/playground/playground.txt b/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/playground/playground.txt deleted file mode 100644 index a2274bda49df1..0000000000000 --- a/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/playground/playground.txt +++ /dev/null @@ -1 +0,0 @@ -====== PlayGround ====== diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/wiki/dokuwiki.txt b/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/wiki/dokuwiki.txt deleted file mode 100644 index a58575f0515c1..0000000000000 --- a/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/wiki/dokuwiki.txt +++ /dev/null @@ -1,64 +0,0 @@ -====== DokuWiki ====== - -[[doku>wiki:dokuwiki|{{wiki:dokuwiki-128.png }}]] DokuWiki is a standards compliant, simple to use [[wp>Wiki]], mainly aimed at creating documentation of any kind. It is targeted at developer teams, workgroups and small companies. It has a simple but powerful [[wiki:syntax]] which makes sure the datafiles remain readable outside the Wiki and eases the creation of structured texts. All data is stored in plain text files -- no database is required. - -Read the [[doku>manual|DokuWiki Manual]] to unleash the full power of DokuWiki. - -===== Download ===== - -DokuWiki is available at http://www.splitbrain.org/go/dokuwiki - - -===== Read More ===== - -All documentation and additional information besides the [[syntax|syntax description]] is maintained in the DokuWiki at [[doku>|www.dokuwiki.org]]. - -**About DokuWiki** - - * [[doku>features|A feature list]] :!: - * [[doku>users|Happy Users]] - * [[doku>press|Who wrote about it]] - * [[doku>blogroll|What Bloggers think]] - * [[http://www.wikimatrix.org/show/DokuWiki|Compare it with other wiki software]] - -**Installing DokuWiki** - - * [[doku>requirements|System Requirements]] - * [[http://www.splitbrain.org/go/dokuwiki|Download DokuWiki]] :!: - * [[doku>changes|Change Log]] - * [[doku>Install|How to install or upgrade]] :!: - * [[doku>config|Configuration]] - -**Using DokuWiki** - - * [[doku>syntax|Wiki Syntax]] - * [[doku>manual|The manual]] :!: - * [[doku>FAQ|Frequently Asked Questions (FAQ)]] - * [[doku>glossary|Glossary]] - * [[http://search.dokuwiki.org|Search for DokuWiki help and documentation]] - -**Customizing DokuWiki** - - * [[doku>tips|Tips and Tricks]] - * [[doku>Template|How to create and use templates]] - * [[doku>plugins|Installing plugins]] - * [[doku>development|Development Resources]] - -**DokuWiki Feedback and Community** - - * [[doku>newsletter|Subscribe to the newsletter]] :!: - * [[doku>mailinglist|Join the mailing list]] - * [[http://forum.dokuwiki.org|Check out the user forum]] - * [[doku>irc|Talk to other users in the IRC channel]] - * [[http://bugs.splitbrain.org/index.php?project=1|Submit bugs and feature wishes]] - * [[http://www.wikimatrix.org/forum/viewforum.php?id=10|Share your experiences in the WikiMatrix forum]] - * [[doku>thanks|Some humble thanks]] - - -===== Copyright ===== - -2004-2009 (c) Andreas Gohr ((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) - -The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-). - -Not sure what this means? See the [[doku>faq:license|FAQ on the Licenses]]. diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/wiki/ebook.txt b/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/wiki/ebook.txt deleted file mode 100644 index c7884a7b72363..0000000000000 --- a/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/wiki/ebook.txt +++ /dev/null @@ -1 +0,0 @@ -~~BOOK~~ diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/wiki/syntax.txt b/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/wiki/syntax.txt deleted file mode 100644 index 8aeee703e74c0..0000000000000 --- a/omd/packages/dokuwiki/skel/var/dokuwiki/data/pages/wiki/syntax.txt +++ /dev/null @@ -1,486 +0,0 @@ -====== Formatting Syntax ====== - -[[doku>DokuWiki]] supports some simple markup language, which tries to make the datafiles to be as readable as possible. This page contains all possible syntax you may use when editing the pages. Simply have a look at the source of this page by pressing the //Edit this page// button at the top or bottom of the page. If you want to try something, just use the [[playground:playground|playground]] page. The simpler markup is easily accessible via [[doku>toolbar|quickbuttons]], too. - -===== Basic Text Formatting ===== - -DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. Of course you can **__//''combine''//__** all these. - - DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. - Of course you can **__//''combine''//__** all these. - -You can use subscript and superscript, too. - - You can use subscript and superscript, too. - -You can mark something as deleted as well. - - You can mark something as deleted as well. - -**Paragraphs** are created from blank lines. If you want to **force a newline** without a paragraph, you can use two backslashes followed by a whitespace or the end of line. - -This is some text with some linebreaks\\ Note that the -two backslashes are only recognized at the end of a line\\ -or followed by\\ a whitespace \\this happens without it. - - This is some text with some linebreaks\\ Note that the - two backslashes are only recognized at the end of a line\\ - or followed by\\ a whitespace \\this happens without it. - -You should use forced newlines only if really needed. - -===== Links ===== - -DokuWiki supports multiple ways of creating links. - -==== External ==== - -External links are recognized automagically: http://www.google.com or simply www.google.com - You can set the link text as well: [[http://www.google.com|This Link points to google]]. Email addresses like this one: are recognized, too. - - DokuWiki supports multiple ways of creating links. External links are recognized - automagically: http://www.google.com or simply www.google.com - You can set - link text as well: [[http://www.google.com|This Link points to google]]. Email - addresses like this one: are recognized, too. - -==== Internal ==== - -Internal links are created by using square brackets. You can either just give a [[pagename]] or use an additional [[pagename|link text]]. - - Internal links are created by using square brackets. You can either just give - a [[pagename]] or use an additional [[pagename|link text]]. - -[[doku>pagename|Wiki pagenames]] are converted to lowercase automatically, special characters are not allowed. - -You can use [[some:namespaces]] by using a colon in the pagename. - - You can use [[some:namespaces]] by using a colon in the pagename. - -For details about namespaces see [[doku>namespaces]]. - -Linking to a specific section is possible, too. Just add the section name behind a hash character as known from HTML. This links to [[syntax#internal|this Section]]. - - This links to [[syntax#internal|this Section]]. - -Notes: - - * Links to [[syntax|existing pages]] are shown in a different style from [[nonexisting]] ones. - * DokuWiki does not use [[wp>CamelCase]] to automatically create links by default, but this behavior can be enabled in the [[doku>config]] file. Hint: If DokuWiki is a link, then it's enabled. - * When a section's heading is changed, its bookmark changes, too. So don't rely on section linking too much. - -==== Interwiki ==== - -DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]]. - - DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. - For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]]. - - -==== Windows Shares ==== - -Windows shares like [[\\server\share|this]] are recognized, too. Please note that these only make sense in a homogeneous user group like a corporate [[wp>Intranet]]. - - Windows Shares like [[\\server\share|this]] are recognized, too. - -Notes: - - * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone"). - * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_don't_work|Mozilla Knowledge Base]]. - - -==== Image Links ==== - -You can also use an image to link to another internal or external page by combining the syntax for links and [[#images_and_other_files|images]] (see below) like this: - - [[http://www.php.net|{{wiki:dokuwiki-128.png}}]] - -[[http://www.php.net|{{wiki:dokuwiki-128.png}}]] - -Please note: The image formatting is the only formatting syntax accepted in link names. - -The whole [[#images_and_other_files|image]] and [[#links|link]] syntax is supported (including image resizing, internal and external images and URLs and interwiki links). - -===== Footnotes ===== - -You can add footnotes ((This is a footnote)) by using double parentheses. - - You can add footnotes ((This is a footnote)) by using double parentheses. - -===== Sectioning ===== - -You can use up to five different levels of headlines to structure your content. If you have more than three headlines, a table of contents is generated automatically -- this can be disabled by including the string ''~~NOTOC~~'' in the document. - -==== Headline Level 3 ==== -=== Headline Level 4 === -== Headline Level 5 == - - ==== Headline Level 3 ==== - === Headline Level 4 === - == Headline Level 5 == - -By using four or more dashes, you can make a horizontal line: - ----- - -===== Images and Other Files ===== - -You can include external and internal [[doku>images]] with curly brackets. Optionally you can specify the size of them. - -Real size: {{wiki:dokuwiki-128.png}} - -Resize to given width: {{wiki:dokuwiki-128.png?50}} - -Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}} - -Resized external image: {{http://de3.php.net/images/php.gif?200x50}} - - Real size: {{wiki:dokuwiki-128.png}} - Resize to given width: {{wiki:dokuwiki-128.png?50}} - Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}} - Resized external image: {{http://de3.php.net/images/php.gif?200x50}} - - -By using left or right whitespaces you can choose the alignment. - -{{ wiki:dokuwiki-128.png}} - -{{wiki:dokuwiki-128.png }} - -{{ wiki:dokuwiki-128.png }} - - {{ wiki:dokuwiki-128.png}} - {{wiki:dokuwiki-128.png }} - {{ wiki:dokuwiki-128.png }} - -Of course, you can add a title (displayed as a tooltip by most browsers), too. - -{{ wiki:dokuwiki-128.png |This is the caption}} - - {{ wiki:dokuwiki-128.png |This is the caption}} - -If you specify a filename (external or internal) that is not an image (''gif, jpeg, png''), then it will be displayed as a link instead. - -For linking an image to another page see [[#Image Links]] above. - -===== Lists ===== - -Dokuwiki supports ordered and unordered lists. To create a list item, indent your text by two spaces and use a ''*'' for unordered lists or a ''-'' for ordered ones. - - * This is a list - * The second item - * You may have different levels - * Another item - - - The same list but ordered - - Another item - - Just use indention for deeper levels - - That's it - - - * This is a list - * The second item - * You may have different levels - * Another item - - - The same list but ordered - - Another item - - Just use indention for deeper levels - - That's it - - -Also take a look at the [[doku>faq:lists|FAQ on list items]]. - -===== Text Conversions ===== - -DokuWiki can convert certain pre-defined characters or strings into images or other text or HTML. - -The text to image conversion is mainly done for smileys. And the text to HTML conversion is used for typography replacements, but can be configured to use other HTML as well. - -==== Text to Image Conversions ==== - -DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. Those [[doku>Smileys]] and other images can be configured and extended. Here is an overview of Smileys included in DokuWiki: - - * 8-) %% 8-) %% - * 8-O %% 8-O %% - * :-( %% :-( %% - * :-) %% :-) %% - * =) %% =) %% - * :-/ %% :-/ %% - * :-\ %% :-\ %% - * :-? %% :-? %% - * :-D %% :-D %% - * :-P %% :-P %% - * :-O %% :-O %% - * :-X %% :-X %% - * :-| %% :-| %% - * ;-) %% ;-) %% - * ^_^ %% ^_^ %% - * :?: %% :?: %% - * :!: %% :!: %% - * LOL %% LOL %% - * FIXME %% FIXME %% - * DELETEME %% DELETEME %% - -==== Text to HTML Conversions ==== - -Typography: [[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters. - --> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r) -"He thought 'It's a man's world'..." - - --> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r) -"He thought 'It's a man's world'..." - - -The same can be done to produce any kind of HTML, it just needs to be added to the [[doku>entities|pattern file]]. - -There are three exceptions which do not come from that pattern file: multiplication entity (640x480), 'single' and "double quotes". They can be turned off through a [[doku>config:typography|config option]]. - -===== Quoting ===== - -Some times you want to mark some text to show it's a reply or comment. You can use the following syntax: - - I think we should do it - - > No we shouldn't - - >> Well, I say we should - - > Really? - - >> Yes! - - >>> Then lets do it! - -I think we should do it - -> No we shouldn't - ->> Well, I say we should - -> Really? - ->> Yes! - ->>> Then lets do it! - -===== Tables ===== - -DokuWiki supports a simple syntax to create tables. - -^ Heading 1 ^ Heading 2 ^ Heading 3 ^ -| Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 | -| Row 2 Col 1 | some colspan (note the double pipe) || -| Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 | - -Table rows have to start and end with a ''|'' for normal rows or a ''^'' for headers. - - ^ Heading 1 ^ Heading 2 ^ Heading 3 ^ - | Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 | - | Row 2 Col 1 | some colspan (note the double pipe) || - | Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 | - -To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators! - -Vertical tableheaders are possible, too. - -| ^ Heading 1 ^ Heading 2 ^ -^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 | -^ Heading 4 | no colspan this time | | -^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 | - -As you can see, it's the cell separator before a cell which decides about the formatting: - - | ^ Heading 1 ^ Heading 2 ^ - ^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 | - ^ Heading 4 | no colspan this time | | - ^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 | - -You can have rowspans (vertically connected cells) by adding '':::'' into the cells below the one to which they should connect. - -^ Heading 1 ^ Heading 2 ^ Heading 3 ^ -| Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 | -| Row 2 Col 1 | ::: | Row 2 Col 3 | -| Row 3 Col 1 | ::: | Row 2 Col 3 | - -Apart from the rowspan syntax those cells should not contain anything else. - - ^ Heading 1 ^ Heading 2 ^ Heading 3 ^ - | Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 | - | Row 2 Col 1 | ::: | Row 2 Col 3 | - | Row 3 Col 1 | ::: | Row 2 Col 3 | - -You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text. - -^ Table with alignment ^^^ -| right| center |left | -|left | right| center | -| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx | - -This is how it looks in the source: - - ^ Table with alignment ^^^ - | right| center |left | - |left | right| center | - | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx | - -Note: Vertical alignment is not supported. - -===== No Formatting ===== - -If you need to display text exactly like it is typed (without any formatting), enclose the area either with ''%%%%'' tags or even simpler, with double percent signs ''%%''. - - -This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it. - -The same is true for %%//__this__ text// with a smiley ;-)%%. - - - This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it. - - The same is true for %%//__this__ text// with a smiley ;-)%%. - -===== Code Blocks ===== - -You can include code blocks into your documents by either indenting them by at least two spaces (like used for the previous examples) or by using the tags ''%%%%'' or ''%%%%''. - - This is text is indented by two spaces. - - -This is preformatted code all spaces are preserved: like <-this - - - -This is pretty much the same, but you could use it to show that you quoted a file. - - -Those blocks were created by this source: - - This is text is indented by two spaces. - - - This is preformatted code all spaces are preserved: like <-this - - - - This is pretty much the same, but you could use it to show that you quoted a file. - - -==== Syntax Highlighting ==== - -[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax is the same like in the code and file blocks in the previous section, but this time the name of the used language is inserted inside the tag. Eg. '''' or ''''. - - -/** - * The HelloWorldApp class implements an application that - * simply displays "Hello World!" to the standard output. - */ -class HelloWorldApp { - public static void main(String[] args) { - System.out.println("Hello World!"); //Display the string. - } -} - - -The following language strings are currently recognized: //abap, actionscript-french, actionscript, actionscript3, ada, apache, applescript, asm, asp, autoit, avisynth, bash, basic4gl, bf, bibtex, blitzbasic, bnf, boo, c, c_mac, caddcl, cadlisp, cfdg, cfm, cil, cmake, cobol, cpp, cpp-qt, csharp, css, d, dcs, delphi, diff, div, dos, dot, eiffel, email, erlang, fo, fortran, freebasic, genero, glsl, gml, gnuplot, groovy, gettext, haskell, hq9plus, html, idl, ini, inno, intercal, io, java5, java, javascript, kixtart, klonec, klonecpp, latex, lisp, locobasic, lolcode, lotusformulas, lotusscript, lscript, lsl2, lua, m68k, make, matlab, mirc, modula3, mpasm, mxml, mysql, nsis, oberon2, objc, ocaml-brief, ocaml, oobas, oracle8, oracle11, pascal, perl, per, php-brief, php, pic16, pixelbender, plsql, povray, powershell, progress, prolog, properties, providex, python, qbasic, rails, rebol, reg, robots, ruby, sas, scala, scheme, scilab, sdlbasic, smalltalk, smarty, sql, tcl, teraterm, text, thinbasic, tsql, typoscript, vbnet, vb, verilog, vhdl, vim, visualfoxpro, visualprolog, whitespace, winbatch, whois, xml, xorg_conf, xpp, z80// - -==== Downloadable Code Blocks ==== - -When you use the ''%%%%'' or ''%%%%'' syntax as above, you might want to make the shown code available for download as well. You can to this by specifying a file name after language code like this: - - - - - - - - - - - -If you don't want any highlighting but want a downloadable file, specify a dash (''-'') as the language code: ''%%%%''. - - -===== Embedding HTML and PHP ===== - -You can embed raw HTML or PHP code into your documents by using the ''%%%%'' or ''%%%%'' tags. (Use uppercase tags if you need to enclose block level elements.) - -HTML example: - - - -This is some inline HTML - - -

And this is some block HTML

- -
- - -This is some inline HTML - - -

And this is some block HTML

- - -PHP example: - - - -echo 'A logo generated by PHP:'; -echo 'PHP Logo !'; -echo '(generated inline HTML)'; - - -echo ''; -echo ''; -echo '
The same, but inside a block level element:PHP Logo !
'; -
-
- - -echo 'A logo generated by PHP:'; -echo 'PHP Logo !'; -echo '(inline HTML)'; - - -echo ''; -echo ''; -echo '
The same, but inside a block level element:PHP Logo !
'; -
- -**Please Note**: HTML and PHP embedding is disabled by default in the configuration. If disabled, the code is displayed instead of executed. - -===== RSS/ATOM Feed Aggregation ===== -[[DokuWiki]] can integrate data from external XML feeds. For parsing the XML feeds, [[http://simplepie.org/|SimplePie]] is used. All formats understood by SimplePie can be used in DokuWiki as well. You can influence the rendering by multiple additional space separated parameters: - -^ Parameter ^ Description ^ -| any number | will be used as maximum number items to show, defaults to 8 | -| reverse | display the last items in the feed first | -| author | show item authors names | -| date | show item dates | -| description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped | -| //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). | - -The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered. - -**Example:** - - {{rss>http://slashdot.org/index.rss 5 author date 1h }} - -{{rss>http://slashdot.org/index.rss 5 author date 1h }} - - -===== Control Macros ===== - -Some syntax influences how DokuWiki renders a page without creating any output it self. The following control macros are availble: - -^ Macro ^ Description | -| %%~~NOTOC~~%% | If this macro is found on the page, no table of contents will be created | -| %%~~NOCACHE~~%% | DokuWiki caches all output by default. Sometimes this might not be wanted (eg. when the %%%% syntax above is used), adding this macro will force DokuWiki to rerender a page on every call | - -===== Syntax Plugins ===== - -DokuWiki's syntax can be extended by [[doku>plugins|Plugins]]. How the installed plugins are used is described on their appropriate description pages. The following syntax plugins are available in this particular DokuWiki installation: - -~~INFO:syntaxplugins~~ diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/tmp/.gitignore b/omd/packages/dokuwiki/skel/var/dokuwiki/data/tmp/.gitignore deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/skel/var/dokuwiki/data/tmp/_dummy b/omd/packages/dokuwiki/skel/var/dokuwiki/data/tmp/_dummy deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/omd/packages/dokuwiki/template-arctictut.tgz b/omd/packages/dokuwiki/template-arctictut.tgz deleted file mode 100644 index 08a5476448020..0000000000000 Binary files a/omd/packages/dokuwiki/template-arctictut.tgz and /dev/null differ diff --git a/omd/packages/dokuwiki/template-vector.tgz b/omd/packages/dokuwiki/template-vector.tgz deleted file mode 100644 index f0b3fd829dfba..0000000000000 Binary files a/omd/packages/dokuwiki/template-vector.tgz and /dev/null differ diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index c9b6f4c50c460..72a04caf2e20b 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -765,6 +765,19 @@ def update_file(relpath: str, site: SiteContext, conflict_mode: str, old_version old_skel = site.version_skel_dir new_skel = "/omd/versions/%s/skel" % new_version + ignored_prefixes = [ + # We removed dokuwiki from the OMD packages with 2.0.0i1. To prevent users from + # accidentally removing configs or their dokuwiki content, we skip the questions to + # remove the dokuwiki files here. + "etc/dokuwiki", + "var/dokuwiki", + "local/share/dokuwiki", + ] + for prefix in ignored_prefixes: + if relpath.startswith(prefix): + sys.stdout.write(f"{StateMarkers.good} Keeping your {relpath}\n") + return + replacements = site.replacements old_path = old_skel + "/" + relpath diff --git a/omd/packages/packages.make b/omd/packages/packages.make index 5e165569bf1cb..afb029368eb26 100644 --- a/omd/packages/packages.make +++ b/omd/packages/packages.make @@ -126,7 +126,6 @@ include \ packages/check_mk/check_mk.make \ packages/check_mysql_health/check_mysql_health.make \ packages/check_oracle_health/check_oracle_health.make \ - packages/dokuwiki/dokuwiki.make \ packages/freetds/freetds.make \ packages/heirloom-pkgtools/heirloom-pkgtools.make \ packages/perl-modules/perl-modules.make \ diff --git a/tests/integration/omd/test_hooks.py b/tests/integration/omd/test_hooks.py index 670b7857084ca..98c92bc55c906 100644 --- a/tests/integration/omd/test_hooks.py +++ b/tests/integration/omd/test_hooks.py @@ -15,7 +15,6 @@ def test_hooks(site): "APACHE_TCP_PORT", "AUTOSTART", "CORE", - "DOKUWIKI_AUTH", "LIVESTATUS_TCP", "LIVESTATUS_TCP_ONLY_FROM", "LIVESTATUS_TCP_PORT", diff --git a/tests/unit/cmk/base/test_diagnostics.py b/tests/unit/cmk/base/test_diagnostics.py index 4f16e8dbbb30e..3306ab9fbd7c4 100644 --- a/tests/unit/cmk/base/test_diagnostics.py +++ b/tests/unit/cmk/base/test_diagnostics.py @@ -260,7 +260,6 @@ def test_diagnostics_element_omd_config_content(tmp_path, _collectors): CONFIG_APACHE_TCP_PORT='5000' CONFIG_AUTOSTART='off' CONFIG_CORE='cmc' -CONFIG_DOKUWIKI_AUTH='off' CONFIG_LIVEPROXYD='on' CONFIG_LIVESTATUS_TCP='off' CONFIG_LIVESTATUS_TCP_ONLY_FROM='0.0.0.0 ::/0' @@ -291,7 +290,6 @@ def test_diagnostics_element_omd_config_content(tmp_path, _collectors): 'CONFIG_APACHE_TCP_PORT', 'CONFIG_AUTOSTART', 'CONFIG_CORE', - 'CONFIG_DOKUWIKI_AUTH', 'CONFIG_LIVEPROXYD', 'CONFIG_LIVESTATUS_TCP', 'CONFIG_LIVESTATUS_TCP_ONLY_FROM', @@ -319,7 +317,6 @@ def test_diagnostics_element_omd_config_content(tmp_path, _collectors): '5000', 'off', 'cmc', - 'off', 'on', 'off', '0.0.0.0 ::/0', diff --git a/tests/unit/cmk/gui/plugins/sidebar/test_snapins.py b/tests/unit/cmk/gui/plugins/sidebar/test_snapins.py index c92391b9ef187..a291b72e71070 100644 --- a/tests/unit/cmk/gui/plugins/sidebar/test_snapins.py +++ b/tests/unit/cmk/gui/plugins/sidebar/test_snapins.py @@ -42,7 +42,6 @@ def test_registered_snapins(): 'views', 'wato_folders', 'wato_foldertree', - 'wiki', ] if not cmk_version.is_raw_edition(): diff --git a/tests/unit/cmk/gui/test_gui_config.py b/tests/unit/cmk/gui/test_gui_config.py index d0e174b1a2177..dd1ac7388a109 100644 --- a/tests/unit/cmk/gui/test_gui_config.py +++ b/tests/unit/cmk/gui/test_gui_config.py @@ -270,7 +270,6 @@ def test_registered_permissions(): 'sidesnap.views', 'sidesnap.wato_folders', 'sidesnap.wato_foldertree', - 'sidesnap.wiki', 'view.aggr_all', 'view.aggr_all_api', 'view.aggr_group',