diff --git a/check_process b/check_process deleted file mode 100644 index c379534..0000000 --- a/check_process +++ /dev/null @@ -1,24 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=0 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - #upgrade=1 from_commit=CommitHash - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666& diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index 841b1cd..42d7fcf 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -6,4 +6,4 @@ Your video files are stored by default in `/home/yunohost.app/tube/videos`. You can configure options in this file `/var/www/tube/config.json` using the [documentation](https://git.mills.io/prologic/tube#configuration). Remember to restart Tube service if you change your configuration file. -RSS feed address is available at `https://your_domain.tld/feed.xml` +RSS feed address is available at `https://__DOMAIN__/feed.xml` diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 441b1b4..0000000 --- a/manifest.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "Tube", - "id": "tube", - "packaging_format": 1, - "description": { - "en": "Youtube-like, video Sharing App", - "fr": "Application de partage de vidéos de type Youtube" - }, - "version": "1.1.13~ynh2", - "url": "https://tube.mills.io", - "upstream": { - "license": "MIT", - "demo": "https://tube.mills.io", - "code": "https://git.mills.io/prologic/tube" - }, - "license": "MIT", - "maintainer": { - "name": "eric_G", - "email": "" - }, - "requirements": { - "yunohost": ">= 11.0.9" - }, - "multi_instance": true, - "services": [ - "nginx" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "is_public", - "type": "boolean", - "default": true - } - ] - } -} diff --git a/manifest.toml b/manifest.toml index 0ef1669..12fc860 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Tube" description.en = "Youtube-like, video Sharing App" description.fr = "Application de partage de vidéos de type Youtube" -version = "1.1.13~ynh2" +version = "1.2.0~ynh1" maintainers = ["eric_G"] @@ -36,7 +36,7 @@ ram.runtime = "50M" [resources] [resources.ports] - + [resources.system_user] [resources.install_dir] diff --git a/scripts/upgrade b/scripts/upgrade index 2e97135..a27c6c3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,18 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? max_upload_size=$(ynh_app_setting_get --app=$app --key=max_upload_size) -#REMOVEME? feed_title=$(ynh_app_setting_get --app=$app --key=feed_title) -#REMOVEME? feed_description=$(ynh_app_setting_get --app=$app --key=feed_description) -#REMOVEME? author_name=$(ynh_app_setting_get --app=$app --key=author_name) -#REMOVEME? author_email=$(ynh_app_setting_get --app=$app --key=author_email) -#REMOVEME? copyright_text=$(ynh_app_setting_get --app=$app --key=copyright_text) - #================================================= # CHECK VERSION #================================================= @@ -42,37 +30,37 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If max_upload_size doesn't exist, create it -if [ -z "$max_upload_size" ]; then +if [ -z "${max_upload_size:-}" ]; then max_upload_size=100 ynh_app_setting_set --app=$app --key=max_upload_size --value=$max_upload_size fi # If feed_title doesn't exist, create it -if [ -z "$feed_title" ]; then +if [ -z "${feed_title:-}" ]; then feed_title="Feed title" ynh_app_setting_set --app=$app --key=feed_title --value=$feed_title fi # If feed_description doesn't exist, create it -if [ -z "$feed_description" ]; then +if [ -z "${feed_description:-}" ]; then feed_description="Feed description" ynh_app_setting_set --app=$app --key=feed_description --value=$feed_description fi # If author_name doesn't exist, create it -if [ -z "$author_name" ]; then +if [ -z "${author_name:-}" ]; then author_name="Author Name" ynh_app_setting_set --app=$app --key=author_name --value=$author_name fi # If author_email doesn't exist, create it -if [ -z "$author_email" ]; then +if [ -z "${author_email:-}" ]; then author_email="author@somewhere.example" ynh_app_setting_set --app=$app --key=author_email --value=$author_email fi # If copyright_text doesn't exist, create it -if [ -z "$copyright_text" ]; then +if [ -z "${copyright_text:-}" ]; then copyright_text="Copyright Text" ynh_app_setting_set --app=$app --key=copyright_text --value=$copyright_text fi