From 9d12c49aaec6dc7a45396bdc2407c0a7eb545b1b Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Wed, 22 Apr 2020 23:24:55 +0200 Subject: [PATCH] 2018 04 22b (#58) * Upgrade template to latest version * Upgrade dokuwiki version and version's location * Delete "jessie" from READMEs * Migrate to changelog file instead of READMEs * Fix markdown syntax errors * Add local screenshot * Update manifest.json Co-Authored-By: Kayou * Revert CI link * Correct version number to match manifest Co-authored-by: Gofannon Co-authored-by: Kayou --- CHANGELOG.md | 59 +++++++++++++++++++++++++++++++++++++++ README.md | 28 +++++++------------ README_fr.md | 30 ++++++++------------ conf/app.src | 6 ++-- dokuwikimainwindow.png | Bin 0 -> 21486 bytes manifest.json | 2 +- pull_request_template.md | 12 ++++---- 7 files changed, 89 insertions(+), 48 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 dokuwikimainwindow.png diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..ba827a8 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,59 @@ +# Changelog + +## [Unreleased] + +## [2018-04-22a~ynhXX] + +### Added + +- Upgrade actions and config-panel scripts + +------------ + +## [2018-04-22b~ynh1] - 2020-03-23 + +### Added + +- New DokuWiki version `2018-04-22b` +- Changelog available in `CHANGELOG.md` + +### Changed + +- Upgrade content of file `pull_request_template.md` + +## [2018-04-22a~ynh3] - 2020-02-20 + +### Added + +- Use 'URL rewrite' for prettier URLs + +### Changed + +- Activate URL rewrite by default (does not break old links) + +### Removed + +- Unused DokuWiki config file + +## [2018-04-22a~ynh2] - 2020-02-20 + +### Added + +- Add fail2ban support to avoid bruteforce login attempts + +### Changed + +- Global upgrade of the package + +### Fixed + +- Get rid of the php ini file and merge its content into the pool file +- Update Readme following last work made on the package and current version in testing branch + +### Removed + +- Unused config file settings + +## [Previous versions] - YYYY-MM-DD + +- Will be written (one day maybye) diff --git a/README.md b/README.md index fea004e..8f18d2a 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,11 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in access controls and authentication connectors make DokuWiki especially useful in the enterprise context and the large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki. -**Shipped version:** 2018-04-22a "Greebo" +**Shipped version:** 2018-04-22b "Greebo" ## Screenshots -![](https://www.dokuwiki.org/_media/dokuwikimainwindow.png) +![Screenshot of DokuWiki main window](dokuwikimainwindow.png) ## Demo @@ -26,8 +26,8 @@ DokuWiki is a simple to use and highly versatile Open Source wiki software that ## Documentation -* Official documentation: https://www.dokuwiki.org/manual -* YunoHost documentation: https://yunohost.org/#/app_dokuwiki +* Official documentation: +* YunoHost documentation: ## YunoHost specific features @@ -40,26 +40,17 @@ DokuWiki is a simple to use and highly versatile Open Source wiki software that * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/dokuwiki%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/dokuwiki/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/dokuwiki%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/dokuwiki/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/dokuwiki%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/dokuwiki/) ## Limitations * Cannot create or login with dokuwiki internal users, only users from Yunohost (Work needed for [authchained plugin](https://www.dokuwiki.org/plugin:authchained)) -## Additional information - -### Changelog - -* *Many missing - List taken from previous documentation* -* 07 Mar 2017 - Update app -* 11 Feb 2017 - Create script app - ## Links - * Report a bug: https://github.com/YunoHost-Apps/dokuwiki_ynh/issues - * App website: https://www.dokuwiki.org - * Upstream app repository: https://github.com/splitbrain/dokuwiki - * YunoHost website: https://yunohost.org +* Report a bug: +* App website: +* Upstream app repository: +* YunoHost website: --- @@ -70,7 +61,8 @@ DokuWiki is a simple to use and highly versatile Open Source wiki software that Instead of merging directly into `master`, please do your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing) To try the `testing` branch, please proceed like that. -``` + +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing --debug or sudo yunohost app upgrade dokuwiki -u https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md index fe39537..2eb9035 100644 --- a/README_fr.md +++ b/README_fr.md @@ -3,7 +3,7 @@ [![Niveau d'intégration](https://dash.yunohost.org/integration/dokuwiki.svg)](https://dash.yunohost.org/appci/app/dokuwiki) [![Installer DokuWiki grâce à YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=dokuwiki) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer Dokuwiki rapidement et simplement sur un serveur Yunohost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -12,11 +12,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour DokuWiki est un logiciel wiki Open Source simple à utiliser et très polyvalent qui ne nécessite pas de base de données. Il est apprécié par les utilisateurs pour sa syntaxe propre et lisible. La facilité de maintenance, de sauvegarde et d'intégration en fait un favori d'administrateur. Des contrôles d'accès et des connecteurs d'authentification intégrés rendent DokuWiki particulièrement utile dans le contexte de l'entreprise et le grand nombre de plugins apportés par sa communauté dynamique permettent un large éventail de cas d'utilisation au-delà d'un wiki traditionnel. -**Version incluse:** 2018-04-22a "Greebo" +**Version incluse:** 2018-04-22b "Greebo" ## Captures d'écran -![](https://www.dokuwiki.org/_media/dokuwikimainwindow.png) +![Capture d'écran de la fenêtre principale de DokuWiki](dokuwikimainwindow.png) ## Démo @@ -26,8 +26,8 @@ DokuWiki est un logiciel wiki Open Source simple à utiliser et très polyvalent ## Documentation -* Documentation officielle: https://www.dokuwiki.org/manual -* Documentation YunoHost: https://yunohost.org/#/app_dokuwiki +* Documentation officielle: +* Documentation YunoHost: ## Caractéristiques spécifiques YunoHost @@ -40,26 +40,17 @@ DokuWiki est un logiciel wiki Open Source simple à utiliser et très polyvalent * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/dokuwiki%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/dokuwiki/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/dokuwiki%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/dokuwiki/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/dokuwiki%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/dokuwiki/) ## Limitations * Impossible d'ajouter et d'utiliser les utilisateurs internes de DokuWiki, seulement ceux de Yunohost (travail nécessaire pour [authchained plugin](https://www.dokuwiki.org/plugin:authchained)) -## Informations additionnelles - -### Historique des versions - -* *Many missing - List taken from previous documentation* -* 07 Mar 2017 - Update app -* 11 Feb 2017 - Create script app - ## Liens - * Signaler un bug: https://github.com/YunoHost-Apps/dokuwiki_ynh/issues - * Site de l'application:https://www.dokuwiki.org - * Dépôt de l'application principale: https://github.com/splitbrain/dokuwiki - * Site web YunoHost: https://yunohost.org/ +* Signaler un bug: +* Site de l'application: +* Dépôt de l'application principale: +* Site web YunoHost: --- @@ -70,7 +61,8 @@ DokuWiki est un logiciel wiki Open Source simple à utiliser et très polyvalent Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing --debug ou sudo yunohost app upgrade dokuwiki -u https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing --debug diff --git a/conf/app.src b/conf/app.src index e42acb7..4021565 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://download.dokuwiki.org/src/dokuwiki/dokuwiki-2018-04-22a.tgz -SOURCE_SUM=18765a29508f96f9882349a304bffc03 -SOURCE_SUM_PRG=md5sum +SOURCE_URL=https://download.dokuwiki.org/src/dokuwiki/dokuwiki-2018-04-22b.tgz +SOURCE_SUM=9d1437cdc7e98e471ff32079f7ca224ccf52dbbaafed39ec9746b0405b3a29ce +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= diff --git a/dokuwikimainwindow.png b/dokuwikimainwindow.png new file mode 100644 index 0000000000000000000000000000000000000000..c357376b781f55d9cfe7d6505bbc679a4dd41e8d GIT binary patch literal 21486 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 literal 0 HcmV?d00001 diff --git a/manifest.json b/manifest.json index 1c3ae56..503c689 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "es": "DokuWiki es un sistema de Wiki de uso sencillicimo y compatible con los estándares.", "it": "DokuWiki è un Wiki aderente agli standard, semplice da usare, finalizzato principalmente alla creazione di documentazione di qualsiasi tipo." }, - "version": "2018-04-22a~ynh3", + "version": "2018-04-22b~ynh1", "url": "https://www.dokuwiki.org", "license": "GPL-2.0-or-later", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md index fceb723..8f984e1 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -2,7 +2,7 @@ - *Description of why you made this PR* ## Solution -- *And how you fix that* +- *And how do you fix that problem* ## PR Status - [ ] Code finished. @@ -13,12 +13,10 @@ ## Validation --- -*Minor decision* -- **Upgrade previous version** : - [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/dokuwiki_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/dokuwiki_ynh%20PR-NUM-/) +- [ ] **Approval (LGTM)** : +*Code review and approval have to be from a member of @YunoHost-Apps/apps-group* +- **CI succeeded** : +[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/dokuwiki_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/dokuwiki_ynh%20PR-NUM-/) *Please replace '-NUM-' in this link by the PR number.* When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.