1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/streama_ynh.git synced 2024-09-03 20:26:30 +02:00

Version 2 (#43)

* update to Bookworm

* v2

* Auto-update README

* v2

* Auto-update README

* Update manifest.toml

* Update manifest.toml

* Create DESCRIPTION.md

* Auto-update README

* fix

* Update manifest.toml

* Update manifest.toml

* Create application.yaml

* fix

* Update restore

* fix

* Update application.yaml

* Update application.yaml

* FIX

---------

Co-authored-by: yunohost-bot <yunohost@yunohost.org>
This commit is contained in:
Éric Gaspar 2023-07-28 07:35:28 +01:00 committed by GitHub
parent e87f95c1d4
commit 02a7c03c85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 166 additions and 609 deletions

View file

@ -6,6 +6,7 @@ It shall NOT be edited by hand.
# Streama for YunoHost # Streama for YunoHost
[![Integration level](https://dash.yunohost.org/integration/streama.svg)](https://dash.yunohost.org/appci/app/streama) ![Working status](https://ci-apps.yunohost.org/ci/badges/streama.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/streama.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/streama.svg)](https://dash.yunohost.org/appci/app/streama) ![Working status](https://ci-apps.yunohost.org/ci/badges/streama.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/streama.maintain.svg)
[![Install Streama with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=streama) [![Install Streama with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=streama)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -25,48 +26,6 @@ Self hosted streaming media server
![Screenshot of Streama](./doc/screenshots/screenshot.png) ![Screenshot of Streama](./doc/screenshots/screenshot.png)
## Disclaimers / important information
## Installation guide
> :warning: Streama must be installed in the root domain or subdomain.
Default upload directory is: `/home/yunohost.app/streama` (must be mentioned in *Settings* page or can be changed)
Default local video directory is: `/home/yunohost.app/streama/upload` (must be mentioned in *Settings* page or can be changed)
## Additional information
* After install:
- **Username**: `admin`
- **Password**: `admin`
This can be changed in settings.
### Convert video:
$ convert_movies -ffmpeg
$ convert_movies -avidemux
$ convert_movies -mencoder
$ convert_movies -avconv
### Avidemux compilation:
$ git clone https://github.com/mean00/avidemux2/
$ cd avidemux2
$ sudo apt-get install build-essential cmake \
pkg-config yasm libsqlite3-dev libfontconfig1-dev \
libfribidi-dev libxvdev libvdpau-dev libva-dev \
libasound2-dev libpulse-dev libfdk-aac-dev \
libpng-dev libmp3lame-dev libx264-dev \
libxvidcore-dev libfaad-dev libfaac-dev libopus-dev \
libvorbis-dev libogg-dev libdca-dev libx265-dev
$ wget https://www.deb-multimedia.org/pool/main/a/aften/libaften0_0.0.8svn20100103-dmo2_amd64.deb
$ wget https://www.deb-multimedia.org/pool/main/a/aften/libaften-dev_0.0.8svn20100103-dmo2_amd64.deb
$ sudo dpkg -i libaften0_0.0.8svn20100103-dmo2_amd64.deb
$ sudo dpkg -i libaften-dev_0.0.8svn20100103-dmo2_amd64.deb
$ bash bootStrap.bash --deb --without-qt --with-cli
## Documentation and resources ## Documentation and resources
* Official app website: <https://streamaserver.org/> * Official app website: <https://streamaserver.org/>

View file

@ -5,73 +5,32 @@ It shall NOT be edited by hand.
# Streama pour YunoHost # Streama pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/streama.svg)](https://dash.yunohost.org/appci/app/streama) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/streama.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/streama.maintain.svg) [![Niveau dintégration](https://dash.yunohost.org/integration/streama.svg)](https://dash.yunohost.org/appci/app/streama) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/streama.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/streama.maintain.svg)
[![Installer Streama avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=streama) [![Installer Streama avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=streama)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
> *Ce package vous permet d'installer Streama rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet dinstaller Streama 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
Serveur de streaming auto-hébergé Self hosted streaming media server
**Version incluse :** 1.10.4~ynh3 **Version incluse :** 1.10.4~ynh3
**Démo :** https://streama.demo-version.net **Démo :** https://streama.demo-version.net
## Captures d'écran ## Captures décran
![Capture d'écran de Streama](./doc/screenshots/screenshot.png) ![Capture décran de Streama](./doc/screenshots/screenshot.png)
## Avertissements / informations importantes
## Guide dinstallation
> :warning: Streama doit être installé dans le domaine racine ou un sous-domaine dédié.
Le répertoire de téléchargement par défaut est : `/home/yunohost.app/streama` (doit être mentionné dans la page *Paramètres* ou peut être modifié)
Le répertoire vidéo local par défaut est : `/home/yunohost.app/streama/upload` (doit être mentionné dans la page *Paramètres* ou peut être modifié)
## Informations additionnelles
* Après linstallation :
- **Nom dutilisateur**: `admin`
- **Mot de passe**: `admin`
Ceci pourra être changé dans les paramètres.
### Convertir des vidéos :
$ convert_movies -ffmpeg
$ convert_movies -avidemux
$ convert_movies -mencoder
$ convert_movies -avconv
### Compilation avidemux :
$ git clone https://github.com/mean00/avidemux2/
$ cd avidemux2
$ sudo apt-get install build-essential cmake \
pkg-config yasm libsqlite3-dev libfontconfig1-dev \
libfribidi-dev libxvdev libvdpau-dev libva-dev \
libasound2-dev libpulse-dev libfdk-aac-dev \
libpng-dev libmp3lame-dev libx264-dev \
libxvidcore-dev libfaad-dev libfaac-dev libopus-dev \
libvorbis-dev libogg-dev libdca-dev libx265-dev
$ wget https://www.deb-multimedia.org/pool/main/a/aften/libaften0_0.0.8svn20100103-dmo2_amd64.deb
$ wget https://www.deb-multimedia.org/pool/main/a/aften/libaften-dev_0.0.8svn20100103-dmo2_amd64.deb
$ sudo dpkg -i libaften0_0.0.8svn20100103-dmo2_amd64.deb
$ sudo dpkg -i libaften-dev_0.0.8svn20100103-dmo2_amd64.deb
$ bash bootStrap.bash --deb --without-qt --with-cli
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : <https://streamaserver.org/> * Site officiel de lapp : <https://streamaserver.org/>
* Documentation officielle de l'admin : <https://docs.streama-project.com/> * Documentation officielle de ladmin : <https://docs.streama-project.com/>
* Dépôt de code officiel de l'app : <https://github.com/streamaserver/streama> * Dépôt de code officiel de lapp : <https://github.com/streamaserver/streama>
* Documentation YunoHost pour cette app : <https://yunohost.org/app_streama> * Documentation YunoHost pour cette app : <https://yunohost.org/app_streama>
* Signaler un bug : <https://github.com/YunoHost-Apps/streama_ynh/issues> * Signaler un bug : <https://github.com/YunoHost-Apps/streama_ynh/issues>
@ -87,4 +46,4 @@ ou
sudo yunohost app upgrade streama -u https://github.com/YunoHost-Apps/streama_ynh/tree/testing --debug sudo yunohost app upgrade streama -u https://github.com/YunoHost-Apps/streama_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,23 +0,0 @@
;; Test complet
; Manifest
domain="domain.tld"
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
# 1.9.3~ynh1
upgrade=1 from_commit=3a02114f50e785722bc592cbcc33f92bf070b1c1
# 1.10.4~ynh1
upgrade=1 from_commit=4184ecd823b50bdf1a306d24a0ad9b5ccd18c103
backup_restore=1
multi_instance=0
port_already_use=0
change_url=0
;;; Options
Email=
Notification=none

View file

@ -1,7 +0,0 @@
SOURCE_URL=https://github.com/streamaserver/streama/releases/download/v1.10.4/streama-1.10.4.jar
SOURCE_SUM=a1071ab783f4d47553ac38a5357b7ce801c8cfe3e523280feead865e23b7da2e
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=jar
SOURCE_IN_SUBDIR=false
SOURCE_EXTRACT=false
SOURCE_FILENAME=streama.jar

30
conf/application.yaml Normal file
View file

@ -0,0 +1,30 @@
# Place this file next to the streama-[version].war and rename to application.yml with your own settings
environments:
production:
dataSource:
driverClassName: 'com.mysql.jdbc.Driver'
url: jdbc:mysql://localhost/__DB_NAME__
username: __DB_USER__
password: __DB_PWD__
# driverClassName: 'org.h2.Driver'
# url: jdbc:h2:./streama;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
# username: root
# password:
server:
port: __PORT__
# grails:
# assets:
# url: http://__DOMAIN____PATH__/assets/
# controllers:
# upload:
# maxFileSize: 10TB
# maxRequestSize: 10TB
streama:
regex:
movies: ^(?<Name>.*)[._ ]\(\d{4}\).*
shows:
- ^(?<Name>.+)[._ ][Ss](?<Season>\d{2})[Ee](?<Episode>\d{2,3}).* # example: "House.MD.S03E04.h264.mp4"
- ^(?<Name>.+)[._ ](?<Season>\d{1,2})x(?<Episode>\d{2,3}).* # example: "House.MD.03x04.h264.mp4"
- ^(?<Season>\d{2})-(?<Episode>\d{2,3})-(?<Name>.*?)-.* # example: "02-05-Dr. House-Tanz_ums_Feuer-cineonws.mp4"
- ^(?<Name>.*?)(?<Episode>\d{1,3})x(?<Season>\d{2}).* # example: "Castle4x06DaemonsWebdl480pOktober242011rC.mkv(jkuzt).mp4"

View file

@ -34,8 +34,8 @@ while IFS= read -r -d '' file
do do
ffmpeg -nostdin -i "$file" -c:v libx264 -c:a aac "${file%.*}.mp4" ffmpeg -nostdin -i "$file" -c:v libx264 -c:a aac "${file%.*}.mp4"
rm -f "$file" rm -f "$file"
done < <(find __DATADIR__/upload/ -name '*.mkv' -print0 -o -name '*.avi' -print0) done < <(find __DATA_DIR__/upload/ -name '*.mkv' -print0 -o -name '*.avi' -print0)
chown -R streama:users __DATADIR__/upload/ chown -R streama:users __DATA_DIR__/upload/
} }
avidemux_convert(){ avidemux_convert(){
@ -46,8 +46,8 @@ while IFS= read -r -d '' file
do do
avidemux3_cli --load "$file" --output-format "$output_format" --video-codec "$video_codec" --audio-codec "$audio_codec" --save "${file%.*}.mp4" --quit avidemux3_cli --load "$file" --output-format "$output_format" --video-codec "$video_codec" --audio-codec "$audio_codec" --save "${file%.*}.mp4" --quit
rm -f "$file" rm -f "$file"
done < <(find __DATADIR__/upload/ -name '*.mkv' -print0 -o -name '*.avi' -print0) done < <(find __DATA_DIR__/upload/ -name '*.mkv' -print0 -o -name '*.avi' -print0)
chown -R streama:users __DATADIR__/upload/ chown -R streama:users __DATA_DIR__/upload/
} }
mencoder_convert(){ mencoder_convert(){
@ -55,8 +55,8 @@ while IFS= read -r -d '' file
do do
mencoder "$file" -o "${file%.*}.mp4" -ovc lavc -oac lavc mencoder "$file" -o "${file%.*}.mp4" -ovc lavc -oac lavc
rm -f "$file" rm -f "$file"
done < <(find __DATADIR__/upload/ -name '*.mkv' -print0 -o -name '*.avi' -print0) done < <(find __DATA_DIR__/upload/ -name '*.mkv' -print0 -o -name '*.avi' -print0)
chown -R streama:users __DATADIR__/upload/ chown -R streama:users __DATA_DIR__/upload/
} }
avconv_convert(){ avconv_convert(){
@ -64,8 +64,8 @@ while IFS= read -r -d '' file
do do
avconv -i "$file" -c:v h264 -c:a aac "${file%.*}.mp4" avconv -i "$file" -c:v h264 -c:a aac "${file%.*}.mp4"
rm -f "$file" rm -f "$file"
done < <(find __DATADIR__/upload/ -name '*.mkv' -print0 -o -name '*.avi' -print0) done < <(find __DATA_DIR__/upload/ -name '*.mkv' -print0 -o -name '*.avi' -print0)
chown -R streama:users __DATADIR__/upload/ chown -R streama:users __DATA_DIR__/upload/
} }
parse_args () parse_args ()

View file

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=Streama media system Description=Streama: media system
After=network.target After=network.target
[Service] [Service]
@ -7,7 +7,7 @@ Type=simple
User=__APP__ User=__APP__
Group=__APP__ Group=__APP__
UMask=000 UMask=000
WorkingDirectory=__FINALPATH__/ WorkingDirectory=__INSTALL_DIR__/
ExecStart=/usr/bin/java -Djava.awt.headless=true -Dserver.port=__PORT__ -jar streama.jar ExecStart=/usr/bin/java -Djava.awt.headless=true -Dserver.port=__PORT__ -jar streama.jar
RestartSec=30 RestartSec=30
Restart=always Restart=always

View file

@ -1,10 +1,8 @@
## Installation guide ## Installation guide
> :warning: Streama must be installed in the root domain or subdomain. Default upload directory is: `__DATA_DIR__` (must be mentioned in *Settings* page or can be changed)
Default upload directory is: `/home/yunohost.app/streama` (must be mentioned in *Settings* page or can be changed) Default local video directory is: `__DATA_DIR__/upload` (must be mentioned in *Settings* page or can be changed)
Default local video directory is: `/home/yunohost.app/streama/upload` (must be mentioned in *Settings* page or can be changed)
## Additional information ## Additional information

View file

@ -1,10 +1,8 @@
## Guide dinstallation ## Guide dinstallation
> :warning: Streama doit être installé dans le domaine racine ou un sous-domaine dédié. Le répertoire de téléchargement par défaut est : `__DATA_DIR__` (doit être mentionné dans la page *Paramètres* ou peut être modifié)
Le répertoire de téléchargement par défaut est : `/home/yunohost.app/streama` (doit être mentionné dans la page *Paramètres* ou peut être modifié) Le répertoire vidéo local par défaut est : `__DATA_DIR__/upload` (doit être mentionné dans la page *Paramètres* ou peut être modifié)
Le répertoire vidéo local par défaut est : `/home/yunohost.app/streama/upload` (doit être mentionné dans la page *Paramètres* ou peut être modifié)
## Informations additionnelles ## Informations additionnelles

1
doc/DESCRIPTION.md Normal file
View file

@ -0,0 +1 @@
Self hosted streaming media server

View file

@ -1,48 +0,0 @@
{
"name": "Streama",
"id": "streama",
"packaging_format": 1,
"description": {
"en": "Self hosted streaming media server",
"fr": "Serveur de streaming auto-hébergé"
},
"version": "1.10.4~ynh3",
"url": "https://streamaserver.org/",
"upstream": {
"license": "MIT",
"website": "https://streamaserver.org/",
"demo": "https://streama.demo-version.net",
"admindoc": "https://docs.streama-project.com/",
"code": "https://github.com/streamaserver/streama"
},
"license": "MIT",
"maintainer": {
"name": "liberodark",
"email": "liberodark@gmail.com"
},
"requirements": {
"yunohost": ">= 11.0.9"
},
"multi_instance": false,
"services": [
"nginx",
"mysql"
],
"arguments": {
"install": [
{
"name": "domain",
"type": "domain"
},
{
"name": "is_public",
"type": "boolean",
"help": {
"en": "If enabled, Streama will be accessible by people who do not have an account. This can be changed later via the webadmin.",
"fr": "Si cette case est cochée, Streama sera accessible aux personnes nayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
},
"default": true
}
]
}
}

64
manifest.toml Normal file
View file

@ -0,0 +1,64 @@
packaging_format = 2
id = "streama"
name = "Streama"
description.en = "Self hosted streaming media server"
description.fr = "Serveur de streaming auto-hébergé"
version = "1.10.4~ynh3"
maintainers = [""]
[upstream]
license = "MIT"
website = "https://streamaserver.org/"
demo = "https://streama.demo-version.net"
admindoc = "https://docs.streama-project.com/"
code = "https://github.com/streamaserver/streama"
[integration]
yunohost = ">= 11.1.20"
architectures = "all"
multi_instance = false
ldap = false
sso = false
disk = "50M"
ram.build = "50M"
ram.runtime = "50M"
[install]
[install.domain]
type = "domain"
full_domain = true
[install.init_main_permission]
help.en = "If enabled, Streama will be accessible by people who do not have an account. This can be changed later via the webadmin."
help.fr = "Si cette case est cochée, Streama sera accessible aux personnes nayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
type = "group"
default = "visitors"
[resources]
[resources.sources.main]
url = "https://github.com/streamaserver/streama/releases/download/v1.10.4/streama-1.10.4.jar"
sha256 = "a1071ab783f4d47553ac38a5357b7ce801c8cfe3e523280feead865e23b7da2e"
extract = false
format = "jar"
rename = "streama.jar"
[resources.ports]
[resources.system_user]
[resources.install_dir]
[resources.data_dir]
subdirs = ["data", "upload"]
[resources.permissions]
main.url = "/"
[resources.apt]
packages = "openjdk-11-jre-headless ffmpeg mariadb-server"
[resources.database]
type = "mysql"

View file

@ -5,7 +5,7 @@
#================================================= #=================================================
# dependencies used by the app # dependencies used by the app
pkg_dependencies="openjdk-11-jre-headless ffmpeg" #REMOVEME? pkg_dependencies="openjdk-17-jre-headless ffmpeg"
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

View file

@ -10,23 +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_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)
datadir=$(ynh_app_setting_get --app=$app --key=datadir)
#================================================= #=================================================
# DECLARE DATA AND CONF FILES TO BACKUP # DECLARE DATA AND CONF FILES TO BACKUP
#================================================= #=================================================
@ -36,13 +19,13 @@ 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 DATA DIR # BACKUP THE DATA DIR
#================================================= #=================================================
ynh_backup --src_path="$datadir" --is_big ynh_backup --src_path="$data_dir" --is_big
#================================================= #=================================================
# BACKUP THE NGINX CONFIGURATION # BACKUP THE NGINX CONFIGURATION

View file

@ -9,64 +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)
# Add settings here as needed by your application
#db_name=$(ynh_app_setting_get --app=$app --key=db_name)
#db_user=$db_name
#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
#=================================================
# BACKUP BEFORE CHANGE URL 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
#================================================= #=================================================
@ -81,29 +23,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd
#================================================= #=================================================
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
#================================================= #=================================================
# GENERIC FINALISATION # GENERIC FINALISATION
@ -114,13 +34,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Grails application running at" ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Grails application running at"
#=================================================
# 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,84 +9,17 @@
source _common.sh source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#=================================================
# MANAGE SCRIPT FAILURE
#=================================================
ynh_clean_setup () {
ynh_clean_check_starting
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
# RETRIEVE ARGUMENTS FROM THE MANIFEST
#=================================================
domain=$YNH_APP_ARG_DOMAIN
path_url="/"
is_public=$YNH_APP_ARG_IS_PUBLIC
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
#=================================================
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
#=================================================
# STANDARD MODIFICATIONS
#=================================================
# FIND AND OPEN A PORT
#=================================================
ynh_script_progression --message="Finding an available port..." --weight=3
# Find an available port
port=$(ynh_find_port --port=8095)
ynh_app_setting_set --app=$app --key=port --value=$port
#=================================================
# INSTALL DEPENDENCIES
#=================================================
ynh_script_progression --message="Installing dependencies..."
ynh_install_app_dependencies $pkg_dependencies
#=================================================
# CREATE DEDICATED USER
#=================================================
ynh_script_progression --message="Configuring system user..." --weight=2
# 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=2 ynh_script_progression --message="Setting up source files..." --weight=2
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" chmod +x $install_dir/streama.jar
chmod +x $final_path/streama.jar
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
@ -97,31 +30,24 @@ ynh_script_progression --message="Configuring NGNX web server..." --weight=3
ynh_add_nginx_config ynh_add_nginx_config
#================================================= #=================================================
# SPECIFIC SETUP # ADD A CONFIGURATION
#================================================= #=================================================
# CREATE DATA DIRECTORY ynh_script_progression --message="Adding a configuration file..." --weight=1
#=================================================
ynh_script_progression --message="Creating a data directory..."
datadir=/home/yunohost.app/$app ynh_add_config --template="../conf/application.yaml" --destination="$install_dir/application.yaml"
ynh_app_setting_set --app=$app --key=datadir --value=$datadir
mkdir -p $datadir chmod 400 "$install_dir/application.yaml"
chown $app:$app "$install_dir/application.yaml"
chmod 750 "$datadir"
chmod -R o-rwx "$datadir"
chown -R $app:www-data "$datadir"
#================================================= #=================================================
# ADD A CONFIGURATION # ADD A CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file..." #ynh_script_progression --message="Adding a configuration file..."
# Set permissions to app files # Set permissions to app files
mkdir -p $final_path/data #ln -s $data_dir $install_dir/data/streama
ln -s $datadir $final_path/data/streama #ynh_add_config --template="../conf/convert.sh" --destination="/usr/bin/convert_movies"
ynh_add_config --template="../conf/convert.sh" --destination="/usr/bin/convert_movies" #chmod +x "/usr/bin/convert_movies"
chmod +x "/usr/bin/convert_movies"
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD
@ -148,26 +74,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2
# Start a systemd service # Start a systemd service
ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Grails application running at" ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Grails application running at"
#=================================================
# 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

@ -9,18 +9,6 @@
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)
port=$(ynh_app_setting_get --app=$app --key=port)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
datadir=$(ynh_app_setting_get --app=$app --key=datadir)
#================================================= #=================================================
# STANDARD REMOVE # STANDARD REMOVE
#================================================= #=================================================
@ -34,59 +22,12 @@ 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 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 DATA DIR
#=================================================
# Remove the data directory if --purge option is used
if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
then
ynh_script_progression --message="Removing app data directory..."
ynh_secure_remove --file="$datadir"
fi
#=================================================
# REMOVE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2
# Remove the dedicated NGINX config # Remove the dedicated NGINX config
ynh_remove_nginx_config ynh_remove_nginx_config
#=================================================
# REMOVE DEPENDENCIES
#=================================================
ynh_script_progression --message="Removing dependencies..." --weight=11
# Remove metapackage and its dependencies
ynh_remove_app_dependencies
#=================================================
# 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,79 +10,24 @@
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 () {
ynh_clean_check_starting
}
# 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)
datadir=$(ynh_app_setting_get --app=$app --key=datadir)
#=================================================
# CHECK IF THE APP CAN BE RESTORED
#=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=3
test ! -d $final_path \
|| ynh_die --message="There is already a directory: $final_path "
#=================================================
# STANDARD RESTORATION STEPS
#=================================================
# RECREATE THE DEDICATED USER
#=================================================
ynh_script_progression --message="Recreating the dedicated system user..." --weight=3
# 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=2 ynh_script_progression --message="Restoring the app main directory..." --weight=2
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"
#================================================= #=================================================
# RESTORE THE DATA DIRECTORY # RESTORE THE DATA DIRECTORY
#================================================= #=================================================
ynh_script_progression --message="Restoring the data directory..." ynh_script_progression --message="Restoring the data directory..."
ynh_restore_file --origin_path="$datadir" --not_mandatory ynh_restore_file --origin_path="$data_dir" --not_mandatory
mkdir -p $datadir chown -R $app:www-data "$data_dir"
chmod 750 "$datadir"
chmod -R o-rwx "$datadir"
chown -R $app:www-data "$datadir"
#=================================================
# SPECIFIC RESTORATION
#=================================================
# REINSTALL DEPENDENCIES
#=================================================
ynh_script_progression --message="Reinstalling dependencies..."
# Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# RESTORE THE NGINX CONFIGURATION # RESTORE THE NGINX CONFIGURATION
@ -94,13 +39,12 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# ADD A CONFIGURATION # ADD A CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file..." #ynh_script_progression --message="Adding a configuration file..."
# Set permissions to app files # Set permissions to app files
mkdir -p $final_path/data #ln -s $data_dir $install_dir/data/streama
ln -s $datadir $final_path/data/streama #ynh_add_config --template="../conf/convert.sh" --destination="/usr/bin/convert_movies"
ynh_add_config --template="../conf/convert.sh" --destination="/usr/bin/convert_movies" #chmod +x "/usr/bin/convert_movies"
chmod +x "/usr/bin/convert_movies"
#================================================= #=================================================
# RESTORE SYSTEMD # RESTORE SYSTEMD

View file

@ -9,41 +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)
datadir=$(ynh_app_setting_get --app=$app --key=datadir)
#================================================= #=================================================
# 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=2
# Backup the current version of the app
ynh_backup_before_upgrade
ynh_clean_setup () {
ynh_clean_check_starting
# 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
#================================================= #=================================================
@ -53,31 +24,6 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=20
ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
#=================================================
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
# Cleaning legacy permissions
if ynh_legacy_permissions_exists; then
ynh_legacy_permissions_delete_all
ynh_app_setting_delete --app=$app --key=is_public
fi
# If db_name doesn't exist, create it
if [ -z "$datadir" ]; then
datadir=/home/yunohost.app/$app
ynh_app_setting_set --app=$app --key=datadir --value=$datadir
fi
#=================================================
# 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
#================================================= #=================================================
@ -87,20 +33,12 @@ 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" chmod +x $install_dir/streama.jar
chmod +x $final_path/streama.jar
#=================================================
# UPGRADE DEPENDENCIES
#=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=5
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
@ -115,12 +53,11 @@ ynh_add_nginx_config
#================================================= #=================================================
# UPDATE A CONFIG FILE # UPDATE A CONFIG FILE
#================================================= #=================================================
ynh_script_progression --message="Updating a configuration file..." #ynh_script_progression --message="Updating a configuration file..."
# Set permissions to app files # Set permissions to app files
mkdir -p $final_path/data #ynh_add_config --template="../conf/convert.sh" --destination="/usr/bin/convert_movies"
ynh_add_config --template="../conf/convert.sh" --destination="/usr/bin/convert_movies" #chmod +x "/usr/bin/convert_movies"
chmod +x "/usr/bin/convert_movies"
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD
@ -146,13 +83,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=5
ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Grails application running at" ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Grails application running at"
#=================================================
# 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
#================================================= #=================================================

9
tests.toml Normal file
View file

@ -0,0 +1,9 @@
test_format = 1.0
[default]
# -------------------------------
# Commits to test upgrade from
# -------------------------------
test_upgrade_from.4184ecd823b50bdf1a306d24a0ad9b5ccd18c103.name = "Upgrade from 1.10.4"