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 0000000..c357376 Binary files /dev/null and b/dokuwikimainwindow.png differ 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.