mirror of
https://github.com/YunoHost-Apps/dokuwiki_ynh.git
synced 2024-09-03 18:26:20 +02:00
Testing (#69)
- Upgrade PHP to version 7.3 - Upgrade to version 2020-07-29
This commit is contained in:
Éric Gaspar
GitHub
parent
2e7ac608ed
commit
05c37a6443
16 changed files with 186 additions and 117 deletions
69
CHANGELOG.md
Normal file
69
CHANGELOG.md
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
# Changelog
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [2018-04-22a~ynhXX]
|
||||
|
||||
### Added
|
||||
|
||||
- Upgrade actions and config-panel scripts
|
||||
|
||||
------------
|
||||
|
||||
## [2020-07-29~ynh2] - 2020-10-23
|
||||
|
||||
### Added
|
||||
|
||||
- New DokuWiki version `2020-07-29`
|
||||
|
||||
### Changed
|
||||
|
||||
- Set PHP7.3 as default
|
||||
|
||||
## [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)
|
||||
33
README.md
33
README.md
|
|
@ -1,6 +1,6 @@
|
|||
# DokuWiki for YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dokuwiki)
|
||||
[](https://dash.yunohost.org/appci/app/dokuwiki)  
|
||||
[](https://install-app.yunohost.org/?app=dokuwiki)
|
||||
|
||||
*[Lire ce readme en français.](./README_fr.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:** 2020-07-29
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
||||
|
||||
|
||||
## Demo
|
||||
|
||||
|
|
@ -38,38 +38,27 @@ DokuWiki is a simple to use and highly versatile Open Source wiki software that
|
|||
|
||||
### Supported architectures
|
||||
|
||||
* x86-64b - [](https://ci-apps.yunohost.org/ci/apps/dokuwiki/)
|
||||
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/dokuwiki/)
|
||||
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/dokuwiki/)
|
||||
* Jessie x86-64b - [](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
|
||||
* Cannot create or login with DokuWiki internal users, only users from YunoHost (Work needed for [authchained plugin](https://www.dokuwiki.org/plugin:authchained))
|
||||
|
||||
## 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: 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
|
||||
|
||||
---
|
||||
|
||||
## Developers infos
|
||||
|
||||
**Only if you know what you are doing AND want to switch to an unstable branch for testing or coding**
|
||||
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing)
|
||||
|
||||
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.
|
||||
To try the testing branch, please proceed like that.
|
||||
```
|
||||
sudo yunohost app install https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing --debug
|
||||
or
|
||||
|
|
|
|||
40
README_fr.md
40
README_fr.md
|
|
@ -1,22 +1,22 @@
|
|||
# Dokuwiki pour YunoHost
|
||||
# DokuWiki pour YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dokuwiki)
|
||||
[](https://install-app.yunohost.org/?app=dokuwiki)
|
||||
[](https://dash.yunohost.org/appci/app/dokuwiki)  
|
||||
[](https://install-app.yunohost.org/?app=dokuwiki)
|
||||
|
||||
*[Read this readme in english.](./README.md)*
|
||||
|
||||
> *Ce package vous permet d'installer Dokuwiki rapidement et simplement sur un serveur Yunohost.
|
||||
> *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.*
|
||||
|
||||
## Vue d'ensemble
|
||||
|
||||
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:** 2020-07-29
|
||||
|
||||
## Captures d'écran
|
||||
|
||||
|
||||
|
||||
|
||||
## 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 : https://www.dokuwiki.org/manual
|
||||
* Documentation YunoHost : https://yunohost.org/#/app_dokuwiki
|
||||
|
||||
## Caractéristiques spécifiques YunoHost
|
||||
|
||||
|
|
@ -38,39 +38,33 @@ DokuWiki est un logiciel wiki Open Source simple à utiliser et très polyvalent
|
|||
|
||||
### Architectures matérielles supportées
|
||||
|
||||
* x86-64b - [](https://ci-apps.yunohost.org/ci/apps/dokuwiki/)
|
||||
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/dokuwiki/)
|
||||
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/dokuwiki/)
|
||||
* Jessie x86-64b - [](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))
|
||||
* 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 : 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/
|
||||
|
||||
---
|
||||
|
||||
## Informations pour les développeurs
|
||||
|
||||
**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.**
|
||||
|
||||
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing).
|
||||
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/dokuwiki_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
|
||||
|
|
|
|||
|
|
@ -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://github.com/splitbrain/dokuwiki/archive/release_stable_2020-07-29.tar.gz
|
||||
SOURCE_SUM=cc1cd9f00095fea327baa79d8f02c904fe1c37bc3f8fd9999eaf646ee9928884
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=tar.gz
|
||||
SOURCE_IN_SUBDIR=true
|
||||
SOURCE_FILENAME=
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ location __PATH__/ {
|
|||
|
||||
location ~ [^/]\.php(/|$) {
|
||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||
fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
|
||||
fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
|
||||
|
||||
fastcgi_index index.php;
|
||||
include fastcgi_params;
|
||||
|
|
@ -39,12 +39,12 @@ location __PATH__/ {
|
|||
}
|
||||
|
||||
# Deny Access to htaccess-Files for Apache
|
||||
location ~ /\.ht {
|
||||
location ~ __PATH__/\.ht {
|
||||
deny all;
|
||||
}
|
||||
|
||||
# Serve static files
|
||||
location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
|
||||
location ~ ^__PATH__/lib.*\.(gif|png|ico|jpg)$ {
|
||||
expires 30d;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ group = __USER__
|
|||
; (IPv6 and IPv4-mapped) on a specific port;
|
||||
; '/path/to/unix/socket' - to listen on a unix socket.
|
||||
; Note: This value is mandatory.
|
||||
listen = /var/run/php/php7.0-fpm-__NAMETOCHANGE__.sock
|
||||
listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock
|
||||
|
||||
; Set listen(2) backlog.
|
||||
; Default Value: 511 (-1 on FreeBSD and OpenBSD)
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
"id": "dokuwiki",
|
||||
"packaging_format": 1,
|
||||
"description": {
|
||||
"en": "DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database.",
|
||||
"fr": "DokuWiki est un wiki Open Source simple à utiliser et très polyvalent qui n'exige aucune base de données.",
|
||||
"de": "DokuWiki ist ein standardkonformes, einfach zu benutzendes Wiki und zielt hauptsächlich auf die Erstellung von Dokumentationen aller Art ab.",
|
||||
"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."
|
||||
"en": "A lightweight, simple to use and highly versatile wiki",
|
||||
"fr": "Un wiki léger, simple à utiliser et très polyvalent",
|
||||
"de": "Ein standardkonformes, einfach zu benutzendes Wiki und zielt hauptsächlich auf die Erstellung von Dokumentationen aller Art ab.",
|
||||
"es": "Un sistema de Wiki de uso sencillicimo y compatible con los estándares.",
|
||||
"it": "Un Wiki aderente agli standard, semplice da usare, finalizzato principalmente alla creazione di documentazione di qualsiasi tipo."
|
||||
},
|
||||
"version": "2018-04-22a~ynh3",
|
||||
"version": "2020-07-29~ynh2",
|
||||
"url": "https://www.dokuwiki.org",
|
||||
"license": "GPL-2.0-or-later",
|
||||
"maintainer": {
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
"email": "opi@zeropi.net"
|
||||
}],
|
||||
"requirements": {
|
||||
"yunohost": ">= 3.5.0"
|
||||
"yunohost": ">= 3.8.1"
|
||||
},
|
||||
"multi_instance": true,
|
||||
"services": [
|
||||
|
|
@ -63,10 +63,10 @@
|
|||
"name": "is_public",
|
||||
"type": "boolean",
|
||||
"ask": {
|
||||
"en": "Is it a public DokuWiki site ?",
|
||||
"en": "Is it a public DokuWiki site?",
|
||||
"fr": "Est-ce un site public ?"
|
||||
},
|
||||
"default": "true"
|
||||
"default": true
|
||||
},
|
||||
{
|
||||
"name": "language",
|
||||
|
|
|
|||
|
|
@ -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,11 +13,9 @@
|
|||
|
||||
## Validation
|
||||
---
|
||||
*Minor decision*
|
||||
- **Upgrade previous version** :
|
||||
- [ ] **Code review** :
|
||||
- [ ] **Approval (LGTM)** :
|
||||
- [ ] **Approval (LGTM)** :
|
||||
*Code review and approval have to be from a member of @YunoHost-Apps/apps-group*
|
||||
- **CI succeeded** :
|
||||
[](https://ci-apps-hq.yunohost.org/jenkins/job/dokuwiki_ynh%20PR-NUM-/)
|
||||
*Please replace '-NUM-' in this link by the PR number.*
|
||||
|
|
|
|||
|
|
@ -1 +1,19 @@
|
|||
#!/bin/bash
|
||||
|
||||
#=================================================
|
||||
# COMMON VARIABLES
|
||||
#=================================================
|
||||
|
||||
YNH_PHP_VERSION="7.3"
|
||||
|
||||
#=================================================
|
||||
# PERSONAL HELPERS
|
||||
#=================================================
|
||||
|
||||
#=================================================
|
||||
# EXPERIMENTAL HELPERS
|
||||
#=================================================
|
||||
|
||||
#=================================================
|
||||
# FUTURE OFFICIAL HELPERS
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -19,40 +19,40 @@ ynh_abort_if_errors
|
|||
#=================================================
|
||||
# LOAD SETTINGS
|
||||
#=================================================
|
||||
ynh_script_progression --message="Loading installation settings..."
|
||||
ynh_print_info --message="Loading installation settings..."
|
||||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
#=================================================
|
||||
# STANDARD BACKUP STEPS
|
||||
# DECLARE DATA AND CONF FILES TO BACKUP
|
||||
#=================================================
|
||||
ynh_print_info --message="Declaring files to be backed up..."
|
||||
|
||||
#=================================================
|
||||
# BACKUP THE APP MAIN DIR
|
||||
#=================================================
|
||||
ynh_script_progression --message="Backing up the main app directory..."
|
||||
|
||||
ynh_backup --src_path="$final_path"
|
||||
|
||||
#=================================================
|
||||
# BACKUP THE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Backing up nginx web server configuration..."
|
||||
|
||||
ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# BACKUP THE PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Backing up php-fpm configuration..." --weight=2
|
||||
|
||||
ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf"
|
||||
ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# BACKUP FAIL2BAN CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Backing up fail2ban configuration..."
|
||||
|
||||
ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf"
|
||||
ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
|
||||
|
|
@ -61,4 +61,4 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
|
|||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
||||
ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last
|
||||
ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
|
||||
|
|
|
|||
|
|
@ -50,23 +50,23 @@ fi
|
|||
#=================================================
|
||||
# MODIFY URL IN NGINX CONF
|
||||
#=================================================
|
||||
ynh_script_progression --message="Updating nginx web server configuration..." --weight=2
|
||||
ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2
|
||||
|
||||
nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
|
||||
|
||||
# Change the path in the nginx config file
|
||||
# Change the path in the NGINX config file
|
||||
if [ $change_path -eq 1 ]
|
||||
then
|
||||
# Make a backup of the original nginx config file if modified
|
||||
# Make a backup of the original NGINX config file if modified
|
||||
ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
|
||||
# Set global variables for nginx helper
|
||||
# Set global variables for NGINX helper
|
||||
domain="$old_domain"
|
||||
path_url="$new_path"
|
||||
# Create a dedicated nginx config
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
fi
|
||||
|
||||
# Change the domain for nginx
|
||||
# Change the domain for NGINX
|
||||
if [ $change_domain -eq 1 ]
|
||||
then
|
||||
# Delete file checksum for the old conf file location
|
||||
|
|
@ -81,7 +81,7 @@ fi
|
|||
#=================================================
|
||||
# UPGRADE FAIL2BAN
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reconfiguring fail2ban..." --weight=6
|
||||
ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=6
|
||||
|
||||
ynh_add_fail2ban_config --logpath="/var/log/nginx/$new_domain-error.log" --failregex="^.*authentication failure. while reading response header from upstream, client: <HOST>,.*POST $new_path.*$" --max_retry=5
|
||||
|
||||
|
|
@ -90,7 +90,7 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$new_domain-error.log" --failr
|
|||
#=================================================
|
||||
# RELOAD NGINX
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reloading nginx web server..."
|
||||
ynh_script_progression --message="Reloading NGINX web server..."
|
||||
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ ynh_setup_source --dest_dir="$final_path"
|
|||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring nginx web server..." --weight=2
|
||||
ynh_script_progression --message="Configuring NGINX web server..." --weight=2
|
||||
|
||||
# Create a dedicated nginx config
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
|
|
@ -80,17 +80,18 @@ ynh_system_user_create --username=$app
|
|||
#=================================================
|
||||
# PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring php-fpm..." --weight=2
|
||||
ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
|
||||
|
||||
# Create a dedicated php-fpm config
|
||||
# Create a dedicated PHP-FPM config
|
||||
ynh_add_fpm_config
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC SETUP
|
||||
#=================================================
|
||||
# CUSTOMIZE DOKUWIKI
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring dokuwiki..." --weight=2
|
||||
ynh_script_progression --message="Configuring DokuWiki..." --weight=2
|
||||
|
||||
# Loading order of configuration files
|
||||
#
|
||||
|
|
@ -103,8 +104,8 @@ ynh_script_progression --message="Configuring dokuwiki..." --weight=2
|
|||
# See https://www.dokuwiki.org/plugin:config#protecting_settings
|
||||
|
||||
|
||||
### Copy Yunohost specific configuration
|
||||
# This File cannot be modified directly by Dokuwiki, only by hand or by Yunohost
|
||||
### Copy YunoHost specific configuration
|
||||
# This File cannot be modified directly by DokuWiki, only by hand or by YunoHost
|
||||
# It will only be updated by Yunohost package or directly by adventurous users
|
||||
cp ../conf/local.protected.php $final_path/conf
|
||||
|
||||
|
|
@ -112,7 +113,7 @@ cp ../conf/local.protected.php $final_path/conf
|
|||
ynh_replace_string --match_string="__YNH_ADMIN_USER__" --replace_string="$admin" --target_file="$final_path/conf/local.protected.php"
|
||||
|
||||
|
||||
# This file might be modified by dokuwiki admin panel or by plugins
|
||||
# This file might be modified by DokuWiki admin panel or by plugins
|
||||
# It will not be modified by Yunohost in order to keep user settings
|
||||
cp ../conf/local.php $final_path/conf
|
||||
|
||||
|
|
@ -159,7 +160,7 @@ ynh_store_file_checksum --file="$final_path/conf/local.protected.php"
|
|||
#=================================================
|
||||
# INSTALL LOGAUTHERROR PLUGIN FOR FAIL2BAN
|
||||
#=================================================
|
||||
ynh_script_progression --message="Installing logautherror plugin for fail2ban..." --weight=2
|
||||
ynh_script_progression --message="Installing logautherror plugin for Fail2Ban..." --weight=2
|
||||
|
||||
ynh_setup_source --dest_dir="$final_path/lib/plugins/logautherror" --source_id=logautherror
|
||||
|
||||
|
|
@ -209,7 +210,7 @@ find $final_path/lib -type d -print0 | xargs -0 chmod 0755
|
|||
#=================================================
|
||||
# SETUP FAIL2BAN
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring fail2ban..." --weight=7
|
||||
ynh_script_progression --message="Configuring Fail2Ban..." --weight=7
|
||||
|
||||
ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex="^.*authentication failure. while reading response header from upstream, client: <HOST>,.*POST $path_url.*$" --max_retry=5
|
||||
|
||||
|
|
@ -228,7 +229,7 @@ fi
|
|||
#=================================================
|
||||
# RELOAD NGINX
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reloading nginx web server..."
|
||||
ynh_script_progression --message="Reloading NGINX web server..."
|
||||
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
||||
|
|
|
|||
|
|
@ -32,23 +32,23 @@ ynh_secure_remove --file="$final_path"
|
|||
#=================================================
|
||||
# REMOVE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Removing nginx web server configuration..."
|
||||
ynh_script_progression --message="Removing NGINX web server configuration..."
|
||||
|
||||
# Remove the dedicated nginx config
|
||||
# Remove the dedicated NGINX config
|
||||
ynh_remove_nginx_config
|
||||
|
||||
#=================================================
|
||||
# REMOVE PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Removing php-fpm configuration..." --weight=2
|
||||
ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2
|
||||
|
||||
# Remove the dedicated php-fpm config
|
||||
# Remove the dedicated PHP-FPM config
|
||||
ynh_remove_fpm_config
|
||||
|
||||
#=================================================
|
||||
# REMOVE FAIL2BAN CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Removing fail2ban configuration..." --weight=7
|
||||
ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=7
|
||||
|
||||
ynh_remove_fail2ban_config
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ app=$YNH_APP_INSTANCE_NAME
|
|||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
#=================================================
|
||||
# CHECK IF THE APP CAN BE RESTORED
|
||||
|
|
@ -89,12 +90,12 @@ chown -R $app:root $final_path/lib/tpl
|
|||
# RESTORE THE PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
|
||||
ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf"
|
||||
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# RESTORE FAIL2BAN CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the fail2ban configuration..." --weight=7
|
||||
ynh_script_progression --message="Restoring the Fail2Ban configuration..." --weight=7
|
||||
|
||||
ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf"
|
||||
ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf"
|
||||
|
|
@ -105,9 +106,9 @@ ynh_systemd_action --action=restart --service_name=fail2ban
|
|||
#=================================================
|
||||
# RELOAD NGINX AND PHP-FPM
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=2
|
||||
ynh_script_progression --message="Reloading NGINX web server and PHP-FPM.." --weight=2
|
||||
|
||||
ynh_systemd_action --service_name=php7.0-fpm --action=reload
|
||||
ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
|
|||
admin=$(ynh_app_setting_get --app=$app --key=admin)
|
||||
is_public=$(ynh_app_setting_get --app=$app --key=is_public)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
#=================================================
|
||||
# CHECK VERSION
|
||||
|
|
@ -61,12 +62,10 @@ if [ -z "$language" ]; then
|
|||
ynh_app_setting_set --app=$app --key=language --value=$language
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Yunohost specific configuration, if it isn't exist already
|
||||
# YunoHost specific configuration, if it isn't exist already
|
||||
|
||||
# Previously, these settings were store in an unique "dokuwiki.php"
|
||||
# Now, they are split in multiple files to ease upgrading process (separate Yunohost config from user config)
|
||||
# Now, they are split in multiple files to ease upgrading process (separate YunoHost config from user config)
|
||||
|
||||
# Loading order of configuration files
|
||||
#
|
||||
|
|
@ -176,9 +175,9 @@ fi
|
|||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=2
|
||||
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
|
||||
|
||||
# Create a dedicated nginx config
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
|
|
@ -192,9 +191,9 @@ ynh_system_user_create --username=$app
|
|||
#=================================================
|
||||
# PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading php-fpm configuration..."
|
||||
ynh_script_progression --message="Upgrading PHP-FPM configuration..."
|
||||
|
||||
# Create a dedicated php-fpm config
|
||||
# Create a dedicated PHP-FPM config
|
||||
ynh_add_fpm_config
|
||||
|
||||
#=================================================
|
||||
|
|
@ -203,7 +202,7 @@ ynh_add_fpm_config
|
|||
|
||||
if [ "$upgrade_type" == "UPGRADE_APP" ]
|
||||
then
|
||||
ynh_script_progression --message="Upgrading dokuwiki..." --weight=7
|
||||
ynh_script_progression --message="Upgrading DokuWiki..." --weight=7
|
||||
|
||||
# Remove upgrade notification inside Dokuwiki's admin panel
|
||||
# See https://www.dokuwiki.org/update_check
|
||||
|
|
@ -256,7 +255,7 @@ ynh_store_file_checksum --file="$final_path/conf/local.protected.php"
|
|||
#=================================================
|
||||
# INSTALL LOGAUTHERROR PLUGIN FOR FAIL2BAN
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading logautherror plugin for fail2ban..." --weight=2
|
||||
ynh_script_progression --message="Upgrading logautherror plugin for Fail2Ban..." --weight=2
|
||||
|
||||
ynh_setup_source --dest_dir="$final_path/lib/plugins/logautherror" --source_id=logautherror
|
||||
|
||||
|
|
@ -306,7 +305,7 @@ find $final_path/lib -type d -print0 | xargs -0 chmod 0755
|
|||
#=================================================
|
||||
# SETUP FAIL2BAN
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reconfiguring fail2ban..." --weight=7
|
||||
ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=7
|
||||
|
||||
ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex="^.*authentication failure. while reading response header from upstream, client: <HOST>,.*POST $path_url.*$" --max_retry=5
|
||||
|
||||
|
|
@ -329,7 +328,7 @@ fi
|
|||
#=================================================
|
||||
# RELOAD NGINX
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reloading nginx web server..."
|
||||
ynh_script_progression --message="Reloading NGINX web server..."
|
||||
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
||||
|
|
|
|||
BIN
sources/DokuWiki_Screenshot.png
Normal file
BIN
sources/DokuWiki_Screenshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 138 KiB |
Loading…
Add table
Reference in a new issue