diff --git a/README.md b/README.md index de958fd..8995294 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # 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) *[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. -**Shipped version:** 1.0~ynh1 - - +**Shipped version:** 1.924~ynh1 ## 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 -* Official app website: https://yacy.net/ -* Upstream app code repository: https://github.com/yacy/yacy_search_server -* YunoHost documentation for this app: https://yunohost.org/app_yacy -* Report a bug: https://github.com/YunoHost-Apps/yacy_ynh/issues +* Official app website: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info 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. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug or 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 \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 97000cb..f090ceb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # 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) *[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. 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. -**Version incluse :** 1.0~ynh1 - - +**Version incluse :** 1.924~ynh1 ## 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 -* Site officiel de l'app : https://yacy.net/ -* 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 -* Signaler un bug : https://github.com/YunoHost-Apps/yacy_ynh/issues +* Site officiel de l'app : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs 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. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/yacy_ynh/tree/testing --debug ou 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 \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** diff --git a/check_process b/check_process index 78ce1da..1dbabd7 100644 --- a/check_process +++ b/check_process @@ -2,6 +2,7 @@ ; Manifest domain="domain.tld" path="/path" + password="1Strong-Password" ; Checks pkg_linter=1 setup_sub_dir=1 @@ -10,7 +11,8 @@ setup_private=0 setup_public=0 upgrade=1 - #upgrade=1 from_commit=CommitHash + # 1.0~ynh1 + upgrade=1 from_commit=ca4d54e5e6c1bc7d772e375f6193b46f886034a5 backup_restore=1 multi_instance=0 port_already_use=0 @@ -18,6 +20,3 @@ ;;; Options Email= Notification=none -;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..f7024c9 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -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 +``` diff --git a/manifest.json b/manifest.json index 26b2801..173f800 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,14 @@ "en": "Free and decentralized search engine", "fr": "Moteur de recherche libre et décentralisé" }, - "version": "1.0~ynh1", + "version": "1.924~ynh1", "url": "https://yacy.net/", "upstream": { - "license": "free", + "license": "GPL-2.0-or-later", "website": "https://yacy.net/", "code": "https://github.com/yacy/yacy_search_server" }, - "license": "free", + "license": "GPL-2.0-or-later", "maintainer": { "name": "Moul", "email": "moul@moul.re", diff --git a/scripts/backup b/scripts/backup index da811a8..d8cb0be 100644 --- a/scripts/backup +++ b/scripts/backup @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - ynh_clean_check_starting + true } # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/install b/scripts/install index 25fd68f..11617b0 100644 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH -password=$YNH_APP_ARG_PASSWORD +password="$YNH_APP_ARG_PASSWORD" 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_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" diff --git a/scripts/restore b/scripts/restore index 9a75a92..f68ac69 100644 --- a/scripts/restore +++ b/scripts/restore @@ -42,13 +42,6 @@ test ! -d $final_path \ #================================================= # 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 #================================================= @@ -91,6 +84,13 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install 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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6a74702..c8a6b00 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,9 +18,9 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) 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) 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) port=$(ynh_app_setting_get --app=$app --key=port) @@ -91,6 +91,13 @@ chmod 750 "$final_path" chmod -R o-rwx "$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 #================================================= @@ -99,19 +106,8 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # SPECIFIC UPGRADE -#================================================= -# ... -#================================================= - #================================================= # UPDATE A CONFIG FILE #=================================================