YunoHost-Apps/yacy_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/yacy_ynh.git synced 2024-09-03 18:05:59 +02:00
Code Issues Activity Actions

Merge pull request #12 from YunoHost-Apps/testing

Browse source 
Upgrade
This commit is contained in:
yalh76 2022-07-07 08:25:58 +02:00 • committed by GitHub
commit a23bf8f2a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 70 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# YaCy for YunoHost # YaCy for YunoHost
[![Integration level](https://dash.yunohost.org/integration/yacy.svg)](https://dash.yunohost.org/appci/app/yacy) ![](https://ci-apps.yunohost.org/ci/badges/yacy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yacy.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/yacy.svg)](https://dash.yunohost.org/appci/app/yacy) ![Working status](https://ci-apps.yunohost.org/ci/badges/yacy.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yacy.maintain.svg)
[![Install YaCy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yacy) [![Install YaCy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yacy)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -18,30 +18,37 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
The YaCy search engine software provides results from a network of independent peers, instead of a central server. It is a distributed network where no single entity decides what to list or order it appears in. The YaCy search engine software provides results from a network of independent peers, instead of a central server. It is a distributed network where no single entity decides what to list or order it appears in.
**Shipped version:** 1.0~ynh1 **Shipped version:** 1.924~ynh1
## Screenshots ## Screenshots
![](./doc/screenshots/screenshot01.png) ![Screenshot of YaCy](./doc/screenshots/screenshot01.png)
## Disclaimers / important information
You can reset the Yacy administration password from the commande line using:
```
sudo -u yacy YACY_DATA_PATH=/home/yunohost.app/yacy/DATA /var/www/yacy/bin/passwd.sh youpassword
```
## Documentation and resources ## Documentation and resources
* Official app website: https://yacy.net/ * Official app website: <https://yacy.net/>
* Upstream app code repository: https://github.com/yacy/yacy_search_server * Upstream app code repository: <https://github.com/yacy/yacy_search_server>
* YunoHost documentation for this app: https://yunohost.org/app_yacy * YunoHost documentation for this app: <https://yunohost.org/app_yacy>
* Report a bug: https://github.com/YunoHost-Apps/yacy_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/yacy_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/yacy_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/yacy_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug
or or
sudo yunohost app upgrade yacy -u https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug sudo yunohost app upgrade yacy -u https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

35
README_fr.md
View file

@ -1,10 +1,14 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# YaCy pour YunoHost # YaCy pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/yacy.svg)](https://dash.yunohost.org/appci/app/yacy) ![](https://ci-apps.yunohost.org/ci/badges/yacy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yacy.maintain.svg) [![Niveau d'intégration](https://dash.yunohost.org/integration/yacy.svg)](https://dash.yunohost.org/appci/app/yacy) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yacy.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yacy.maintain.svg)
[![Installer YaCy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yacy) [![Installer YaCy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yacy)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer YaCy rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d'installer YaCy 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.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -14,30 +18,37 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
The YaCy search engine software provides results from a network of independent peers, instead of a central server. It is a distributed network where no single entity decides what to list or order it appears in. The YaCy search engine software provides results from a network of independent peers, instead of a central server. It is a distributed network where no single entity decides what to list or order it appears in.
**Version incluse :** 1.0~ynh1 **Version incluse :** 1.924~ynh1
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/screenshot01.png) ![Capture d'écran de YaCy](./doc/screenshots/screenshot01.png)
## Avertissements / informations importantes
You can reset the Yacy administration password from the commande line using:
```
sudo -u yacy YACY_DATA_PATH=/home/yunohost.app/yacy/DATA /var/www/yacy/bin/passwd.sh youpassword
```
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : https://yacy.net/ * Site officiel de l'app : <https://yacy.net/>
* Dépôt de code officiel de l'app : https://github.com/yacy/yacy_search_server * Dépôt de code officiel de l'app : <https://github.com/yacy/yacy_search_server>
* Documentation YunoHost pour cette app : https://yunohost.org/app_yacy * Documentation YunoHost pour cette app : <https://yunohost.org/app_yacy>
* Signaler un bug : https://github.com/YunoHost-Apps/yacy_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/yacy_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/yacy_ynh/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/yacy_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade yacy -u https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug sudo yunohost app upgrade yacy -u https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

7
check_process
View file

@ -2,6 +2,7 @@
; Manifest ; Manifest
domain="domain.tld" domain="domain.tld"
path="/path" path="/path"
password="1Strong-Password"
; Checks ; Checks
pkg_linter=1 pkg_linter=1
setup_sub_dir=1 setup_sub_dir=1
@ -10,7 +11,8 @@
setup_private=0 setup_private=0
setup_public=0 setup_public=0
upgrade=1 upgrade=1
#upgrade=1 from_commit=CommitHash # 1.0~ynh1
upgrade=1 from_commit=ca4d54e5e6c1bc7d772e375f6193b46f886034a5
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
port_already_use=0 port_already_use=0
@ -18,6 +20,3 @@
;;; Options ;;; Options
Email= Email=
Notification=none Notification=none
;;; Upgrade options
; commit=CommitHash
name=Name and date of the commit.

5
doc/DISCLAIMER.md
View file

@ -0,0 +1,5 @@
You can reset the Yacy administration password from the commande line using:
```
sudo -u yacy YACY_DATA_PATH=/home/yunohost.app/yacy/DATA /var/www/yacy/bin/passwd.sh youpassword
```

6
manifest.json
View file

@ -6,14 +6,14 @@
"en": "Free and decentralized search engine", "en": "Free and decentralized search engine",
"fr": "Moteur de recherche libre et décentralisé" "fr": "Moteur de recherche libre et décentralisé"
}, },
"version": "1.0~ynh1", "version": "1.924~ynh1",
"url": "https://yacy.net/", "url": "https://yacy.net/",
"upstream": { "upstream": {
"license": "free", "license": "GPL-2.0-or-later",
"website": "https://yacy.net/", "website": "https://yacy.net/",
"code": "https://github.com/yacy/yacy_search_server" "code": "https://github.com/yacy/yacy_search_server"
}, },
"license": "free", "license": "GPL-2.0-or-later",
"maintainer": { "maintainer": {
"name": "Moul", "name": "Moul",
"email": "moul@moul.re", "email": "moul@moul.re",

2
scripts/backup
View file

@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers
#================================================= #=================================================
ynh_clean_setup () { ynh_clean_setup () {
ynh_clean_check_starting true
} }
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors

4
scripts/install
View file

@ -25,7 +25,7 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH path_url=$YNH_APP_ARG_PATH
password=$YNH_APP_ARG_PASSWORD password="$YNH_APP_ARG_PASSWORD"
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
@ -126,7 +126,7 @@ ynh_script_progression --message="Configuring Yacy..."
ynh_systemd_action --service_name=$app --action="start" --log_path="$datadir/DATA/LOG/yacy00.log" --line_match="Started httpd:" ynh_systemd_action --service_name=$app --action="start" --log_path="$datadir/DATA/LOG/yacy00.log" --line_match="Started httpd:"
ynh_exec_as $app YACY_DATA_PATH=$datadir/DATA $final_path/bin/passwd.sh $password ynh_exec_as $app YACY_DATA_PATH=$datadir/DATA $final_path/bin/passwd.sh "$password"
ynh_systemd_action --service_name=$app --action="stop" --log_path="$datadir/DATA/LOG/yacy00.log" ynh_systemd_action --service_name=$app --action="stop" --log_path="$datadir/DATA/LOG/yacy00.log"

14
scripts/restore
View file

@ -42,13 +42,6 @@ test ! -d $final_path \
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX web server configuration..."
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RECREATE THE DEDICATED USER # RECREATE THE DEDICATED USER
#================================================= #=================================================
@ -91,6 +84,13 @@ ynh_script_progression --message="Reinstalling dependencies..."
# Define and install dependencies # Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX web server configuration..."
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RESTORE SYSTEMD # RESTORE SYSTEMD
#================================================= #=================================================

20
scripts/upgrade
View file

@ -18,9 +18,9 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path) path_url=$(ynh_app_setting_get --app=$app --key=path)
language=$(ynh_app_setting_get --app=$app --key=language)
admin=$(ynh_app_setting_get --app=$app --key=admin) admin=$(ynh_app_setting_get --app=$app --key=admin)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
language=$(ynh_app_setting_get --app=$app --key=language)
datadir=$(ynh_app_setting_get --app=$app --key=datadir) datadir=$(ynh_app_setting_get --app=$app --key=datadir)
port=$(ynh_app_setting_get --app=$app --key=port) port=$(ynh_app_setting_get --app=$app --key=port)
@ -91,6 +91,13 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# UPGRADE DEPENDENCIES
#=================================================
ynh_script_progression --message="Upgrading dependencies..."
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
#================================================= #=================================================
@ -99,19 +106,8 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
# Create a dedicated NGINX config # Create a dedicated NGINX config
ynh_add_nginx_config ynh_add_nginx_config
#=================================================
# UPGRADE DEPENDENCIES
#=================================================
ynh_script_progression --message="Upgrading dependencies..."
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# SPECIFIC UPGRADE # SPECIFIC UPGRADE
#=================================================
# ...
#=================================================
#================================================= #=================================================
# UPDATE A CONFIG FILE # UPDATE A CONFIG FILE
#================================================= #=================================================