1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pepettes_ynh.git synced 2024-09-03 19:56:35 +02:00

Merge pull request #15 from YunoHost-Apps/version-2

Version 2
This commit is contained in:
eric_G 2023-09-29 19:14:17 +02:00 committed by GitHub
commit 41e40a9bee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 207 additions and 659 deletions

View file

@ -6,6 +6,7 @@ It shall NOT be edited by hand.
# Pepettes for YunoHost # Pepettes for YunoHost
[![Integration level](https://dash.yunohost.org/integration/pepettes.svg)](https://dash.yunohost.org/appci/app/pepettes) ![Working status](https://ci-apps.yunohost.org/ci/badges/pepettes.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pepettes.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/pepettes.svg)](https://dash.yunohost.org/appci/app/pepettes) ![Working status](https://ci-apps.yunohost.org/ci/badges/pepettes.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pepettes.maintain.svg)
[![Install Pepettes with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pepettes) [![Install Pepettes with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pepettes)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -17,18 +18,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
A simple donation form with stripe A simple donation form with stripe
**Shipped version:** 1.0.1~ynh3 **Shipped version:** 1.0.1~ynh5
**Demo:** https://donate.yunohost.org **Demo:** https://donate.yunohost.org
## Disclaimers / important information
This app may be configured through the `settings.py` after installation.
## Documentation and resources ## Documentation and resources
* Official admin documentation: <https://github.com/YunoHost/pepettes/blob/main/README.md> * Official admin documentation: <https://github.com/YunoHost/pepettes/blob/main/README.md>
* Upstream app code repository: <https://github.com/YunoHost/pepettes/> * Upstream app code repository: <https://github.com/YunoHost/pepettes/>
* YunoHost documentation for this app: <https://yunohost.org/app_pepettes>
* Report a bug: <https://github.com/YunoHost-Apps/pepettes_ynh/issues> * Report a bug: <https://github.com/YunoHost-Apps/pepettes_ynh/issues>
## Developer info ## Developer info

View file

@ -5,30 +5,26 @@ It shall NOT be edited by hand.
# Pepettes pour YunoHost # Pepettes pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/pepettes.svg)](https://dash.yunohost.org/appci/app/pepettes) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pepettes.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pepettes.maintain.svg) [![Niveau dintégration](https://dash.yunohost.org/integration/pepettes.svg)](https://dash.yunohost.org/appci/app/pepettes) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pepettes.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pepettes.maintain.svg)
[![Installer Pepettes avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pepettes) [![Installer Pepettes avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pepettes)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
> *Ce package vous permet d'installer Pepettes rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet dinstaller Pepettes 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 navez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment linstaller et en profiter.*
## Vue d'ensemble ## Vue densemble
Un simple formulaire de don avec stripe A simple donation form with stripe
**Version incluse :** 1.0.1~ynh3 **Version incluse :** 1.0.1~ynh5
**Démo :** https://donate.yunohost.org **Démo :** https://donate.yunohost.org
## Avertissements / informations importantes
This app may be configured through the `settings.py` after installation.
## Documentations et ressources ## Documentations et ressources
* Documentation officielle de l'admin : <https://github.com/YunoHost/pepettes/blob/main/README.md> * Documentation officielle de ladmin : <https://github.com/YunoHost/pepettes/blob/main/README.md>
* Dépôt de code officiel de l'app : <https://github.com/YunoHost/pepettes/> * Dépôt de code officiel de lapp : <https://github.com/YunoHost/pepettes/>
* Documentation YunoHost pour cette app : <https://yunohost.org/app_pepettes>
* Signaler un bug : <https://github.com/YunoHost-Apps/pepettes_ynh/issues> * Signaler un bug : <https://github.com/YunoHost-Apps/pepettes_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
@ -43,4 +39,4 @@ ou
sudo yunohost app upgrade pepettes -u https://github.com/YunoHost-Apps/pepettes_ynh/tree/testing --debug sudo yunohost app upgrade pepettes -u https://github.com/YunoHost-Apps/pepettes_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps> **Plus dinfos sur le packaging dapplications :** <https://yunohost.org/packaging_apps>

View file

@ -1,32 +0,0 @@
;; Test complet
; Manifest
domain="domain.tld"
path="/path"
is_public=1
project_name="YunoHost"
contact_url="https://forum.yunohost.org/t/donate-to-yunohost/9211"
logo="https://yunohost.org/user/images/logo.png"
favicon="https://yunohost.org/user/themes/yunohost-docs/images/favicon.png"
publishable_key="pk_test_gOgGjacs9YfvDJY03BRZ576O"
secret_key="sk_test_aaaaaaaaaaaaaaaaa"
prices="one_time/EUR/price_1IKuPV,recuring/EUR/price_1IKuPV"
; Checks
pkg_linter=1
setup_sub_dir=0
setup_root=1
setup_nourl=0
setup_private=1
setup_public=1
upgrade=1
# 1.0.1~ynh1
upgrade=1 from_commit=5cc2d3ffd6529cc7356ff93af92dbb6785c3ab9a
backup_restore=1
multi_instance=1
port_already_use=0
change_url=1
;;; Options
Email=
Notification=none
;;; Upgrade options
; commit=5cc2d3ffd6529cc7356ff93af92dbb6785c3ab9a
name=1.0.1~ynh1

View file

@ -1,7 +0,0 @@
SOURCE_URL=https://github.com/YunoHost/pepettes/archive/v1.0.1.tar.gz
SOURCE_SUM=9792ed5589d4a55bd619edc7aa61a1a78f34c5a4e7095b2292ac09b66c8b9a58
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=
SOURCE_EXTRACT=true

View file

@ -1,9 +1,9 @@
command = '__FINALPATH__/venv/bin/gunicorn' command = '__INSTALL_DIR__/venv/bin/gunicorn'
pythonpath = '__FINALPATH__' pythonpath = '__INSTALL_DIR__'
workers = 4 workers = 4
user = '__APP__' user = '__APP__'
bind = 'unix:__FINALPATH__/sock' bind = 'unix:__INSTALL_DIR__/sock'
pid = '__FINALPATH__/__APP__-pid' pid = '__INSTALL_DIR__/__APP__-pid'
errorlog = '/var/log/__APP__/error.log' errorlog = '/var/log/__APP__/error.log'
accesslog = '/var/log/__APP__/access.log' accesslog = '/var/log/__APP__/access.log'
access_log_format = '%({X-Real-IP}i)s %({X-Forwarded-For}i)s %(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"' access_log_format = '%({X-Real-IP}i)s %({X-Forwarded-For}i)s %(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'

View file

@ -1,18 +1,16 @@
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ { location __PATH__/ {
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://unix:__FINALPATH__/sock; proxy_pass http://unix:__INSTALL_DIR__/sock;
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }
location __PATH__/css { location __PATH__/css/ {
alias __FINALPATH__/assets/css; alias __INSTALL_DIR__/assets/css;
} }

View file

@ -3,11 +3,11 @@ Description=__APP__ Daemon
After=network.target After=network.target
[Service] [Service]
PIDFile=__FINALPATH__/__APP__-pid PIDFile=__INSTALL_DIR__/__APP__-pid
User=__APP__ User=__APP__
Group=__APP__ Group=__APP__
WorkingDirectory=__FINALPATH__ WorkingDirectory=__INSTALL_DIR__
ExecStart=__FINALPATH__/venv/bin/gunicorn -c __FINALPATH__/gunicorn.py wsgi:app --pid __FINALPATH__/__APP__-pid ExecStart=__INSTALL_DIR__/venv/bin/gunicorn -c __INSTALL_DIR__/gunicorn.py wsgi:app --pid __INSTALL_DIR__/__APP__-pid
ExecReload=/bin/kill -s HUP $MAINPID ExecReload=/bin/kill -s HUP $MAINPID
ExecStop=/bin/kill -s TERM $MAINPID ExecStop=/bin/kill -s TERM $MAINPID
PrivateTmp=true PrivateTmp=true

1
doc/ADMIN.md Normal file
View file

@ -0,0 +1 @@
This app may be configured through the `__INSTALL_DIR__/settings.py` after installation.

1
doc/DESCRIPTION.md Normal file
View file

@ -0,0 +1 @@
A simple donation form with stripe

View file

@ -1 +0,0 @@
This app may be configured through the `settings.py` after installation.

View file

@ -1,114 +0,0 @@
{
"name": "Pepettes",
"id": "pepettes",
"packaging_format": 1,
"description": {
"en": "A simple donation form with stripe",
"fr": "Un simple formulaire de don avec stripe"
},
"version": "1.0.1~ynh3",
"url": "https://github.com/YunoHost/pepettes/",
"upstream": {
"license": "MIT",
"demo": "https://donate.yunohost.org",
"admindoc": "https://github.com/YunoHost/pepettes/blob/main/README.md",
"code": "https://github.com/YunoHost/pepettes/"
},
"license": "MIT",
"maintainer": {
"name": "ljf",
"email": "ljf+pepettes@reflexlibre.net",
"url": "http://reflexlibre.net"
},
"requirements": {
"yunohost": ">= 4.1.3"
},
"multi_instance": true,
"services": [
"nginx"
],
"arguments": {
"install" : [
{
"name": "domain",
"type": "domain",
"example": "example.com"
},
{
"name": "is_public",
"type": "boolean",
"default": true
},
{
"name": "project_name",
"type": "string",
"ask": {
"en": "What's the name of the project which will received donation ?",
"fr": "Quel est le nom du projet qui va recevoir les dons ?"
},
"default": ""
},
{
"name": "contact_url",
"type": "string",
"ask": {
"en": "Indicate a link to contact you to ask for stopping recuring payment",
"fr": "Indiquez un lien pour vous contacter pour arréter les paiements récurrents"
},
"default": ""
},
{
"name": "logo",
"type": "string",
"ask": {
"en": "A link to the logo of your project",
"fr": "Un lien vers le logo de votre projet"
},
"default": ""
},
{
"name": "favicon",
"type": "string",
"ask": {
"en": "A link to the favicon of your project",
"fr": "Un lien vers la favicon de votre projet"
},
"default": ""
},
{
"name": "publishable_key",
"type": "string",
"ask": {
"en": "Indicate here the stripe publishable key",
"fr": "Indiquez ici la clé publique stripe"
},
"default": ""
},
{
"name": "secret_key",
"type": "string",
"ask": {
"en": "Indicate here the stripe secret key",
"fr": "Indiquez ici la clé secrète stripe"
},
"default": ""
},
{
"name": "prices",
"type": "string",
"ask": {
"en": "Indicates here the prices ID of donation products you created in stripe interfaces",
"fr": "Indiquez ici les ID de prix des produits de don stripe que vous avez créé dans l'interface stripe"
},
"default": "one_time/EUR/price_1IKuPV,recuring/EUR/price_1IKuPV",
"help": {
"en": "Go on https://dashboard.stripe.com/products to create those donation products",
"fr": "Allez sur https://dashboard.stripe.com/products pour créer ces produits de dons"
}
}
]
}
}

95
manifest.toml Normal file
View file

@ -0,0 +1,95 @@
packaging_format = 2
id = "pepettes"
name = "Pepettes"
description.en = "Simple donation form with stripe"
description.fr = "Simple formulaire de don avec stripe"
version = "1.0.1~ynh5"
maintainers = ["ljf"]
[upstream]
license = "MIT"
demo = "https://donate.yunohost.org"
admindoc = "https://github.com/YunoHost/pepettes/blob/main/README.md"
code = "https://github.com/YunoHost/pepettes/"
[integration]
yunohost = ">= 11.2"
architectures = "all"
multi_instance = true
ldap = false
sso = false
disk = "50M"
ram.build = "50M"
ram.runtime = "50M"
[install]
[install.domain]
type = "domain"
[install.init_main_permission]
type = "group"
default = "visitors"
[install.project_name]
ask.en = "What's the name of the project which will received donation?"
ask.fr = "Quel est le nom du projet qui va recevoir les dons ?"
type = "string"
default = ""
[install.contact_url]
ask.en = "Indicate a link to contact you to ask for stopping recuring payment"
ask.fr = "Indiquez un lien pour vous contacter pour arréter les paiements récurrents"
type = "string"
default = ""
[install.logo]
ask.en = "A link to the logo of your project"
ask.fr = "Un lien vers le logo de votre projet"
type = "string"
default = ""
[install.favicon]
ask.en = "A link to the favicon of your project"
ask.fr = "Un lien vers la favicon de votre projet"
type = "string"
default = ""
[install.publishable_key]
ask.en = "Indicate here the stripe publishable key"
ask.fr = "Indiquez ici la clé publique stripe"
type = "string"
default = ""
[install.secret_key]
ask.en = "Indicate here the stripe secret key"
ask.fr = "Indiquez ici la clé secrète stripe"
type = "string"
default = ""
[install.prices]
ask.en = "Indicates here the prices ID of donation products you created in stripe interfaces"
ask.fr = "Indiquez ici les ID de prix des produits de don stripe que vous avez créé dans l'interface stripe"
help.en = "Go on https://dashboard.stripe.com/products to create those donation products"
help.fr = "Allez sur https://dashboard.stripe.com/products pour créer ces produits de dons"
type = "string"
default = "one_time/EUR/price_1IKuPV,recuring/EUR/price_1IKuPV"
[resources]
[resources.sources.main]
url = "https://github.com/YunoHost/pepettes/archive/v1.0.1.tar.gz"
sha256 = "9792ed5589d4a55bd619edc7aa61a1a78f34c5a4e7095b2292ac09b66c8b9a58"
[resources.ports]
[resources.system_user]
[resources.install_dir]
[resources.permissions]
main.url = "/"
[resources.apt]
packages = "python3-venv, python3-dev, python3-pip"

View file

@ -4,9 +4,6 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
# dependencies used by the app
pkg_dependencies="python3-venv python3-dev python3-pip"
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS
#================================================= #=================================================

View file

@ -10,26 +10,6 @@
source ../settings/scripts/_common.sh source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#=================================================
# MANAGE SCRIPT FAILURE
#=================================================
ynh_clean_setup () {
true
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
# LOAD 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)
#================================================= #=================================================
# DECLARE DATA AND CONF FILES TO BACKUP # DECLARE DATA AND CONF FILES TO BACKUP
#================================================= #=================================================
@ -39,7 +19,7 @@ ynh_print_info --message="Declaring files to be backed up..."
# BACKUP THE APP MAIN DIR # BACKUP THE APP MAIN DIR
#================================================= #=================================================
ynh_backup --src_path="$final_path" ynh_backup --src_path="$install_dir"
#================================================= #=================================================
# BACKUP THE NGINX CONFIGURATION # BACKUP THE NGINX CONFIGURATION
@ -47,7 +27,6 @@ ynh_backup --src_path="$final_path"
ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# SPECIFIC BACKUP # SPECIFIC BACKUP
#================================================= #=================================================

View file

@ -9,71 +9,6 @@
source _common.sh source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#=================================================
# RETRIEVE ARGUMENTS
#=================================================
old_domain=$YNH_APP_OLD_DOMAIN
old_path=$YNH_APP_OLD_PATH
new_domain=$YNH_APP_NEW_DOMAIN
new_path=$YNH_APP_NEW_PATH
app=$YNH_APP_INSTANCE_NAME
#=================================================
# LOAD SETTINGS
#=================================================
ynh_script_progression --message="Loading installation settings..." --weight=1
# Needed for helper "ynh_add_nginx_config"
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
project_name=$(ynh_app_setting_get --app=$app --key=project_name)
contact_url=$(ynh_app_setting_get --app=$app --key=contact_url)
logo=$(ynh_app_setting_get --app=$app --key=logo)
favicon=$(ynh_app_setting_get --app=$app --key=favicon)
publishable_key=$(ynh_app_setting_get --app=$app --key=publishable_key)
secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
prices=$(ynh_app_setting_get --app=$app --key=prices)
secret=$(ynh_app_setting_get --app=$app --key=secret)
csrf_key=$(ynh_app_setting_get --app=$app --key=csrf_key)
port=$(ynh_app_setting_get --app=$app --key=port)
domain=$new_domain
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
# Backup the current version of the app
ynh_backup_before_upgrade
ynh_clean_setup () {
# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
# Restore it if the upgrade fails
ynh_restore_upgradebackup
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
# CHECK WHICH PARTS SHOULD BE CHANGED
#=================================================
change_domain=0
if [ "$old_domain" != "$new_domain" ]
then
change_domain=1
fi
change_path=0
if [ "$old_path" != "$new_path" ]
then
change_path=1
fi
#================================================= #=================================================
# STANDARD MODIFICATIONS # STANDARD MODIFICATIONS
#================================================= #=================================================
@ -88,29 +23,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --li
#================================================= #=================================================
ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf ynh_change_url_nginx_config
# 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
ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
# Set global variables for NGINX helper
domain="$old_domain"
path_url="$new_path"
# Create a dedicated NGINX config
ynh_add_nginx_config
fi
# Change the domain for NGINX
if [ $change_domain -eq 1 ]
then
# Delete file checksum for the old conf file location
ynh_delete_file_checksum --file="$nginx_conf_path"
mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
# Store file checksum for the new config file location
ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
fi
#================================================= #=================================================
# SPECIFIC MODIFICATIONS # SPECIFIC MODIFICATIONS
@ -119,21 +32,21 @@ fi
#================================================= #=================================================
ynh_script_progression --message="Updating a configuration file..." ynh_script_progression --message="Updating a configuration file..."
ynh_add_config --template="../conf/gunicorn.py" --destination="$final_path/gunicorn.py" ynh_add_config --template="../conf/gunicorn.py" --destination="$install_dir/gunicorn.py"
ynh_add_config --template="../conf/settings.py" --destination="$final_path/settings.py" ynh_add_config --template="../conf/settings.py" --destination="$install_dir/settings.py"
for price in $(echo $prices | sed "s/,/ /"); do for price in $(echo $prices | sed "s/,/ /"); do
frequency=$(echo $price | cut -d/ -f1) frequency=$(echo $price | cut -d/ -f1)
currency=$(echo $price | cut -d/ -f2) currency=$(echo $price | cut -d/ -f2)
price_id=$(echo $price | cut -d/ -f3) price_id=$(echo $price | cut -d/ -f3)
echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$final_path/settings.py" echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$install_dir/settings.py"
done done
ynh_store_file_checksum --file="$final_path/settings.py" ynh_store_file_checksum --file="$install_dir/settings.py"
# Set permissions to app files # Set permissions to app files
chown -R $app:www-data $final_path chown -R $app:www-data $install_dir
chmod o=--- $final_path chmod o=--- $install_dir
#================================================= #=================================================
# GENERIC FINALISATION # GENERIC FINALISATION
@ -145,13 +58,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
# Start a systemd service # Start a systemd service
ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started"
#=================================================
# RELOAD NGINX
#=================================================
ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================

View file

@ -9,122 +9,45 @@
source _common.sh source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#=================================================
# MANAGE SCRIPT FAILURE
#=================================================
ynh_clean_setup () {
true
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#================================================= #=================================================
# RETRIEVE ARGUMENTS FROM THE MANIFEST # RETRIEVE ARGUMENTS FROM THE MANIFEST
#================================================= #=================================================
domain=$YNH_APP_ARG_DOMAIN
path_url="/"
is_public=$YNH_APP_ARG_IS_PUBLIC
project_name=$YNH_APP_ARG_PROJECT_NAME
contact_url=$YNH_APP_ARG_CONTACT_URL
logo=$YNH_APP_ARG_LOGO
favicon=$YNH_APP_ARG_FAVICON
publishable_key=$YNH_APP_ARG_PUBLISHABLE_KEY
secret_key=$YNH_APP_ARG_SECRET_KEY
prices=$YNH_APP_ARG_PRICES
secret=$(ynh_string_random --length=50) secret=$(ynh_string_random --length=50)
csrf_key=$(ynh_string_random --length=50) csrf_key=$(ynh_string_random --length=50)
app=$YNH_APP_INSTANCE_NAME
#=================================================
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
#=================================================
ynh_script_progression --message="Validating installation parameters..." --weight=1
final_path=/var/www/$app
test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
# Register (book) web path
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
#================================================= #=================================================
ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_script_progression --message="Storing installation settings..." --weight=1
ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=project_name --value=$project_name
ynh_app_setting_set --app=$app --key=contact_url --value=$contact_url
ynh_app_setting_set --app=$app --key=logo --value=$logo
ynh_app_setting_set --app=$app --key=favicon --value=$favicon
ynh_app_setting_set --app=$app --key=publishable_key --value=$publishable_key
ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
ynh_app_setting_set --app=$app --key=prices --value=$prices
ynh_app_setting_set --app=$app --key=secret --value=$secret ynh_app_setting_set --app=$app --key=secret --value=$secret
ynh_app_setting_set --app=$app --key=csrf_key --value=$csrf_key ynh_app_setting_set --app=$app --key=csrf_key --value=$csrf_key
#=================================================
# STANDARD MODIFICATIONS
#=================================================
# FIND AND OPEN A PORT
#=================================================
ynh_script_progression --message="Finding an available port..." --weight=1
# Find an available port
port=$(ynh_find_port --port=8102)
ynh_app_setting_set --app=$app --key=port --value=$port
#=================================================
# INSTALL DEPENDENCIES
#=================================================
ynh_script_progression --message="Installing dependencies..." --weight=1
ynh_install_app_dependencies $pkg_dependencies
#=================================================
# CREATE DEDICATED USER
#=================================================
ynh_script_progression --message="Configuring system user..." --weight=1
# Create a system user
ynh_system_user_create --username=$app --home_dir=$final_path
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
ynh_script_progression --message="Setting up source files..." --weight=1 ynh_script_progression --message="Setting up source files..." --weight=1
ynh_app_setting_set --app=$app --key=final_path --value=$final_path
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$install_dir"
chmod 750 "$final_path" chmod -R o-rwx "$install_dir"
chmod -R o-rwx "$final_path" chown -R $app:www-data "$install_dir"
chown -R $app:www-data "$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring NGINX web server..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# SPECIFIC SETUP # SPECIFIC SETUP
#================================================= #=================================================
# INSTALL PYTHON DEPENDENCIES # INSTALL PYTHON DEPENDENCIES
#================================================= #=================================================
ynh_script_progression --message="Installing Python dependencies..." ynh_script_progression --message="Installing Python dependencies..." --weight=1
pushd $final_path pushd $install_dir
python3 -m venv venv python3 -m venv venv
venv/bin/pip install --upgrade pip venv/bin/pip install --upgrade pip
venv/bin/pip install -r requirements.txt venv/bin/pip install -r requirements.txt
venv/bin/pip install gunicorn venv/bin/pip install gunicorn
venv/bin/pybabel compile -d locales/
mkdir -p /var/log/$app mkdir -p /var/log/$app
chown -R $app:www-data /var/log/$app chown -R $app:www-data /var/log/$app
chmod o-rwx /var/log/$app chmod o-rwx /var/log/$app
@ -139,45 +62,43 @@ popd
#================================================= #=================================================
# ADD A CONFIGURATION # ADD A CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file..." ynh_script_progression --message="Adding a configuration file..." --weight=1
ynh_add_config --template="../conf/gunicorn.py" --destination="$final_path/gunicorn.py" ynh_add_config --template="../conf/gunicorn.py" --destination="$install_dir/gunicorn.py"
ynh_add_config --template="../conf/settings.py" --destination="$final_path/settings.py" ynh_add_config --template="../conf/settings.py" --destination="$install_dir/settings.py"
for price in $(echo $prices | sed "s/,/ /"); do for price in $(echo $prices | sed "s/,/ /"); do
frequency=$(echo $price | cut -d/ -f1) frequency=$(echo $price | cut -d/ -f1)
currency=$(echo $price | cut -d/ -f2) currency=$(echo $price | cut -d/ -f2)
price_id=$(echo $price | cut -d/ -f3) price_id=$(echo $price | cut -d/ -f3)
echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$final_path/settings.py" echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$install_dir/settings.py"
done done
ynh_store_file_checksum --file="$final_path/settings.py" ynh_store_file_checksum --file="$install_dir/settings.py"
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD
#================================================= #=================================================
ynh_script_progression --message="Configuring a systemd service..." --weight=1 ynh_script_progression --message="Configuring a systemd service..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
# Create a dedicated systemd config # Create a dedicated systemd config
ynh_add_systemd_config ynh_add_systemd_config
yunohost service add $app --description="Simple donation form" --log="/var/log/$app/$app.log"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION
#================================================= #=================================================
# SECURE FILES AND DIRECTORIES # SECURE FILES AND DIRECTORIES
#================================================= #=================================================
ynh_script_progression --message="Securing files and directories..." ynh_script_progression --message="Securing files and directories..." --weight=1
# Set permissions to app files # Set permissions to app files
chown -R $app:www-data $final_path chown -R $app:www-data $install_dir
chmod o=--- $final_path chmod o=--- $install_dir
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
yunohost service add $app --description="A simple donation form"
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE
@ -187,27 +108,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
# Start a systemd service # Start a systemd service
ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started"
#=================================================
# SETUP SSOWAT
#=================================================
ynh_script_progression --message="Configuring permissions..." --weight=1
# Make app public if necessary
if [ $is_public -eq 1 ]
then
# Everyone can access the app.
# The "main" permission is automatically created before the install script.
ynh_permission_update --permission="main" --add="visitors"
fi
#=================================================
# RELOAD NGINX
#=================================================
ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================

View file

@ -10,21 +10,11 @@ source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#================================================= #=================================================
# LOAD SETTINGS # REMOVE SYSTEM CONFIGURATIONS
#================================================= #=================================================
ynh_script_progression --message="Loading installation settings..." --weight=1 # REMOVE SYSTEMD SERVICE
app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain)
port=$(ynh_app_setting_get --app=$app --key=port)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#=================================================
# STANDARD REMOVE
#=================================================
# REMOVE SERVICE INTEGRATION IN YUNOHOST
#================================================= #=================================================
ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
if ynh_exec_warn_less yunohost service status $app >/dev/null if ynh_exec_warn_less yunohost service status $app >/dev/null
@ -33,58 +23,15 @@ then
yunohost service remove $app yunohost service remove $app
fi fi
#=================================================
# STOP AND REMOVE SERVICE
#=================================================
ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
# Remove the dedicated systemd config # Remove the dedicated systemd config
ynh_remove_systemd_config ynh_remove_systemd_config
#=================================================
# REMOVE DEPENDENCIES
#=================================================
ynh_script_progression --message="Removing dependencies..." --weight=1
# Remove metapackage and its dependencies
ynh_remove_app_dependencies
#=================================================
# REMOVE APP MAIN DIR
#=================================================
ynh_script_progression --message="Removing app main directory..." --weight=1
# Remove the app directory securely
ynh_secure_remove --file="$final_path"
#=================================================
# REMOVE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
# Remove the dedicated NGINX config # Remove the dedicated NGINX config
ynh_remove_nginx_config ynh_remove_nginx_config
#=================================================
# SPECIFIC REMOVE
#=================================================
# REMOVE VARIOUS FILES
#=================================================
ynh_script_progression --message="Removing various files..."
# Remove the log files # Remove the log files
ynh_secure_remove --file="/var/log/$app" ynh_secure_remove --file="/var/log/$app"
#=================================================
# GENERIC FINALIZATION
#=================================================
# REMOVE DEDICATED USER
#=================================================
ynh_script_progression --message="Removing the dedicated system user..." --weight=1
# Delete a system user
ynh_system_user_delete --username=$app
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================

View file

@ -10,85 +10,27 @@
source ../settings/scripts/_common.sh source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#=================================================
# MANAGE SCRIPT FAILURE
#=================================================
ynh_clean_setup () {
true
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
# LOAD SETTINGS
#=================================================
ynh_script_progression --message="Loading installation settings..." --weight=1
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)
#=================================================
# CHECK IF THE APP CAN BE RESTORED
#=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=1
ynh_webpath_available --domain=$domain --path_url=$path_url \
|| ynh_die --message="Path not available: ${domain}${path_url}"
test ! -d $final_path \
|| ynh_die --message="There is already a directory: $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
#=================================================
ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
# Create the dedicated user (if not existing)
ynh_system_user_create --username=$app --home_dir=$final_path
#================================================= #=================================================
# RESTORE THE APP MAIN DIR # RESTORE THE APP MAIN DIR
#================================================= #=================================================
ynh_script_progression --message="Restoring the app main directory..." --weight=1 ynh_script_progression --message="Restoring the app main directory..." --weight=1
ynh_restore_file --origin_path="$final_path" ynh_restore_file --origin_path="$install_dir"
chmod 750 "$final_path" chmod -R o-rwx "$install_dir"
chmod -R o-rwx "$final_path" chown -R $app:www-data "$install_dir"
chown -R $app:www-data "$final_path"
#=================================================
# SPECIFIC RESTORATION
#=================================================
# REINSTALL DEPENDENCIES
#=================================================
ynh_script_progression --message="Reinstalling dependencies..." --weight=1
# Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# INSTALL PYTHON DEPENDENCIES # INSTALL PYTHON DEPENDENCIES
#================================================= #=================================================
ynh_script_progression --message="Installing Python dependencies..." ynh_script_progression --message="Installing Python dependencies..." --weight=1
pushd $final_path pushd $install_dir
python3 -m venv venv python3 -m venv venv
venv/bin/pip install --upgrade pip venv/bin/pip install --upgrade pip
venv/bin/pip install -r requirements.txt venv/bin/pip install -r requirements.txt
venv/bin/pip install gunicorn venv/bin/pip install gunicorn
venv/bin/pybabel compile -d locales/
mkdir -p /var/log/$app mkdir -p /var/log/$app
chown -R $app:www-data /var/log/$app chown -R $app:www-data /var/log/$app
chmod o-rwx /var/log/$app chmod o-rwx /var/log/$app
@ -97,40 +39,32 @@ popd
#================================================= #=================================================
# RESTORE USER RIGHTS # RESTORE USER RIGHTS
#================================================= #=================================================
ynh_script_progression --message="Restoring user rights..." ynh_script_progression --message="Restoring user rights..." --weight=1
# Restore permissions on app files # Restore permissions on app files
chown -R $app:www-data $final_path chown -R $app:www-data $install_dir
chmod o=--- $final_path chmod o=--- $install_dir
#================================================= #=================================================
# RESTORE SYSTEMD # RESTORE SYSTEMD
#================================================= #=================================================
ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_restore_file --origin_path="/etc/systemd/system/$app.service" ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
systemctl enable $app.service --quiet systemctl enable $app.service --quiet
#================================================= yunohost service add $app --description="Simple donation form" --log="/var/log/$app/$app.log"
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
yunohost service add $app --description="A simple donation form"
#=================================================
# START SYSTEMD SERVICE
#=================================================
ynh_script_progression --message="Starting a systemd service..." --weight=1
ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
#================================================= #=================================================
ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started"
ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name=nginx --action=reload

View file

@ -9,49 +9,12 @@
source _common.sh source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#=================================================
# LOAD SETTINGS
#=================================================
ynh_script_progression --message="Loading installation settings..." --weight=1
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)
port=$(ynh_app_setting_get --app=$app --key=port)
project_name=$(ynh_app_setting_get --app=$app --key=project_name)
contact_url=$(ynh_app_setting_get --app=$app --key=contact_url)
logo=$(ynh_app_setting_get --app=$app --key=logo)
favicon=$(ynh_app_setting_get --app=$app --key=favicon)
publishable_key=$(ynh_app_setting_get --app=$app --key=publishable_key)
secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
prices=$(ynh_app_setting_get --app=$app --key=prices)
secret=$(ynh_app_setting_get --app=$app --key=secret)
csrf_key=$(ynh_app_setting_get --app=$app --key=csrf_key)
#================================================= #=================================================
# CHECK VERSION # CHECK VERSION
#================================================= #=================================================
ynh_script_progression --message="Checking version..."
upgrade_type=$(ynh_check_app_version_changed) upgrade_type=$(ynh_check_app_version_changed)
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
# Backup the current version of the app
ynh_backup_before_upgrade
ynh_clean_setup () {
# Restore it if the upgrade fails
ynh_restore_upgradebackup
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#================================================= #=================================================
@ -61,14 +24,6 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped" ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped"
#=================================================
# CREATE DEDICATED USER
#=================================================
ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
# Create a dedicated user (if not existing)
ynh_system_user_create --username=$app --home_dir=$final_path
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
@ -78,40 +33,25 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$install_dir"
fi fi
chmod 750 "$final_path" chmod -R o-rwx "$install_dir"
chmod -R o-rwx "$final_path" chown -R $app:www-data "$install_dir"
chown -R $app:www-data "$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#=================================================
# UPGRADE DEPENDENCIES
#=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=1
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# SPECIFIC UPGRADE # SPECIFIC UPGRADE
#================================================= #=================================================
# UPGRADE PYTHON DEPENDENCIES # UPGRADE PYTHON DEPENDENCIES
#================================================= #=================================================
ynh_script_progression --message="Installing Python dependencies..." ynh_script_progression --message="Installing Python dependencies..." --weight=1
pushd $final_path pushd $install_dir
python3 -m venv venv python3 -m venv venv
venv/bin/pip install --upgrade pip venv/bin/pip install --upgrade pip
venv/bin/pip install -r requirements.txt venv/bin/pip install -r requirements.txt
venv/bin/pip install gunicorn venv/bin/pip install gunicorn
venv/bin/pybabel compile -d locales/
mkdir -p /var/log/$app mkdir -p /var/log/$app
chown -R $app:www-data /var/log/$app chown -R $app:www-data /var/log/$app
chmod o-rwx /var/log/$app chmod o-rwx /var/log/$app
@ -126,45 +66,43 @@ popd
#================================================= #=================================================
# UPDATE A CONFIG FILE # UPDATE A CONFIG FILE
#================================================= #=================================================
ynh_script_progression --message="Updating a configuration file..." ynh_script_progression --message="Updating a configuration file..." --weight=1
ynh_add_config --template="../conf/gunicorn.py" --destination="$final_path/gunicorn.py" ynh_add_config --template="../conf/gunicorn.py" --destination="$install_dir/gunicorn.py"
ynh_add_config --template="../conf/settings.py" --destination="$final_path/settings.py" ynh_add_config --template="../conf/settings.py" --destination="$install_dir/settings.py"
for price in $(echo $prices | sed "s/,/ /"); do for price in $(echo $prices | sed "s/,/ /"); do
frequency=$(echo $price | cut -d/ -f1) frequency=$(echo $price | cut -d/ -f1)
currency=$(echo $price | cut -d/ -f2) currency=$(echo $price | cut -d/ -f2)
price_id=$(echo $price | cut -d/ -f3) price_id=$(echo $price | cut -d/ -f3)
echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$final_path/settings.py" echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$install_dir/settings.py"
done done
ynh_store_file_checksum --file="$final_path/settings.py" ynh_store_file_checksum --file="$install_dir/settings.py"
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD
#================================================= #=================================================
ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
# Create a dedicated systemd config # Create a dedicated systemd config
ynh_add_systemd_config ynh_add_systemd_config
yunohost service add $app --description="Simple donation form" --log="/var/log/$app/$app.log"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION
#================================================= #=================================================
# SECURE FILES AND DIRECTORIES # SECURE FILES AND DIRECTORIES
#================================================= #=================================================
ynh_script_progression --message="Securing files and directories..." ynh_script_progression --message="Securing files and directories..." --weight=1
# Set permissions on app files # Set permissions on app files
chown -R $app:www-data $final_path chown -R $app:www-data $install_dir
chmod o=--- $final_path chmod o=--- $install_dir
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
yunohost service add $app --description="A simple donation form"
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE
@ -173,13 +111,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started"
#=================================================
# RELOAD NGINX
#=================================================
ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================

21
tests.toml Normal file
View file

@ -0,0 +1,21 @@
test_format = 1.0
[default]
# -------------------------------
# Default args to use for install
# -------------------------------
args.project_name="YunoHost"
args.contact_url="https://forum.yunohost.org/t/donate-to-yunohost/9211"
args.logo="https://yunohost.org/user/images/logo.png"
args.favicon="https://yunohost.org/user/themes/yunohost-docs/images/favicon.png"
args.publishable_key="pk_test_gOgGjacs9YfvDJY03BRZ576O"
args.secret_key="sk_test_aaaaaaaaaaaaaaaaa"
args.prices="one_time/EUR/price_1IKuPV,recuring/EUR/price_1IKuPV"
# -------------------------------
# Commits to test upgrade from
# -------------------------------
test_upgrade_from.5cc2d3ffd6529cc7356ff93af92dbb6785c3ab9a.name = "Upgrade from 1.0.1~ynh1"